diff options
-rw-r--r-- | drivers/idle/intel_idle.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index a238649e7461..1c15e9b33575 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c | |||
@@ -331,10 +331,6 @@ static void auto_demotion_disable(void *dummy) | |||
331 | 331 | ||
332 | static const struct idle_cpu idle_cpu_nehalem = { | 332 | static const struct idle_cpu idle_cpu_nehalem = { |
333 | .state_table = nehalem_cstates, | 333 | .state_table = nehalem_cstates, |
334 | }; | ||
335 | |||
336 | static const struct idle_cpu idle_cpu_westmere = { | ||
337 | .state_table = nehalem_cstates, | ||
338 | .auto_demotion_disable_flags = NHM_C1_AUTO_DEMOTE | NHM_C3_AUTO_DEMOTE, | 334 | .auto_demotion_disable_flags = NHM_C1_AUTO_DEMOTE | NHM_C3_AUTO_DEMOTE, |
339 | }; | 335 | }; |
340 | 336 | ||
@@ -358,12 +354,12 @@ static const struct x86_cpu_id intel_idle_ids[] = { | |||
358 | ICPU(0x1a, idle_cpu_nehalem), | 354 | ICPU(0x1a, idle_cpu_nehalem), |
359 | ICPU(0x1e, idle_cpu_nehalem), | 355 | ICPU(0x1e, idle_cpu_nehalem), |
360 | ICPU(0x1f, idle_cpu_nehalem), | 356 | ICPU(0x1f, idle_cpu_nehalem), |
361 | ICPU(0x25, idle_cpu_westmere), | 357 | ICPU(0x25, idle_cpu_nehalem), |
362 | ICPU(0x2c, idle_cpu_westmere), | 358 | ICPU(0x2c, idle_cpu_nehalem), |
363 | ICPU(0x2e, idle_cpu_westmere), | 359 | ICPU(0x2e, idle_cpu_nehalem), |
364 | ICPU(0x1c, idle_cpu_atom), | 360 | ICPU(0x1c, idle_cpu_atom), |
365 | ICPU(0x26, idle_cpu_lincroft), | 361 | ICPU(0x26, idle_cpu_lincroft), |
366 | ICPU(0x2f, idle_cpu_westmere), | 362 | ICPU(0x2f, idle_cpu_nehalem), |
367 | ICPU(0x2a, idle_cpu_snb), | 363 | ICPU(0x2a, idle_cpu_snb), |
368 | ICPU(0x2d, idle_cpu_snb), | 364 | ICPU(0x2d, idle_cpu_snb), |
369 | {} | 365 | {} |