[pve-devel] [PATCH kernel 07/17] drop intel_idle Atom Cedarview revert

[Fabian Grünbichler]

does not revert cleanly anymore

Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
CC: Felix Krohn <felix.krohn at corp.ovh.com>
---
 Makefile                                           |  1 -
 ...l_idle-Add-CPU-model-54-Atom-N2000-series.patch | 34 ----------------------
 2 files changed, 35 deletions(-)
 delete mode 100644 Revert-intel_idle-Add-CPU-model-54-Atom-N2000-series.patch

diff --git a/Makefile b/Makefile
index 2b6c819..c2b7ec1 100644
--- a/Makefile
+++ b/Makefile
@@ -257,7 +257,6 @@ ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNELSRCTAR}
 	cd ${KERNEL_SRC}; patch -p1 < ../kvm-dynamic-halt-polling-disable-default.patch
 	cd ${KERNEL_SRC}; patch -p1 < ../cgroup-cpuset-add-cpuset.remap_cpus.patch
 	cd ${KERNEL_SRC}; patch -p1 < ../CVE-2017-2596-kvm-page-reference-leakage-in-handle_vmon.patch
-	cd ${KERNEL_SRC}; patch -p1 < ../Revert-intel_idle-Add-CPU-model-54-Atom-N2000-series.patch
 	sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
 	touch $@
 
diff --git a/Revert-intel_idle-Add-CPU-model-54-Atom-N2000-series.patch b/Revert-intel_idle-Add-CPU-model-54-Atom-N2000-series.patch
deleted file mode 100644
index 8e7a14a..0000000
--- a/Revert-intel_idle-Add-CPU-model-54-Atom-N2000-series.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 91846c55815e659a7f0b26b86f0252a9d9803423 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler at proxmox.com>
-Date: Fri, 24 Feb 2017 13:37:45 +0100
-Subject: [PATCH] Revert "intel_idle: Add CPU model 54 (Atom N2000 series)"
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-As requested by OVH, to fix unbootable systems with Atom
-N2800 CPUs. This should not affect other CPU classes at all.
-
-This reverts commit acead1b0fac5b10d0ae3f1cc5f7820b9f9f924f5.
-
-Reported-By: Felix Krohn <felix.krohn at corp.ovh.com>
-Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
----
- drivers/idle/intel_idle.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
-index 012980a..fbb8646 100644
---- a/drivers/idle/intel_idle.c
-+++ b/drivers/idle/intel_idle.c
-@@ -995,7 +995,6 @@ static const struct x86_cpu_id intel_idle_ids[] __initconst = {
- 	ICPU(0x2f, idle_cpu_nehalem),
- 	ICPU(0x2a, idle_cpu_snb),
- 	ICPU(0x2d, idle_cpu_snb),
--	ICPU(0x36, idle_cpu_atom),
- 	ICPU(0x37, idle_cpu_byt),
- 	ICPU(0x4c, idle_cpu_cht),
- 	ICPU(0x3a, idle_cpu_ivb),
--- 
-2.1.4
-
-- 
2.1.4