diff options
-rw-r--r-- | arch/arm/kernel/traps.c | 2 | ||||
-rw-r--r-- | arch/i386/kernel/traps.c | 2 | ||||
-rw-r--r-- | arch/ia64/kernel/traps.c | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/traps.c | 2 | ||||
-rw-r--r-- | arch/x86_64/kernel/traps.c | 2 | ||||
-rw-r--r-- | arch/xtensa/kernel/traps.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 4e29dd03e582..aeeed806f991 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c | |||
@@ -233,7 +233,7 @@ NORET_TYPE void die(const char *str, struct pt_regs *regs, int err) | |||
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 | panic("Fatal exception: panic_on_oops"); | 236 | panic("Fatal exception"); |
237 | 237 | ||
238 | do_exit(SIGSEGV); | 238 | do_exit(SIGSEGV); |
239 | } | 239 | } |
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c index 0d4005dc06c5..82e0fd02af1c 100644 --- a/arch/i386/kernel/traps.c +++ b/arch/i386/kernel/traps.c | |||
@@ -454,7 +454,7 @@ void die(const char * str, struct pt_regs * regs, long err) | |||
454 | panic("Fatal exception in interrupt"); | 454 | panic("Fatal exception in interrupt"); |
455 | 455 | ||
456 | if (panic_on_oops) | 456 | if (panic_on_oops) |
457 | panic("Fatal exception: panic_on_oops"); | 457 | panic("Fatal exception"); |
458 | 458 | ||
459 | oops_exit(); | 459 | oops_exit(); |
460 | do_exit(SIGSEGV); | 460 | do_exit(SIGSEGV); |
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c index 5a0420464c6c..fffa9e0826bc 100644 --- a/arch/ia64/kernel/traps.c +++ b/arch/ia64/kernel/traps.c | |||
@@ -118,7 +118,7 @@ die (const char *str, struct pt_regs *regs, long err) | |||
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 | panic("Fatal exception: panic_on_oops"); | 121 | panic("Fatal exception"); |
122 | 122 | ||
123 | do_exit(SIGSEGV); | 123 | do_exit(SIGSEGV); |
124 | } | 124 | } |
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 2105767fcc57..05682a24b210 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c | |||
@@ -151,7 +151,7 @@ int die(const char *str, struct pt_regs *regs, long err) | |||
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 | panic("Fatal exception: panic_on_oops"); | 154 | panic("Fatal exception"); |
155 | 155 | ||
156 | do_exit(err); | 156 | do_exit(err); |
157 | 157 | ||
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c index 4e9938dee060..14052f089814 100644 --- a/arch/x86_64/kernel/traps.c +++ b/arch/x86_64/kernel/traps.c | |||
@@ -529,7 +529,7 @@ void __kprobes oops_end(unsigned long flags) | |||
529 | /* Nest count reaches zero, release the lock. */ | 529 | /* Nest count reaches zero, release the lock. */ |
530 | spin_unlock_irqrestore(&die_lock, flags); | 530 | spin_unlock_irqrestore(&die_lock, flags); |
531 | if (panic_on_oops) | 531 | if (panic_on_oops) |
532 | panic("Fatal exception: panic_on_oops"); | 532 | panic("Fatal exception"); |
533 | } | 533 | } |
534 | 534 | ||
535 | void __kprobes __die(const char * str, struct pt_regs * regs, long err) | 535 | void __kprobes __die(const char * str, struct pt_regs * regs, long err) |
diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c index 9734960a2451..ce077d6bf3a0 100644 --- a/arch/xtensa/kernel/traps.c +++ b/arch/xtensa/kernel/traps.c | |||
@@ -488,7 +488,7 @@ void die(const char * str, struct pt_regs * regs, long err) | |||
488 | panic("Fatal exception in interrupt"); | 488 | panic("Fatal exception in interrupt"); |
489 | 489 | ||
490 | if (panic_on_oops) | 490 | if (panic_on_oops) |
491 | panic("Fatal exception: panic_on_oops"); | 491 | panic("Fatal exception"); |
492 | 492 | ||
493 | do_exit(err); | 493 | do_exit(err); |
494 | } | 494 | } |