aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathieu Desnoyers <mathieu.desnoyers@polymtl.ca>2007-05-10 06:15:15 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-10 12:26:52 -0400
commit02b67325a6d34f2ae67484a8802b6ffc9ce9931d (patch)
treea3cc9248dd5b7e16ee22d69808cff80cc80e602d
parentde5603748af8bf7deac403e6ba92887f8d18e812 (diff)
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>
-rw-r--r--arch/x86_64/kernel/traps.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c
index 8c2ac41187c1..d28f01379b9b 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)
778 return; 778 return;
779 if (notify_die(DIE_NMI_POST, "nmi_post", regs, reason, 2, 0) 779 if (notify_die(DIE_NMI_POST, "nmi_post", regs, reason, 2, 0)
780 == NOTIFY_STOP) 780 == NOTIFY_STOP)
781 return;
781 if (!do_nmi_callback(regs,cpu)) 782 if (!do_nmi_callback(regs,cpu))
782 unknown_nmi_error(reason, regs); 783 unknown_nmi_error(reason, regs);
783 784