aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-11-09 12:45:35 -0500
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-11-09 16:02:04 -0500
commita028955ed160d44f7a538ca535bd5f5f06281ad8 (patch)
tree844a672fba75743baa557155eb4a2de9a59838a2
parent79aed2eb56b6d5d207ecb9befb308408d9ea4afc (diff)
downloadxen-a028955ed160d44f7a538ca535bd5f5f06281ad8.tar.gz
xen/pm_idle: Make pm_idle call default_idle
This patch: commit d91ee5863b71e8c90eaf6035bff3078a85e2e7b5 Author: Len Brown <len.brown@intel.com> Date: Fri Apr 1 18:28:35 2011 -0400 cpuidle: replace xen access to x86 pm_idle and default_idle ..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. idea was to have one call - disable_cpuidle() which would make pm_idle not be molested by other code. Sadly it falls short of that and only dissallows cpuidle_idle_call and acpi_idle_call to not set pm_idle (which is good!). The amd_e400_idle and mwait_idle can still setup pm_idle which we really do not want. So lets make pm_idle be stuck to default_idle and that will thwart other generic code to overriding it. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-rw-r--r--arch/x86/xen/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index 46d6d21dbdbec..45136f2405ddc 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -448,6 +448,6 @@ void __init xen_arch_setup(void)
#endif
disable_cpuidle();
boot_option_idle_override = IDLE_HALT;
-
+ pm_idle = default_idle;
fiddle_vdso();
}