[Xen-changelog] [linux-2.6.18-xen] xen, x86: Revert changes to use non-existent xen_halt() function.

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1201038764 0
# Node ID 947e0701cf7aecce9e1b391f5dadbb5024e48e12
# Parent  fcb425c038efcbbe9af0cbc279ed4101b7b4276b
xen, x86: Revert changes to use non-existent xen_halt() function.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 arch/i386/kernel/process-xen.c   |    3 ++-
 arch/x86_64/kernel/process-xen.c |    3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff -r fcb425c038ef -r 947e0701cf7a arch/i386/kernel/process-xen.c
--- a/arch/i386/kernel/process-xen.c    Tue Jan 22 19:48:26 2008 +0000
+++ b/arch/i386/kernel/process-xen.c    Tue Jan 22 21:52:44 2008 +0000
@@ -137,7 +137,8 @@ static inline void play_dead(void)
        idle_task_exit();
        local_irq_disable();
        cpu_clear(smp_processor_id(), cpu_initialized);
-       xen_halt();
+       preempt_enable_no_resched();
+       VOID(HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL));
        cpu_bringup();
 }
 #else
diff -r fcb425c038ef -r 947e0701cf7a arch/x86_64/kernel/process-xen.c
--- a/arch/x86_64/kernel/process-xen.c  Tue Jan 22 19:48:26 2008 +0000
+++ b/arch/x86_64/kernel/process-xen.c  Tue Jan 22 21:52:44 2008 +0000
@@ -151,7 +151,8 @@ static inline void play_dead(void)
        idle_task_exit();
        local_irq_disable();
        cpu_clear(smp_processor_id(), cpu_initialized);
-       xen_halt();
+       preempt_enable_no_resched();
+       VOID(HYPERVISOR_vcpu_op(VCPUOP_down, smp_processor_id(), NULL));
        cpu_bringup();
 }
 #else

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