]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
MIPS: call ->smp_finish() a little late
authorYong Zhang <yong.zhang@windriver.com>
Thu, 19 Jul 2012 07:13:53 +0000 (09:13 +0200)
committerRalf Baechle <ralf@linux-mips.org>
Thu, 19 Jul 2012 09:23:44 +0000 (11:23 +0200)
We have move irq enable to ->smp_finish. Place ->smp_finish() a little
late to prepare for move set_cpu_online() into start_secondary.
And it's not necessary to call cpu_set(cpu, cpu_callin_map) and
synchronise_count_slave() with irq enabled.

Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
Cc: Sergei Shtylyov <sshtylyov@mvista.com>
Cc: David Daney <david.daney@cavium.com>
Acked-by: David Daney <david.daney@cavium.com>
Patchwork: https://patchwork.linux-mips.org/patch/3850/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/kernel/smp.c

index 48650c8180401aeb1ce1c3f2713471d9c6e45536..b181bbf410de3c9f906380d5cc2c2ead5c6bcb36 100644 (file)
@@ -122,13 +122,14 @@ asmlinkage __cpuinit void start_secondary(void)
 
        notify_cpu_starting(cpu);
 
-       mp_ops->smp_finish();
        set_cpu_sibling_map(cpu);
 
        cpu_set(cpu, cpu_callin_map);
 
        synchronise_count_slave();
 
+       mp_ops->smp_finish();
+
        cpu_idle();
 }