From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Date: Thu, 10 May 2007 10:15:15 +0000 (-0700)
Subject: x86_64: fix default_do_nmi() missing return after an if ()
X-Git-Tag: v2.6.22-rc1~129
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=02b67325a6d34f2ae67484a8802b6ffc9ce9931d;p=linux-2.6-omap-h63xx.git

x86_64: fix default_do_nmi() missing return after an if ()

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c
index 8c2ac41187c..d28f01379b9 100644
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
@@ -778,6 +778,7 @@ asmlinkage __kprobes void default_do_nmi(struct pt_regs *regs)
 			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);