[PATCH] kdump x86_64 nmi event notification fix

[Vivek Goyal <vgoyal@in.ibm.com>]

o After a crash we should wait for NMI IPI event and not for external NMI
  or NMI watchdog tick.

Signed-off-by: Vivek Goyal <vgoyal@in.ibm.com>
---

 linux-2.6.17-rc4-1M-vivek/arch/x86_64/kernel/crash.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN arch/x86_64/kernel/crash.c~kdump-x86_64-nmi-event-notification-fix arch/x86_64/kernel/crash.c
--- linux-2.6.17-rc4-1M/arch/x86_64/kernel/crash.c~kdump-x86_64-nmi-event-notification-fix	2006-05-15 13:26:41.000000000 -0400
+++ linux-2.6.17-rc4-1M-vivek/arch/x86_64/kernel/crash.c	2006-05-15 13:27:02.000000000 -0400
@@ -102,7 +102,7 @@ static int crash_nmi_callback(struct not
 	struct pt_regs *regs;
 	int cpu;
 
-	if (val != DIE_NMI)
+	if (val != DIE_NMI_IPI)
 		return NOTIFY_OK;
 
 	regs = ((struct die_args *)data)->regs;
@@ -114,7 +114,7 @@ static int crash_nmi_callback(struct not
 	 * an NMI if system was initially booted with nmi_watchdog parameter.
 	 */
 	if (cpu == crashing_cpu)
-		return 1;
+		return NOTIFY_STOP;
 	local_irq_disable();
 
 	crash_save_this_cpu(regs, cpu);
_
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/