diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index 0712a445f98e181f4f4fa4e2fb1f57f52cb35c03..2be166c544ca42a27222325cc61001b5190e368c 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -1303,10 +1303,6 @@ int __cpu_disable(void)
 	c->core_id = 0;
 	c->proc_id = -1;
 
-	ipi_call_lock();
-	cpu_clear(cpu, cpu_online_map);
-	ipi_call_unlock();
-
 	smp_wmb();
 
 	/* Make sure no interrupts point to this cpu.  */
@@ -1316,6 +1312,10 @@ int __cpu_disable(void)
 	mdelay(1);
 	local_irq_disable();
 
+	ipi_call_lock();
+	cpu_clear(cpu, cpu_online_map);
+	ipi_call_unlock();
+
 	return 0;
 }