xen/panic: use xen_reboot and fix smp_send_stop

Offline vcpu when using stop_self.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index d99522e8f033c077288a17ed44197d09fc569eac..3c4da8bee06fe0cd5f0b357acc628c682d6fafcb 100644 (file)
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1043,10 +1043,7 @@ static void xen_crash_shutdown(struct pt_regs *regs)
 static int
 xen_panic_event(struct notifier_block *this, unsigned long event, void *ptr)
 {
-       struct sched_shutdown r = { .reason = SHUTDOWN_crash};
-
-       if (HYPERVISOR_sched_op(SCHEDOP_shutdown, &r))
-               BUG();
+       xen_reboot(SHUTDOWN_crash);
        return NOTIFY_DONE;
 }
 

diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index a29693fd3138e06bbd46ad875249da6c5a35cdce..25f232b18a823a5e3f015c2dfac4b38a39dcb2ed 100644 (file)
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -394,6 +394,8 @@ static void stop_self(void *v)
        load_cr3(swapper_pg_dir);
        /* should set up a minimal gdt */
 
+       set_cpu_online(cpu, false);
+
        HYPERVISOR_vcpu_op(VCPUOP_down, cpu, NULL);
        BUG();
 }