summary refs log tree commit diff
path: root/drivers/cpuidle
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2011-04-01 18:28:35 -0400
committerLen Brown <len.brown@intel.com>2011-08-03 19:06:36 -0400
commitd91ee5863b71e8c90eaf6035bff3078a85e2e7b5 (patch)
tree7c4972d8d6f614f656720ec686a6288de68f4af3 /drivers/cpuidle
parent62027aea23fcd14478abdddd3b74a4e0f5fb2984 (diff)
downloadlinux-d91ee5863b71e8c90eaf6035bff3078a85e2e7b5.tar.gz
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 'drivers/cpuidle')
-rw-r--r--drivers/cpuidle/cpuidle.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index faae2c357bab..041df0b056b2 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -34,6 +34,10 @@ int cpuidle_disabled(void)
 {
 	return off;
 }
+void disable_cpuidle(void)
+{
+	off = 1;
+}
 
 #if defined(CONFIG_ARCH_HAS_CPU_IDLE_WAIT)
 static void cpuidle_kick_cpus(void)