The patch titled
x86_64: fix default_do_nmi() missing return after an if ()
has been removed from the -mm tree. Its filename was
x86_64-fix-default_do_nmi-missing-return-after-a-if.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: x86_64: fix default_do_nmi() missing return after an if ()
From: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86_64/kernel/traps.c | 1 +
1 file changed, 1 insertion(+)
diff -puN arch/x86_64/kernel/traps.c~x86_64-fix-default_do_nmi-missing-return-after-a-if arch/x86_64/kernel/traps.c
--- a/arch/x86_64/kernel/traps.c~x86_64-fix-default_do_nmi-missing-return-after-a-if
+++ a/arch/x86_64/kernel/traps.c
@@ -778,6 +778,7 @@ asmlinkage __kprobes void default_do_nmi
return;
if (notify_die(DIE_NMI_POST, "nmi_post", regs, reason, 2, 0)
== NOTIFY_STOP)
+ return;
if (!do_nmi_callback(regs,cpu))
unknown_nmi_error(reason, regs);
_
Patches currently in -mm which might be from mathieu.desnoyers@xxxxxxxxxx are
origin.patch
git-avr32.patch
powerpc-promc-remove-undef-printk.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
