diff options
author | Mike Frysinger <vapier@gentoo.org> | 2009-04-29 02:26:46 -0400 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2009-06-12 06:11:34 -0400 |
commit | d8804adf52f5991388fa9af77428e4cc7768059d (patch) | |
tree | 916e2e13745762b8f9038171a1258f3dfbccaba7 | |
parent | 729a3fa7333af58d57eecb0aacf7ca3d58237f81 (diff) |
Blackfin: do not append newlines to panic() messages
The panic() function already handles newlines for us.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
-rw-r--r-- | arch/blackfin/kernel/setup.c | 8 | ||||
-rw-r--r-- | arch/blackfin/kernel/traps.c | 4 | ||||
-rw-r--r-- | arch/blackfin/mach-bf561/smp.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c index 0838eafed172..5a4a03670085 100644 --- a/arch/blackfin/kernel/setup.c +++ b/arch/blackfin/kernel/setup.c | |||
@@ -477,7 +477,7 @@ static __init void memory_setup(void) | |||
477 | 477 | ||
478 | if (DMA_UNCACHED_REGION > (_ramend - _ramstart)) { | 478 | if (DMA_UNCACHED_REGION > (_ramend - _ramstart)) { |
479 | console_init(); | 479 | console_init(); |
480 | panic("DMA region exceeds memory limit: %lu.\n", | 480 | panic("DMA region exceeds memory limit: %lu.", |
481 | _ramend - _ramstart); | 481 | _ramend - _ramstart); |
482 | } | 482 | } |
483 | memory_end = _ramend - DMA_UNCACHED_REGION; | 483 | memory_end = _ramend - DMA_UNCACHED_REGION; |
@@ -531,7 +531,7 @@ static __init void memory_setup(void) | |||
531 | 531 | ||
532 | if (mtd_size == 0) { | 532 | if (mtd_size == 0) { |
533 | console_init(); | 533 | console_init(); |
534 | panic("Don't boot kernel without rootfs attached.\n"); | 534 | panic("Don't boot kernel without rootfs attached."); |
535 | } | 535 | } |
536 | 536 | ||
537 | /* Relocate MTD image to the top of memory after the uncached memory area */ | 537 | /* Relocate MTD image to the top of memory after the uncached memory area */ |
@@ -886,7 +886,7 @@ void __init setup_arch(char **cmdline_p) | |||
886 | printk(KERN_ERR "Warning: Compiled for Rev %d, but running on Rev %d\n", | 886 | printk(KERN_ERR "Warning: Compiled for Rev %d, but running on Rev %d\n", |
887 | bfin_compiled_revid(), bfin_revid()); | 887 | bfin_compiled_revid(), bfin_revid()); |
888 | if (bfin_compiled_revid() > bfin_revid()) | 888 | if (bfin_compiled_revid() > bfin_revid()) |
889 | panic("Error: you are missing anomaly workarounds for this rev\n"); | 889 | panic("Error: you are missing anomaly workarounds for this rev"); |
890 | } | 890 | } |
891 | } | 891 | } |
892 | if (bfin_revid() < CONFIG_BF_REV_MIN || bfin_revid() > CONFIG_BF_REV_MAX) | 892 | if (bfin_revid() < CONFIG_BF_REV_MIN || bfin_revid() > CONFIG_BF_REV_MAX) |
@@ -896,7 +896,7 @@ void __init setup_arch(char **cmdline_p) | |||
896 | 896 | ||
897 | /* We can't run on BF548-0.1 due to ANOMALY 05000448 */ | 897 | /* We can't run on BF548-0.1 due to ANOMALY 05000448 */ |
898 | if (bfin_cpuid() == 0x27de && bfin_revid() == 1) | 898 | if (bfin_cpuid() == 0x27de && bfin_revid() == 1) |
899 | panic("You can't run on this processor due to 05000448\n"); | 899 | panic("You can't run on this processor due to 05000448"); |
900 | 900 | ||
901 | printk(KERN_INFO "Blackfin Linux support by http://blackfin.uclinux.org/\n"); | 901 | printk(KERN_INFO "Blackfin Linux support by http://blackfin.uclinux.org/\n"); |
902 | 902 | ||
diff --git a/arch/blackfin/kernel/traps.c b/arch/blackfin/kernel/traps.c index ffe7fb53eccb..fb5774275889 100644 --- a/arch/blackfin/kernel/traps.c +++ b/arch/blackfin/kernel/traps.c | |||
@@ -222,7 +222,7 @@ asmlinkage void double_fault_c(struct pt_regs *fp) | |||
222 | show_regs(fp); | 222 | show_regs(fp); |
223 | } | 223 | } |
224 | #endif | 224 | #endif |
225 | panic("Double Fault - unrecoverable event\n"); | 225 | panic("Double Fault - unrecoverable event"); |
226 | 226 | ||
227 | } | 227 | } |
228 | 228 | ||
@@ -1246,5 +1246,5 @@ void panic_cplb_error(int cplb_panic, struct pt_regs *fp) | |||
1246 | dump_bfin_mem(fp); | 1246 | dump_bfin_mem(fp); |
1247 | show_regs(fp); | 1247 | show_regs(fp); |
1248 | dump_stack(); | 1248 | dump_stack(); |
1249 | panic("Unrecoverable event\n"); | 1249 | panic("Unrecoverable event"); |
1250 | } | 1250 | } |
diff --git a/arch/blackfin/mach-bf561/smp.c b/arch/blackfin/mach-bf561/smp.c index 9b27e698c0b2..4ea13d2eb872 100644 --- a/arch/blackfin/mach-bf561/smp.c +++ b/arch/blackfin/mach-bf561/smp.c | |||
@@ -135,7 +135,7 @@ void __init platform_request_ipi(irq_handler_t handler) | |||
135 | ret = request_irq(IRQ_SUPPLE_0, handler, IRQF_DISABLED, | 135 | ret = request_irq(IRQ_SUPPLE_0, handler, IRQF_DISABLED, |
136 | "SMP interrupt", handler); | 136 | "SMP interrupt", handler); |
137 | if (ret) | 137 | if (ret) |
138 | panic("Cannot request supplemental interrupt 0 for IPI service\n"); | 138 | panic("Cannot request supplemental interrupt 0 for IPI service"); |
139 | } | 139 | } |
140 | 140 | ||
141 | void platform_send_ipi(cpumask_t callmap) | 141 | void platform_send_ipi(cpumask_t callmap) |