Merge master.kernel.org:/home/rmk/linux-2.6-arm

This commit is contained in:
Linus Torvalds
2005-11-13 18:17:54 -08:00
17 changed files with 869 additions and 128 deletions

View File

@ -256,9 +256,7 @@ void __cpuexit cpu_die(void)
asmlinkage void __cpuinit secondary_start_kernel(void)
{
struct mm_struct *mm = &init_mm;
unsigned int cpu;
cpu = smp_processor_id();
unsigned int cpu = smp_processor_id();
printk("CPU%u: Booted secondary processor\n", cpu);