diff options
| author | Ben Hutchings <benh@debian.org> | 2012-12-09 13:33:37 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2012-12-09 13:33:37 +0000 |
| commit | 458ff9337917d622957998dac22e886b5e517883 (patch) | |
| tree | 1a0234adad50889ae407ae27f68dff4ac7ab175a | |
| parent | 87fbfef5e814c1ac6e785caa741eafcc46bfdbab (diff) | |
| download | kernel_replicant_linux-458ff9337917d622957998dac22e886b5e517883.tar.gz kernel_replicant_linux-458ff9337917d622957998dac22e886b5e517883.tar.bz2 kernel_replicant_linux-458ff9337917d622957998dac22e886b5e517883.zip | |
Refresh patch context for 3.2.35
svn path=/dists/sid/linux/; revision=19587
| -rw-r--r-- | debian/patches/features/all/cpu-devices/intel_idle-Revert-change-of-auto_demotion_disable_fl.patch | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/debian/patches/features/all/cpu-devices/intel_idle-Revert-change-of-auto_demotion_disable_fl.patch b/debian/patches/features/all/cpu-devices/intel_idle-Revert-change-of-auto_demotion_disable_fl.patch index 7da98a3673be..e4ca8f3ea3fd 100644 --- a/debian/patches/features/all/cpu-devices/intel_idle-Revert-change-of-auto_demotion_disable_fl.patch +++ b/debian/patches/features/all/cpu-devices/intel_idle-Revert-change-of-auto_demotion_disable_fl.patch @@ -18,11 +18,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> 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 @@ index a238649..1c15e9b 100644 .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 @@ index a238649..1c15e9b 100644 + ICPU(0x2f, idle_cpu_nehalem), ICPU(0x2a, idle_cpu_snb), ICPU(0x2d, idle_cpu_snb), - {} + ICPU(0x3a, idle_cpu_ivb), |