Merge with ../linux-2.6-smp

This commit is contained in:
Russell King 2005-06-19 21:50:20 +01:00
commit d411b845dc

View File

@ -145,7 +145,8 @@ int __init __cpu_up(unsigned int cpu)
pgd_free(pgd); pgd_free(pgd);
if (ret) { 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 * FIXME: We need to clean up the new idle thread. --rmk
*/ */