Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=5527398218aae85f37552a69fad163fa500c39e4
Commit:     5527398218aae85f37552a69fad163fa500c39e4
Parent:     69a331470ff02561cf1898eeb152ccca9f22bf53
Author:     Paul Mundt <[EMAIL PROTECTED]>
AuthorDate: Mon Jun 18 18:57:13 2007 +0900
Committer:  Paul Mundt <[EMAIL PROTECTED]>
CommitDate: Mon Jun 18 18:57:13 2007 +0900

    sh: oops_enter()/oops_exit() in die().
    
    As Russell helpfully pointed out on linux-arch:
    
        http://marc.info/?l=linux-arch&m=118208089204630&w=2
    
    We were missing the oops_enter/exit() in the sh die() implementation.
    As we do support lockdep, it's beneficial to add these calls so lockdep
    properly disables itself in the die() case.
    
    Signed-off-by: Paul Mundt <[EMAIL PROTECTED]>
---
 arch/sh/kernel/traps.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c
index 5b75cb6..8f18930 100644
--- a/arch/sh/kernel/traps.c
+++ b/arch/sh/kernel/traps.c
@@ -83,6 +83,8 @@ void die(const char * str, struct pt_regs * regs, long err)
 {
        static int die_counter;
 
+       oops_enter();
+
        console_verbose();
        spin_lock_irq(&die_lock);
        bust_spinlocks(1);
@@ -112,6 +114,7 @@ void die(const char * str, struct pt_regs * regs, long err)
        if (panic_on_oops)
                panic("Fatal exception");
 
+       oops_exit();
        do_exit(SIGSEGV);
 }
 
-
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