Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=02b67325a6d34f2ae67484a8802b6ffc9ce9931d
Commit:     02b67325a6d34f2ae67484a8802b6ffc9ce9931d
Parent:     de5603748af8bf7deac403e6ba92887f8d18e812
Author:     Mathieu Desnoyers <[EMAIL PROTECTED]>
AuthorDate: Thu May 10 03:15:15 2007 -0700
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu May 10 09:26:52 2007 -0700

    x86_64: fix default_do_nmi() missing return after an if ()
    
    Signed-off-by: Mathieu Desnoyers <[EMAIL PROTECTED]>
    Cc: Andi Kleen <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 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 8c2ac41..d28f013 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);
 
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to