summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-06-19 21:50:20 +0100
committerRussell King <rmk@dyn-67.arm.linux.org.uk>2005-06-19 21:50:20 +0100
commitd411b845dcc8e1d97e8b02a345e765af5134700f (patch)
treef3bd28fb012e2c3a15b2b4870d04eae6b61cd961
parent8b22c249e7de453961e4d253b19fc2a0bdd65d53 (diff)
parent0908db22b189b28664cba3965ebb7e0df59c749a (diff)
downloadlwn-d411b845dcc8e1d97e8b02a345e765af5134700f.tar.gz
lwn-d411b845dcc8e1d97e8b02a345e765af5134700f.zip
Merge with ../linux-2.6-smp
-rw-r--r--arch/arm/kernel/smp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 45ed036336e0..34892758f098 100644
--- 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
*/