Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f22c578 authored by Vivek Goyal's avatar Vivek Goyal Committed by Andi Kleen
Browse files

[PATCH] kdump x86_64 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 c7c19f8e

arch/x86_64/kernel/crash.c

+2 −2
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static int crash_nmi_callback(struct notifier_block *self, 
	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 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();



	crash_save_this_cpu(regs, cpu);