summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoranton@samba.org <anton@samba.org>2007-03-20 20:38:11 -0500
committerPaul Mackerras <paulus@samba.org>2007-03-26 12:34:27 +1000
commit293e4688fe2fec87fccf84a3b1100b27191424e9 (patch)
treee91f12cf60212ab6397cce6519e93e55af8489fa
parent4002aca771a2aa2848e94a98cf51a2cae4e77ae0 (diff)
downloadlinux-stable-293e4688fe2fec87fccf84a3b1100b27191424e9.tar.gz
linux-stable-293e4688fe2fec87fccf84a3b1100b27191424e9.tar.bz2
linux-stable-293e4688fe2fec87fccf84a3b1100b27191424e9.zip
[POWERPC] Add missing oops_enter/oops_exit
Add missing oops_enter/oops_exit, makes pause_on_oops boot parameter work. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
-rw-r--r--arch/powerpc/kernel/traps.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 17724fb2067f..23f43b44bba6 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -99,6 +99,8 @@ int die(const char *str, struct pt_regs *regs, long err)
if (debugger(regs))
return 1;
+ oops_enter();
+
console_verbose();
spin_lock_irq(&die_lock);
bust_spinlocks(1);
@@ -145,6 +147,7 @@ int die(const char *str, struct pt_regs *regs, long err)
if (panic_on_oops)
panic("Fatal exception");
+ oops_exit();
do_exit(err);
return 0;