diff --git a/[refs] b/[refs]
index 6f09487f4e6e..ed7c84b1bf38 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7cb31b752c71e0bd405c1139e1907c3335877dff
+refs/heads/master: 23febeddbe67e5160929f7c48f7bfe83c2eecb99
diff --git a/trunk/arch/x86/xen/setup.c b/trunk/arch/x86/xen/setup.c
index 75bdf2ab3d7c..a8a66a50d446 100644
--- a/trunk/arch/x86/xen/setup.c
+++ b/trunk/arch/x86/xen/setup.c
@@ -355,6 +355,7 @@ void __init xen_arch_setup(void)
 	boot_cpu_data.hlt_works_ok = 1;
 #endif
 	pm_idle = default_idle;
+	boot_option_idle_override = IDLE_HALT;
 
 	fiddle_vdso();
 }