[PATCH] i386: Kdump i386 nmi event notification fix

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>
Signed-off-by: Andi Kleen <ak@suse.de>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>

diff --git a/arch/i386/kernel/crash.c b/arch/i386/kernel/crash.c
index 736c76d6b31d985ba00080f40808374b0759a26c..67d297dc1003cd0d1fec64ade9fba9fd4218a33f 100644 (file)
--- a/arch/i386/kernel/crash.c
+++ b/arch/i386/kernel/crash.c
@@ -102,7 +102,7 @@ static int crash_nmi_callback(struct notifier_block *self,
        struct pt_regs fixed_regs;
        int cpu;
 
-       if (val != DIE_NMI)
+       if (val != DIE_NMI_IPI)
                return NOTIFY_OK;
 
        regs = ((struct die_args *)data)->regs;
@@ -113,7 +113,7 @@ static int crash_nmi_callback(struct notifier_block *self,
         * an NMI if system was initially booted with nmi_watchdog parameter.
         */
        if (cpu == crashing_cpu)
-               return 1;
+               return NOTIFY_STOP;
        local_irq_disable();
 
        if (!user_mode_vm(regs)) {