[kernel] r19587 - dists/sid/linux/debian/patches/features/all/cpu-devices

[Ben Hutchings]

Author: benh
Date: Sun Dec  9 13:33:37 2012
New Revision: 19587

Log:
Refresh patch context for 3.2.35

Modified:
   dists/sid/linux/debian/patches/features/all/cpu-devices/intel_idle-Revert-change-of-auto_demotion_disable_fl.patch

Modified: dists/sid/linux/debian/patches/features/all/cpu-devices/intel_idle-Revert-change-of-auto_demotion_disable_fl.patch
==============================================================================
--- dists/sid/linux/debian/patches/features/all/cpu-devices/intel_idle-Revert-change-of-auto_demotion_disable_fl.patch	Sun Dec  9 04:36:22 2012	(r19586)
+++ dists/sid/linux/debian/patches/features/all/cpu-devices/intel_idle-Revert-change-of-auto_demotion_disable_fl.patch	Sun Dec  9 13:33:37 2012	(r19587)
@@ -18,11 +18,9 @@
  drivers/idle/intel_idle.c |   12 ++++--------
  1 file changed, 4 insertions(+), 8 deletions(-)
 
-diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
-index a238649..1c15e9b 100644
 --- a/drivers/idle/intel_idle.c
 +++ b/drivers/idle/intel_idle.c
-@@ -331,10 +331,6 @@ static void auto_demotion_disable(void *dummy)
+@@ -364,10 +364,6 @@ static void auto_demotion_disable(void *
  
  static const struct idle_cpu idle_cpu_nehalem = {
  	.state_table = nehalem_cstates,
@@ -33,7 +31,7 @@
  	.auto_demotion_disable_flags = NHM_C1_AUTO_DEMOTE | NHM_C3_AUTO_DEMOTE,
  };
  
-@@ -358,12 +354,12 @@ static const struct x86_cpu_id intel_idle_ids[] = {
+@@ -395,12 +391,12 @@ static const struct x86_cpu_id intel_idl
  	ICPU(0x1a, idle_cpu_nehalem),
  	ICPU(0x1e, idle_cpu_nehalem),
  	ICPU(0x1f, idle_cpu_nehalem),
@@ -49,4 +47,4 @@
 +	ICPU(0x2f, idle_cpu_nehalem),
  	ICPU(0x2a, idle_cpu_snb),
  	ICPU(0x2d, idle_cpu_snb),
- 	{}
+ 	ICPU(0x3a, idle_cpu_ivb),