diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-01-23 10:53:57 -0500 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2012-03-10 12:44:09 -0500 |
| commit | cc7335b2f6acc0f24c7fac80ce536301f7d52214 (patch) | |
| tree | b1c6461b76f0a1d18e2ab430a7c95448dfa82634 | |
| parent | 5ac0800143181a0fdae6a7c1b2fa0fa942c1cd06 (diff) | |
| download | linux-cc7335b2f6acc0f24c7fac80ce536301f7d52214.tar.gz linux-cc7335b2f6acc0f24c7fac80ce536301f7d52214.tar.bz2 linux-cc7335b2f6acc0f24c7fac80ce536301f7d52214.zip | |
xen/setup/pm/acpi: Remove the call to boot_option_idle_override.
We needed that call in the past to force the kernel to use
default_idle (which called safe_halt, which called xen_safe_halt).
But set_pm_idle_to_default() does now that, so there is no need
to use this boot option operand.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
| -rw-r--r-- | arch/x86/xen/setup.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c index e03c63692176..12366238d07d 100644 --- a/arch/x86/xen/setup.c +++ b/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(); } |