diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2007-06-18 11:57:13 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2007-06-18 11:57:13 +0200 |
| commit | 5527398218aae85f37552a69fad163fa500c39e4 (patch) | |
| tree | b14b84f40ab42f248c3dbfd2c1384624fb57a197 | |
| parent | sh: Fix restartable syscall arg5 clobbering. (diff) | |
| download | linux-5527398218aae85f37552a69fad163fa500c39e4.tar.xz linux-5527398218aae85f37552a69fad163fa500c39e4.zip | |
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) { 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); } |