diff options
| author | Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca> | 2007-05-10 03:15:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-10 09:26:52 -0700 |
| commit | 02b67325a6d34f2ae67484a8802b6ffc9ce9931d (patch) | |
| tree | a3cc9248dd5b7e16ee22d69808cff80cc80e602d | |
| parent | de5603748af8bf7deac403e6ba92887f8d18e812 (diff) | |
| download | talos-obmc-linux-02b67325a6d34f2ae67484a8802b6ffc9ce9931d.tar.gz talos-obmc-linux-02b67325a6d34f2ae67484a8802b6ffc9ce9931d.zip | |
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.c | 1 |
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) 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); |
