[Xen-changelog] [xen-unstable] linux: Disable idle-loop alternatives.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1172673265 0
# Node ID 868c28c0a4f4384014d170dad0a720ca99b0b3e9
# Parent  aac0a4b8e3287bccf9367708a457bf282e948902
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@xxxxxxxxxxxxx>
---
 linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c   |    7 ++-----
 linux-2.6-xen-sparse/arch/x86_64/kernel/process-xen.c |    6 ++----
 2 files changed, 4 insertions(+), 9 deletions(-)

diff -r aac0a4b8e328 -r 868c28c0a4f4 
linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c
--- a/linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c       Wed Feb 28 
14:26:26 2007 +0000
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/process-xen.c       Wed Feb 28 
14:34:25 2007 +0000
@@ -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 -r aac0a4b8e328 -r 868c28c0a4f4 
linux-2.6-xen-sparse/arch/x86_64/kernel/process-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/process-xen.c     Wed Feb 28 
14:26:26 2007 +0000
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/process-xen.c     Wed Feb 28 
14:34:25 2007 +0000
@@ -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();

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog