diff options
| author | Len Brown <len.brown@intel.com> | 2011-04-01 18:28:35 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-08-03 19:06:36 -0400 |
| commit | d91ee5863b71e8c90eaf6035bff3078a85e2e7b5 (patch) | |
| tree | 7c4972d8d6f614f656720ec686a6288de68f4af3 /arch | |
| parent | 62027aea23fcd14478abdddd3b74a4e0f5fb2984 (diff) | |
| download | linux-3.10-d91ee5863b71e8c90eaf6035bff3078a85e2e7b5.tar.gz linux-3.10-d91ee5863b71e8c90eaf6035bff3078a85e2e7b5.tar.bz2 linux-3.10-d91ee5863b71e8c90eaf6035bff3078a85e2e7b5.zip | |
cpuidle: replace xen access to x86 pm_idle and default_idle
When a Xen Dom0 kernel boots on a hypervisor, it gets access
to the raw-hardware ACPI tables. While it parses the idle tables
for the hypervisor's beneift, it uses HLT for its own idle.
Rather than have xen scribble on pm_idle and access default_idle,
have it simply disable_cpuidle() so acpi_idle will not load and
architecture default HLT will be used.
cc: xen-devel@lists.xensource.com
Tested-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'arch')
| -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(); |