aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/traps.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2011-11-17 10:07:31 -0500
committerRalf Baechle <ralf@linux-mips.org>2011-12-07 17:01:45 -0500
commitab75dc02c151c9d2a2fd446334d740b097a3b9db (patch)
tree45270931b489a1260e2d2aa3b9ffb1ef7347cfb6 /arch/mips/kernel/traps.c
parent864c6c22e9a5742b0f43c983b6c405d52817bacd (diff)
MIPS: Fix up inconsistency in panic() string argument.
Panic() invokes printk() to add a \n internally, so panic arguments should not themselves end in \n. Panic invocations in arch/mips and elsewhere are inconsistently sometimes terminating in \n, sometimes not. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/kernel/traps.c')
-rw-r--r--arch/mips/kernel/traps.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 5c8a49d5505..363c4764b81 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -400,7 +400,7 @@ void __noreturn die(const char *str, struct pt_regs *regs)
400 panic("Fatal exception in interrupt"); 400 panic("Fatal exception in interrupt");
401 401
402 if (panic_on_oops) { 402 if (panic_on_oops) {
403 printk(KERN_EMERG "Fatal exception: panic in 5 seconds\n"); 403 printk(KERN_EMERG "Fatal exception: panic in 5 seconds");
404 ssleep(5); 404 ssleep(5);
405 panic("Fatal exception"); 405 panic("Fatal exception");
406 } 406 }
@@ -1150,7 +1150,7 @@ asmlinkage void do_mt(struct pt_regs *regs)
1150asmlinkage void do_dsp(struct pt_regs *regs) 1150asmlinkage void do_dsp(struct pt_regs *regs)
1151{ 1151{
1152 if (cpu_has_dsp) 1152 if (cpu_has_dsp)
1153 panic("Unexpected DSP exception\n"); 1153 panic("Unexpected DSP exception");
1154 1154
1155 force_sig(SIGILL, current); 1155 force_sig(SIGILL, current);
1156} 1156}