From: David S. Miller <davem@davemloft.net>
Date: Thu, 9 Apr 2009 04:06:35 +0000 (-0700)
Subject: sparc64: Fix smp_callin() locking.
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8e255baa449df3049a8827a7f1f4f12b6921d0d1;p=linux-beck.git

sparc64: Fix smp_callin() locking.

Interrupts must be disabled when taking the IPI lock.

Caught by lockdep.

Reported-by: Meelis Roos <mroos@linux.ee>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index 708e12a26b05..f7642e5a94db 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -118,9 +118,9 @@ void __cpuinit smp_callin(void)
 	while (!cpu_isset(cpuid, smp_commenced_mask))
 		rmb();
 
-	ipi_call_lock();
+	ipi_call_lock_irq();
 	cpu_set(cpuid, cpu_online_map);
-	ipi_call_unlock();
+	ipi_call_unlock_irq();
 
 	/* idle thread is expected to have preempt disabled */
 	preempt_disable();