Merge tag 'stable/for-linus-3.4-tag-two' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / arch / x86 / xen / smp.c

diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index 501d4e0244ba229d90eabbe768ae1d25e057574f..02900e8ce26cecba1e02bab8d4f2fdb48888d823 100644 (file)
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -75,8 +75,14 @@ static void __cpuinit cpu_bringup(void)
 
        xen_setup_cpu_clockevents();
 
+       notify_cpu_starting(cpu);
+
+       ipi_call_lock();
        set_cpu_online(cpu, true);
-       percpu_write(cpu_state, CPU_ONLINE);
+       ipi_call_unlock();
+
+       this_cpu_write(cpu_state, CPU_ONLINE);
+
        wmb();
 
        /* We can take interrupts now: we're officially "up". */