- patches.apparmor/remove_suid_new_case_in_2.6.22.diff: Merge fix.

[linux-flexiantxendom0-3.2.10.git] / arch / i386 / kernel / crash.c

diff --git a/arch/i386/kernel/crash.c b/arch/i386/kernel/crash.c
index 12f40a8..53589d1 100644 (file)
--- a/arch/i386/kernel/crash.c
+++ b/arch/i386/kernel/crash.c
@@ -22,12 +22,12 @@
 #include <asm/nmi.h>
 #include <asm/hw_irq.h>
 #include <asm/apic.h>
-#include <asm/kdebug.h>
+#include <linux/kdebug.h>
 #include <asm/smp.h>
 
 #include <mach_ipi.h>
 
-#ifndef CONFIG_XEN
+
 /* This keeps a track of which one is crashing cpu. */
 static int crashing_cpu;
 
@@ -112,7 +112,6 @@ static void nmi_shootdown_cpus(void)
        /* There are no cpus to shootdown */
 }
 #endif
-#endif /* CONFIG_XEN */
 
 void machine_crash_shutdown(struct pt_regs *regs)
 {
@@ -127,7 +126,6 @@ void machine_crash_shutdown(struct pt_regs *regs)
        /* The kernel is broken so disable interrupts */
        local_irq_disable();
 
-#ifndef CONFIG_XEN
        /* Make a note of crashing cpu. Will be used in NMI callback.*/
        crashing_cpu = safe_smp_processor_id();
        nmi_shootdown_cpus();
@@ -136,7 +134,4 @@ void machine_crash_shutdown(struct pt_regs *regs)
        disable_IO_APIC();
 #endif
        crash_save_cpu(regs, safe_smp_processor_id());
-#else
-       crash_save_cpu(regs, smp_processor_id());
-#endif /* CONFIG_XEN */
 }