diff options
| author | Tony Luck <tony.luck@intel.com> | 2005-06-21 19:21:20 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-21 19:21:20 -0400 |
| commit | 29516d75a0b09e0a0328dd55c98a342515c9615a (patch) | |
| tree | 4b03326311958ad6de82653a1caf289ad8c38538 /arch/arm/kernel/smp.c | |
| parent | 4ea78729b8dbfc400fe165a57b90a394a7275a54 (diff) | |
| parent | 4a4f8fdba6f5a34ca90f426021e17491a30202da (diff) | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'arch/arm/kernel/smp.c')
| -rw-r--r-- | arch/arm/kernel/smp.c | 3 |
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) | |||
| 145 | pgd_free(pgd); | 145 | pgd_free(pgd); |
| 146 | 146 | ||
| 147 | if (ret) { | 147 | if (ret) { |
| 148 | printk(KERN_CRIT "cpu_up: processor %d failed to boot\n", cpu); | 148 | printk(KERN_CRIT "CPU%u: processor failed to boot\n", cpu); |
| 149 | |||
| 149 | /* | 150 | /* |
| 150 | * FIXME: We need to clean up the new idle thread. --rmk | 151 | * FIXME: We need to clean up the new idle thread. --rmk |
| 151 | */ | 152 | */ |