aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc
diff options
context:
space:
mode:
authoranton@samba.org <anton@samba.org>2007-03-20 21:38:11 -0400
committerPaul Mackerras <paulus@samba.org>2007-03-25 22:34:27 -0400
commit293e4688fe2fec87fccf84a3b1100b27191424e9 (patch)
treee91f12cf60212ab6397cce6519e93e55af8489fa /arch/powerpc
parent4002aca771a2aa2848e94a98cf51a2cae4e77ae0 (diff)
[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>
Diffstat (limited to 'arch/powerpc')
-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)
99 if (debugger(regs)) 99 if (debugger(regs))
100 return 1; 100 return 1;
101 101
102 oops_enter();
103
102 console_verbose(); 104 console_verbose();
103 spin_lock_irq(&die_lock); 105 spin_lock_irq(&die_lock);
104 bust_spinlocks(1); 106 bust_spinlocks(1);
@@ -145,6 +147,7 @@ int die(const char *str, struct pt_regs *regs, long err)
145 if (panic_on_oops) 147 if (panic_on_oops)
146 panic("Fatal exception"); 148 panic("Fatal exception");
147 149
150 oops_exit();
148 do_exit(err); 151 do_exit(err);
149 152
150 return 0; 153 return 0;