diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-29 14:18:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-29 14:18:09 -0400 |
| commit | f310642123e0d32d919c60ca3fab5acd130c4ba3 (patch) | |
| tree | f3844152e2e8c0fdd01621a400f84c8a159252a0 /drivers/acpi | |
| parent | ef1d57599dc904fdb31b8e9b5336350d21a1fde1 (diff) | |
| parent | 5d4c47e0195b989f284907358bd5c268a44b91c7 (diff) | |
Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6
* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
x86 idle: deprecate mwait_idle() and "idle=mwait" cmdline param
x86 idle: deprecate "no-hlt" cmdline param
x86 idle APM: deprecate CONFIG_APM_CPU_IDLE
x86 idle floppy: deprecate disable_hlt()
x86 idle: EXPORT_SYMBOL(default_idle, pm_idle) only when APM demands it
x86 idle: clarify AMD erratum 400 workaround
idle governor: Avoid lock acquisition to read pm_qos before entering idle
cpuidle: menu: fixed wrapping timers at 4.294 seconds
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/processor_idle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index d615b7d69bca..431ab11c8c1b 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c | |||
| @@ -161,7 +161,7 @@ static void lapic_timer_check_state(int state, struct acpi_processor *pr, | |||
| 161 | if (cpu_has(&cpu_data(pr->id), X86_FEATURE_ARAT)) | 161 | if (cpu_has(&cpu_data(pr->id), X86_FEATURE_ARAT)) |
| 162 | return; | 162 | return; |
| 163 | 163 | ||
| 164 | if (c1e_detected) | 164 | if (amd_e400_c1e_detected) |
| 165 | type = ACPI_STATE_C1; | 165 | type = ACPI_STATE_C1; |
| 166 | 166 | ||
| 167 | /* | 167 | /* |