diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c
index c213345ca2f5..cfcfd2c2062b 100644
--- a/arch/x86/kernel/smpboot_64.c
+++ b/arch/x86/kernel/smpboot_64.c
@@ -233,10 +233,10 @@ void __cpuinit start_secondary(void)
 	 */
 	spin_unlock(&vector_lock);
 	cpu_set(smp_processor_id(), cpu_online_map);
-	per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE;
-
 	unlock_ipi_call_lock();
 
+	per_cpu(cpu_state, smp_processor_id()) = CPU_ONLINE;
+
 	setup_secondary_clock();
 
 	cpu_idle();