aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-11-09 13:44:12 -0500
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-11-09 16:02:14 -0500
commitc27ff91eab5a78fc32e11930ff42426eab8a4773 (patch)
tree81e0f1331e50e6190224a45b89d85a2e28d255ed
parenta028955ed160d44f7a538ca535bd5f5f06281ad8 (diff)
downloadxen-c27ff91eab5a78fc32e11930ff42426eab8a4773.tar.gz
xen/pvhvm: Use default_idle on pm_idle call.
..instead of: acpi_cpuidle, cpuidle_idle, amd_e400_idle, or mwait_idle. Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
-rw-r--r--arch/x86/xen/enlighten.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 2d69617950f7c..6afee5e41565e 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1389,6 +1389,10 @@ static void __init xen_hvm_guest_init(void)
x86_init.irqs.intr_init = xen_init_IRQ;
xen_hvm_init_time_ops();
xen_hvm_init_mmu_ops();
+ /* And use the HLT to trap */
+ disable_cpuidle();
+ boot_option_idle_override = IDLE_HALT;
+ pm_idle = default_idle;
}
static bool __init xen_hvm_platform(void)