diff options
| author | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-02-28 14:34:25 +0000 |
|---|---|---|
| committer | kfraser@localhost.localdomain <kfraser@localhost.localdomain> | 2007-02-28 14:34:25 +0000 |
| commit | 82972d6f109ae72753459fb671a8f729e65767c4 (patch) | |
| tree | 7f387af0c527eedd99a5e0ceff678c0b757380aa /linux-2.6-xen-sparse | |
| parent | ed2bd98ac2e891b9aef1053679b22057eadc65b7 (diff) | |
| download | xen-82972d6f109ae72753459fb671a8f729e65767c4.tar.gz xen-82972d6f109ae72753459fb671a8f729e65767c4.tar.bz2 xen-82972d6f109ae72753459fb671a8f729e65767c4.zip | |
linux: Disable idle-loop alternatives.
ACPI and APM idle functions in particular are not suitable choices
when running on Xen.
Signed-off-by: Keir Fraser <keir@xensource.com>
Diffstat (limited to 'linux-2.6-xen-sparse')
| -rw-r--r-- | linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c | 7 | ||||
| -rw-r--r-- | linux-2.6-xen-sparse/arch/x86_64/kernel/process-xen.c | 6 |
2 files changed, 4 insertions, 9 deletions
diff --git a/linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c b/linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c index 73b325132f..2225fcc962 100644 --- a/linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c +++ b/linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c @@ -101,7 +101,7 @@ EXPORT_SYMBOL(enable_hlt); * to poll the ->work.need_resched flag instead of waiting for the * cross-CPU IPI to arrive. Use this option with caution. */ -static void poll_idle(void) +static void poll_idle (void) { local_irq_enable(); @@ -169,10 +169,7 @@ void cpu_idle(void) __get_cpu_var(cpu_idle_state) = 0; rmb(); - idle = pm_idle; - - if (!idle) - idle = xen_idle; + idle = xen_idle; /* no alternatives */ if (cpu_is_offline(cpu)) play_dead(); diff --git a/linux-2.6-xen-sparse/arch/x86_64/kernel/process-xen.c b/linux-2.6-xen-sparse/arch/x86_64/kernel/process-xen.c index ada9751fb3..6a7bf2ed37 100644 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/process-xen.c +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/process-xen.c @@ -117,7 +117,7 @@ void exit_idle(void) * to poll the ->need_resched flag instead of waiting for the * cross-CPU IPI to arrive. Use this option with caution. */ -static void poll_idle(void) +static void poll_idle (void) { local_irq_enable(); @@ -179,9 +179,7 @@ void cpu_idle (void) if (__get_cpu_var(cpu_idle_state)) __get_cpu_var(cpu_idle_state) = 0; rmb(); - idle = pm_idle; - if (!idle) - idle = xen_idle; + idle = xen_idle; /* no alternatives */ if (cpu_is_offline(smp_processor_id())) play_dead(); enter_idle(); |