---

yaml --- r: 293981 b: refs/heads/master c: cc7335b h: refs/heads/master i: 293979: 54e3a01 v: v3
git-mirror · Mar 10, 2012 · 074a508 · 074a508
1 parent e9ae11c
commit 074a508
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ac0800143181a0fdae6a7c1b2fa0fa942c1cd06
+refs/heads/master: cc7335b2f6acc0f24c7fac80ce536301f7d52214
diff --git a/trunk/arch/x86/xen/setup.c b/trunk/arch/x86/xen/setup.c
@@ -420,7 +420,6 @@ void __init xen_arch_setup(void)
 	boot_cpu_data.hlt_works_ok = 1;
 #endif
 	disable_cpuidle();
-	boot_option_idle_override = IDLE_HALT;
 	WARN_ON(set_pm_idle_to_default());
 	fiddle_vdso();
 }