X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=blobdiff_plain;f=arch%2Fx86_64%2Fkernel%2Fcrash.c;fp=arch%2Fx86_64%2Fkernel%2Fcrash.c;h=4e6c3b729e39793b39c0bcaed3a10e0e1832b0ec;hp=d8d5750d6106a1270817a360868cdbfb3d281338;hb=64ba3f394c830ec48a1c31b53dcae312c56f1604;hpb=be1e6109ac94a859551f8e1774eb9a8469fe055c

diff --git a/arch/x86_64/kernel/crash.c b/arch/x86_64/kernel/crash.c
index d8d5750d6..4e6c3b729 100644
--- a/arch/x86_64/kernel/crash.c
+++ b/arch/x86_64/kernel/crash.c
@@ -111,14 +111,14 @@ static int crash_nmi_callback(struct pt_regs *regs, int cpu)
 	atomic_dec(&waiting_for_crash_ipi);
 	/* Assume hlt works */
 	for(;;)
-		halt();
+		asm("hlt");
 
 	return 1;
 }
 
 static void smp_send_nmi_allbutself(void)
 {
-	send_IPI_allbutself(NMI_VECTOR);
+	send_IPI_allbutself(APIC_DM_NMI);
 }
 
 /*
@@ -161,7 +161,7 @@ void machine_crash_shutdown(struct pt_regs *regs)
 {
 	/*
 	 * This function is only called after the system
-	 * has panicked or is otherwise in a critical state.
+	 * has paniced or is otherwise in a critical state.
 	 * The minimum amount of code to allow a kexec'd kernel
 	 * to run successfully needs to happen here.
 	 *