Commit 260d6790 authored by Vivek Goyal's avatar Vivek Goyal Committed by Andi Kleen
Browse files

[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: default avatarVivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
parent 3f22c578
...@@ -102,7 +102,7 @@ static int crash_nmi_callback(struct notifier_block *self, ...@@ -102,7 +102,7 @@ static int crash_nmi_callback(struct notifier_block *self,
struct pt_regs fixed_regs; struct pt_regs fixed_regs;
int cpu; int cpu;
if (val != DIE_NMI) if (val != DIE_NMI_IPI)
return NOTIFY_OK; return NOTIFY_OK;
regs = ((struct die_args *)data)->regs; regs = ((struct die_args *)data)->regs;
...@@ -113,7 +113,7 @@ static int crash_nmi_callback(struct notifier_block *self, ...@@ -113,7 +113,7 @@ static int crash_nmi_callback(struct notifier_block *self,
* an NMI if system was initially booted with nmi_watchdog parameter. * an NMI if system was initially booted with nmi_watchdog parameter.
*/ */
if (cpu == crashing_cpu) if (cpu == crashing_cpu)
return 1; return NOTIFY_STOP;
local_irq_disable(); local_irq_disable();
if (!user_mode_vm(regs)) { if (!user_mode_vm(regs)) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment