diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-27 22:59:59 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-27 22:59:59 -0400 |
| commit | 8ce7a9c159c8c4eb480f0a65c6af753dbf9a1a70 (patch) | |
| tree | be59573c0af3617d0cd8a7d61f0ed119e58b1156 /arch/arm/kernel/traps.c | |
| parent | d2afb3ae04e36dbc6e9eb2d8bd54406ff7b6b3bd (diff) | |
| parent | 01da5fd83d6b2c5e36b77539f6cbdd8f49849225 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/arm/kernel/traps.c')
| -rw-r--r-- | arch/arm/kernel/traps.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 35a052fc177a..aeeed806f991 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c | |||
| @@ -232,11 +232,8 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err) | |||
| 232 | bust_spinlocks(0); | 232 | bust_spinlocks(0); |
| 233 | spin_unlock_irq(&die_lock); | 233 | spin_unlock_irq(&die_lock); |
| 234 | 234 | ||
| 235 | if (panic_on_oops) { | 235 | if (panic_on_oops) |
| 236 | printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n"); | ||
| 237 | ssleep(5); | ||
| 238 | panic("Fatal exception"); | 236 | panic("Fatal exception"); |
| 239 | } | ||
| 240 | 237 | ||
| 241 | do_exit(SIGSEGV); | 238 | do_exit(SIGSEGV); |
| 242 | } | 239 | } |