diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-06-18 05:57:13 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-06-18 05:57:13 -0400 |
commit | 5527398218aae85f37552a69fad163fa500c39e4 (patch) | |
tree | b14b84f40ab42f248c3dbfd2c1384624fb57a197 | |
parent | 69a331470ff02561cf1898eeb152ccca9f22bf53 (diff) |
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 <lethal@linux-sh.org>
-rw-r--r-- | 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 5b75cb6f8f9b..8f18930d5bf8 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) | |||
83 | { | 83 | { |
84 | static int die_counter; | 84 | static int die_counter; |
85 | 85 | ||
86 | oops_enter(); | ||
87 | |||
86 | console_verbose(); | 88 | console_verbose(); |
87 | spin_lock_irq(&die_lock); | 89 | spin_lock_irq(&die_lock); |
88 | bust_spinlocks(1); | 90 | bust_spinlocks(1); |
@@ -112,6 +114,7 @@ void die(const char * str, struct pt_regs * regs, long err) | |||
112 | if (panic_on_oops) | 114 | if (panic_on_oops) |
113 | panic("Fatal exception"); | 115 | panic("Fatal exception"); |
114 | 116 | ||
117 | oops_exit(); | ||
115 | do_exit(SIGSEGV); | 118 | do_exit(SIGSEGV); |
116 | } | 119 | } |
117 | 120 | ||