[PATCH] x86: add an accessor function for getting the per-CPU gdt

[linux-2.6-block.git] / arch / i386 / kernel / crash.c

diff --git a/arch/i386/kernel/crash.c b/arch/i386/kernel/crash.c
index e5fab12f79261a7856d298ac92765d1efa4d075b..0248e084017ceddd74bcc7e92052cef801b897ff 100644 (file)
--- a/arch/i386/kernel/crash.c
+++ b/arch/i386/kernel/crash.c
@@ -11,10 +11,8 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/smp.h>
-#include <linux/irq.h>
 #include <linux/reboot.h>
 #include <linux/kexec.h>
-#include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/elf.h>
 #include <linux/elfcore.h>
@@ -153,7 +151,7 @@ static int crash_nmi_callback(struct pt_regs *regs, int cpu)
        disable_local_APIC();
        atomic_dec(&waiting_for_crash_ipi);
        /* Assume hlt works */
-       __asm__("hlt");
+       halt();
        for(;;);
 
        return 1;