Merge with ../linux-2.6-smp

d411b845 · Russell King · 8b22c249 · 0908db22 · d411b845
Commit d411b845 authored Jun 19, 2005 by Russell King
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

arch/arm/kernel/smp.c arch/arm/kernel/smp.c +2 -1

No files found.
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -145,7 +145,8 @@ int __init __cpu_up(unsigned int cpu)
 	pgd_free(pgd);
 	if (ret) {
-		printk(KERN_CRIT "cpu_up: processor %d failed to boot\n", cpu);
+		printk(KERN_CRIT "CPU%u: processor failed to boot\n", cpu);
 		/*
 		 * FIXME: We need to clean up the new idle thread. --rmk
 		 */