diff options
Diffstat (limited to 'arch/mips/kernel')
-rw-r--r-- | arch/mips/kernel/smtc.c | 4 | ||||
-rw-r--r-- | arch/mips/kernel/traps.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/kernel/smtc.c b/arch/mips/kernel/smtc.c index f0895e70e283..b1eea63cc988 100644 --- a/arch/mips/kernel/smtc.c +++ b/arch/mips/kernel/smtc.c | |||
@@ -559,7 +559,7 @@ void smtc_prepare_cpus(int cpus) | |||
559 | 559 | ||
560 | pipi = kmalloc(nipi *sizeof(struct smtc_ipi), GFP_KERNEL); | 560 | pipi = kmalloc(nipi *sizeof(struct smtc_ipi), GFP_KERNEL); |
561 | if (pipi == NULL) | 561 | if (pipi == NULL) |
562 | panic("kmalloc of IPI message buffers failed\n"); | 562 | panic("kmalloc of IPI message buffers failed"); |
563 | else | 563 | else |
564 | printk("IPI buffer pool of %d buffers\n", nipi); | 564 | printk("IPI buffer pool of %d buffers\n", nipi); |
565 | for (i = 0; i < nipi; i++) { | 565 | for (i = 0; i < nipi; i++) { |
@@ -813,7 +813,7 @@ void smtc_send_ipi(int cpu, int type, unsigned int action) | |||
813 | if (pipi == NULL) { | 813 | if (pipi == NULL) { |
814 | bust_spinlocks(1); | 814 | bust_spinlocks(1); |
815 | mips_mt_regdump(dvpe()); | 815 | mips_mt_regdump(dvpe()); |
816 | panic("IPI Msg. Buffers Depleted\n"); | 816 | panic("IPI Msg. Buffers Depleted"); |
817 | } | 817 | } |
818 | pipi->type = type; | 818 | pipi->type = type; |
819 | pipi->arg = (void *)action; | 819 | pipi->arg = (void *)action; |
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 5c8a49d55054..363c4764b818 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) | |||
1150 | asmlinkage void do_dsp(struct pt_regs *regs) | 1150 | asmlinkage 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 | } |