diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-22 15:21:57 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-22 15:21:57 -0800 |
commit | 1a6a35894f10870d5590199d1785d3a718927abe (patch) | |
tree | ab3ab04b0ff2614ed7c322b31cbde9b6481addc1 /arch/arm/kernel/traps.c | |
parent | 245599f573f302bfa27a0436408c80f13b457046 (diff) | |
parent | 06e4479bd092eca4125e5507e7c22619a491dab3 (diff) | |
download | op-kernel-dev-1a6a35894f10870d5590199d1785d3a718927abe.zip op-kernel-dev-1a6a35894f10870d5590199d1785d3a718927abe.tar.gz |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/kernel/traps.c')
-rw-r--r-- | arch/arm/kernel/traps.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 10235b0..03924bc 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -19,6 +19,7 @@ #include <linux/personality.h> #include <linux/ptrace.h> #include <linux/kallsyms.h> +#include <linux/delay.h> #include <linux/init.h> #include <asm/atomic.h> @@ -231,6 +232,13 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err) __die(str, err, thread, regs); bust_spinlocks(0); spin_unlock_irq(&die_lock); + + if (panic_on_oops) { + printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n"); + ssleep(5); + panic("Fatal exception"); + } + do_exit(SIGSEGV); } |