diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2011-11-17 10:07:31 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2011-12-07 17:01:45 -0500 |
commit | ab75dc02c151c9d2a2fd446334d740b097a3b9db (patch) | |
tree | 45270931b489a1260e2d2aa3b9ffb1ef7347cfb6 /arch/mips/cavium-octeon | |
parent | 864c6c22e9a5742b0f43c983b6c405d52817bacd (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/cavium-octeon')
-rw-r--r-- | arch/mips/cavium-octeon/setup.c | 6 | ||||
-rw-r--r-- | arch/mips/cavium-octeon/smp.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c index 2d9028f1474c..853bac4f25b2 100644 --- a/arch/mips/cavium-octeon/setup.c +++ b/arch/mips/cavium-octeon/setup.c | |||
@@ -767,11 +767,11 @@ void prom_free_prom_memory(void) | |||
767 | : "=r" (insn) : : "$31", "memory"); | 767 | : "=r" (insn) : : "$31", "memory"); |
768 | 768 | ||
769 | if ((insn >> 26) != 0x33) | 769 | if ((insn >> 26) != 0x33) |
770 | panic("No PREF instruction at Core-14449 probe point.\n"); | 770 | panic("No PREF instruction at Core-14449 probe point."); |
771 | 771 | ||
772 | if (((insn >> 16) & 0x1f) != 28) | 772 | if (((insn >> 16) & 0x1f) != 28) |
773 | panic("Core-14449 WAR not in place (%04x).\n" | 773 | panic("Core-14449 WAR not in place (%04x).\n" |
774 | "Please build kernel with proper options (CONFIG_CAVIUM_CN63XXP1).\n", insn); | 774 | "Please build kernel with proper options (CONFIG_CAVIUM_CN63XXP1).", insn); |
775 | } | 775 | } |
776 | #ifdef CONFIG_CAVIUM_DECODE_RSL | 776 | #ifdef CONFIG_CAVIUM_DECODE_RSL |
777 | cvmx_interrupt_rsl_enable(); | 777 | cvmx_interrupt_rsl_enable(); |
@@ -779,7 +779,7 @@ void prom_free_prom_memory(void) | |||
779 | /* Add an interrupt handler for general failures. */ | 779 | /* Add an interrupt handler for general failures. */ |
780 | if (request_irq(OCTEON_IRQ_RML, octeon_rlm_interrupt, IRQF_SHARED, | 780 | if (request_irq(OCTEON_IRQ_RML, octeon_rlm_interrupt, IRQF_SHARED, |
781 | "RML/RSL", octeon_rlm_interrupt)) { | 781 | "RML/RSL", octeon_rlm_interrupt)) { |
782 | panic("Unable to request_irq(OCTEON_IRQ_RML)\n"); | 782 | panic("Unable to request_irq(OCTEON_IRQ_RML)"); |
783 | } | 783 | } |
784 | #endif | 784 | #endif |
785 | } | 785 | } |
diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c index efcfff4d4627..b1535fe409d4 100644 --- a/arch/mips/cavium-octeon/smp.c +++ b/arch/mips/cavium-octeon/smp.c | |||
@@ -210,7 +210,7 @@ void octeon_prepare_cpus(unsigned int max_cpus) | |||
210 | if (request_irq(OCTEON_IRQ_MBOX0, mailbox_interrupt, | 210 | if (request_irq(OCTEON_IRQ_MBOX0, mailbox_interrupt, |
211 | IRQF_PERCPU | IRQF_NO_THREAD, "SMP-IPI", | 211 | IRQF_PERCPU | IRQF_NO_THREAD, "SMP-IPI", |
212 | mailbox_interrupt)) { | 212 | mailbox_interrupt)) { |
213 | panic("Cannot request_irq(OCTEON_IRQ_MBOX0)\n"); | 213 | panic("Cannot request_irq(OCTEON_IRQ_MBOX0)"); |
214 | } | 214 | } |
215 | } | 215 | } |
216 | 216 | ||