diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:15:21 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-02 14:15:21 -0400 |
| commit | ebf572b448757190027d8ee34e73deb989ec7b60 (patch) | |
| tree | 2320a92b1aed2c9475e291d75c92616af75e195a /arch/powerpc/kernel/traps.c | |
| parent | 48c86da1a211ef13bbfb1c8f2e35dda44a66b8a1 (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'from-linus' into bcm43xx
Diffstat (limited to 'arch/powerpc/kernel/traps.c')
| -rw-r--r-- | arch/powerpc/kernel/traps.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 3c668078e524..2105767fcc57 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c | |||
| @@ -150,13 +150,9 @@ int die(const char *str, struct pt_regs *regs, long err) | |||
| 150 | if (in_interrupt()) | 150 | if (in_interrupt()) |
| 151 | panic("Fatal exception in interrupt"); | 151 | panic("Fatal exception in interrupt"); |
| 152 | 152 | ||
| 153 | if (panic_on_oops) { | 153 | if (panic_on_oops) |
| 154 | #ifdef CONFIG_PPC64 | 154 | panic("Fatal exception: panic_on_oops"); |
| 155 | printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n"); | 155 | |
| 156 | ssleep(5); | ||
| 157 | #endif | ||
| 158 | panic("Fatal exception"); | ||
| 159 | } | ||
| 160 | do_exit(err); | 156 | do_exit(err); |
| 161 | 157 | ||
| 162 | return 0; | 158 | return 0; |