aboutsummaryrefslogtreecommitdiffstats
path: root/arch/parisc/kernel/traps.c
diff options
context:
space:
mode:
authorAaro Koskinen <aaro.koskinen@iki.fi>2016-03-09 22:08:43 +0200
committerHelge Deller <deller@gmx.de>2016-03-23 15:46:16 +0100
commitc95a23da2ea5328ba467ea1a57e2915b1fb19376 (patch)
treecd9ecabfd83b3f80f55238e2bac039e9f8a006d3 /arch/parisc/kernel/traps.c
parentparisc,metag: Implement CONFIG_DEBUG_STACK_USAGE option (diff)
downloadlinux-dev-c95a23da2ea5328ba467ea1a57e2915b1fb19376.tar.xz
linux-dev-c95a23da2ea5328ba467ea1a57e2915b1fb19376.zip
parisc: Panic immediately when panic_on_oops
PA-RISC wants to sleep 5 seconds before panicking when panic_on_oops is set, with no apparent reason. Remove this feature, since some users may want their systems to fail as quickly as possible. Users who want to delay reboot after panic can use PANIC_TIMEOUT. Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi> Acked-by: Helge Deller <deller@gmx.de> Signed-off-by: Helge Deller <deller@gmx.de>
Diffstat (limited to '')
-rw-r--r--arch/parisc/kernel/traps.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c
index 553b09855cfd..16e0735e2f46 100644
--- a/arch/parisc/kernel/traps.c
+++ b/arch/parisc/kernel/traps.c
@@ -284,11 +284,8 @@ void die_if_kernel(char *str, struct pt_regs *regs, long err)
if (in_interrupt())
panic("Fatal exception in interrupt");
- if (panic_on_oops) {
- printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n");
- ssleep(5);
+ if (panic_on_oops)
panic("Fatal exception");
- }
oops_exit();
do_exit(SIGSEGV);