diff options
author | 2011-05-29 11:18:09 -0700 | |
---|---|---|
committer | 2011-05-29 11:18:09 -0700 | |
commit | f310642123e0d32d919c60ca3fab5acd130c4ba3 (patch) | |
tree | f3844152e2e8c0fdd01621a400f84c8a159252a0 /arch/x86/include/asm/idle.h | |
parent | cifs/ubifs: Fix shrinker API change fallout (diff) | |
parent | x86 idle: deprecate mwait_idle() and "idle=mwait" cmdline param (diff) | |
download | linux-dev-f310642123e0d32d919c60ca3fab5acd130c4ba3.tar.xz linux-dev-f310642123e0d32d919c60ca3fab5acd130c4ba3.zip |
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 'arch/x86/include/asm/idle.h')
-rw-r--r-- | arch/x86/include/asm/idle.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/idle.h b/arch/x86/include/asm/idle.h index 38d87379e270..f49253d75710 100644 --- a/arch/x86/include/asm/idle.h +++ b/arch/x86/include/asm/idle.h @@ -16,6 +16,6 @@ static inline void enter_idle(void) { } static inline void exit_idle(void) { } #endif /* CONFIG_X86_64 */ -void c1e_remove_cpu(int cpu); +void amd_e400_remove_cpu(int cpu); #endif /* _ASM_X86_IDLE_H */ |