x86_64-mm-remove-un-set_nmi_callback-and-reserve-release_lapic_nmi-functions-x86-fix-fix From: Andrew Morton notify_die() can be called for various reasons and we don't seem to have an NMI-specific call back now. Handle that. Cc: Don Zickus Cc: Andi Kleen Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Andi Kleen --- arch/i386/kernel/crash.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) Index: linux/arch/i386/kernel/crash.c =================================================================== --- linux.orig/arch/i386/kernel/crash.c +++ linux/arch/i386/kernel/crash.c @@ -98,9 +98,15 @@ static atomic_t waiting_for_crash_ipi; static int crash_nmi_callback(struct notifier_block *self, unsigned long val, void *data) { - struct pt_regs *regs = ((struct die_args *)data)->regs; + struct pt_regs *regs; struct pt_regs fixed_regs; - int cpu = raw_smp_processor_id(); + int cpu; + + if (val != DIE_NMI) + return NOTIFY_OK; + + regs = ((struct die_args *)data)->regs; + cpu = raw_smp_processor_id(); /* Don't do anything if this handler is invoked on crashing cpu. * Otherwise, system will completely hang. Crashing cpu can get