diff options
Diffstat (limited to 'arch/ia64/kernel/traps.c')
| -rw-r--r-- | arch/ia64/kernel/traps.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c index e7bbb0f40aa2..5a0420464c6c 100644 --- a/arch/ia64/kernel/traps.c +++ b/arch/ia64/kernel/traps.c | |||
| @@ -117,11 +117,8 @@ die (const char *str, struct pt_regs *regs, long err) | |||
| 117 | die.lock_owner = -1; | 117 | die.lock_owner = -1; |
| 118 | spin_unlock_irq(&die.lock); | 118 | spin_unlock_irq(&die.lock); |
| 119 | 119 | ||
| 120 | if (panic_on_oops) { | 120 | if (panic_on_oops) |
| 121 | printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n"); | 121 | panic("Fatal exception: panic_on_oops"); |
| 122 | ssleep(5); | ||
| 123 | panic("Fatal exception"); | ||
| 124 | } | ||
| 125 | 122 | ||
| 126 | do_exit(SIGSEGV); | 123 | do_exit(SIGSEGV); |
| 127 | } | 124 | } |
