Skip to content

Commit

Permalink
Blackfin: do not append newlines to panic() messages
Browse files Browse the repository at this point in the history
The panic() function already handles newlines for us.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
  • Loading branch information
Mike Frysinger committed Jun 12, 2009
1 parent 729a3fa commit d8804ad
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions arch/blackfin/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@ static __init void memory_setup(void)

if (DMA_UNCACHED_REGION > (_ramend - _ramstart)) {
console_init();
panic("DMA region exceeds memory limit: %lu.\n",
panic("DMA region exceeds memory limit: %lu.",
_ramend - _ramstart);
}
memory_end = _ramend - DMA_UNCACHED_REGION;
Expand Down Expand Up @@ -531,7 +531,7 @@ static __init void memory_setup(void)

if (mtd_size == 0) {
console_init();
panic("Don't boot kernel without rootfs attached.\n");
panic("Don't boot kernel without rootfs attached.");
}

/* Relocate MTD image to the top of memory after the uncached memory area */
Expand Down Expand Up @@ -886,7 +886,7 @@ void __init setup_arch(char **cmdline_p)
printk(KERN_ERR "Warning: Compiled for Rev %d, but running on Rev %d\n",
bfin_compiled_revid(), bfin_revid());
if (bfin_compiled_revid() > bfin_revid())
panic("Error: you are missing anomaly workarounds for this rev\n");
panic("Error: you are missing anomaly workarounds for this rev");
}
}
if (bfin_revid() < CONFIG_BF_REV_MIN || bfin_revid() > CONFIG_BF_REV_MAX)
Expand All @@ -896,7 +896,7 @@ void __init setup_arch(char **cmdline_p)

/* We can't run on BF548-0.1 due to ANOMALY 05000448 */
if (bfin_cpuid() == 0x27de && bfin_revid() == 1)
panic("You can't run on this processor due to 05000448\n");
panic("You can't run on this processor due to 05000448");

printk(KERN_INFO "Blackfin Linux support by http://blackfin.uclinux.org/\n");

Expand Down
4 changes: 2 additions & 2 deletions arch/blackfin/kernel/traps.c
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ asmlinkage void double_fault_c(struct pt_regs *fp)
show_regs(fp);
}
#endif
panic("Double Fault - unrecoverable event\n");
panic("Double Fault - unrecoverable event");

}

Expand Down Expand Up @@ -1246,5 +1246,5 @@ void panic_cplb_error(int cplb_panic, struct pt_regs *fp)
dump_bfin_mem(fp);
show_regs(fp);
dump_stack();
panic("Unrecoverable event\n");
panic("Unrecoverable event");
}
2 changes: 1 addition & 1 deletion arch/blackfin/mach-bf561/smp.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ void __init platform_request_ipi(irq_handler_t handler)
ret = request_irq(IRQ_SUPPLE_0, handler, IRQF_DISABLED,
"SMP interrupt", handler);
if (ret)
panic("Cannot request supplemental interrupt 0 for IPI service\n");
panic("Cannot request supplemental interrupt 0 for IPI service");
}

void platform_send_ipi(cpumask_t callmap)
Expand Down

0 comments on commit d8804ad

Please sign in to comment.