diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-03 21:54:15 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-08-03 21:54:15 -1000 |
| commit | 35e51fe82ddcd8fb7f129d6dd8491c097d388665 (patch) | |
| tree | d6dd5e860c0e68a1af7976990c7d624e7362415d /arch/x86/xen | |
| parent | c0c770e610cc4cdcd66c7e939bdf89cc3e72f79d (diff) | |
| parent | a0bfa1373859e9d11dc92561a8667588803e42d8 (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:
cpuidle: stop depending on pm_idle
x86 idle: move mwait_idle_with_hints() to where it is used
cpuidle: replace xen access to x86 pm_idle and default_idle
cpuidle: create bootparam "cpuidle.off=1"
mrst_pmu: driver for Intel Moorestown Power Management Unit
Diffstat (limited to 'arch/x86/xen')
| -rw-r--r-- | arch/x86/xen/setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index 60aeeb56948..a9627e2e329 100644 --- a/arch/x86/xen/setup.c +++ b/arch/x86/xen/setup.c @@ -9,6 +9,7 @@ #include <linux/mm.h> #include <linux/pm.h> #include <linux/memblock.h> +#include <linux/cpuidle.h> #include <asm/elf.h> #include <asm/vdso.h> @@ -426,7 +427,7 @@ void __init xen_arch_setup(void) #ifdef CONFIG_X86_32 boot_cpu_data.hlt_works_ok = 1; #endif - pm_idle = default_idle; + disable_cpuidle(); boot_option_idle_override = IDLE_HALT; fiddle_vdso(); |