MIPS: Yosemite: Convert SMP startup lock to arch spinlock.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/pmc-sierra/yosemite/smp.c b/arch/mips/pmc-sierra/yosemite/smp.c
index 326fe7a392e88c5e63b47fd843f60728edf6e806..efc9e889b34939d6a3cbd5f14303317eb0e51bef 100644 (file)
--- a/arch/mips/pmc-sierra/yosemite/smp.c
+++ b/arch/mips/pmc-sierra/yosemite/smp.c
@@ -8,7 +8,7 @@
 
 #define LAUNCHSTACK_SIZE 256
 
-static __cpuinitdata DEFINE_SPINLOCK(launch_lock);
+static __cpuinitdata arch_spinlock_t launch_lock = __ARCH_SPIN_LOCK_UNLOCKED;
 
 static unsigned long secondary_sp __cpuinitdata;
 static unsigned long secondary_gp __cpuinitdata;
@@ -20,7 +20,7 @@ static void __init prom_smp_bootstrap(void)
 {
        local_irq_disable();
 
-       while (spin_is_locked(&launch_lock));
+       while (arch_spin_is_locked(&launch_lock));
 
        __asm__ __volatile__(
        "       move    $sp, %0         \n"
@@ -37,7 +37,7 @@ static void __init prom_smp_bootstrap(void)
  */
 void __init prom_grab_secondary(void)
 {
-       spin_lock(&launch_lock);
+       arch_spin_lock(&launch_lock);
 
        pmon_cpustart(1, &prom_smp_bootstrap,
                      launchstack + LAUNCHSTACK_SIZE, 0);
@@ -138,7 +138,7 @@ static void __cpuinit yos_boot_secondary(int cpu, struct task_struct *idle)
        secondary_sp = sp;
        secondary_gp = gp;
 
-       spin_unlock(&launch_lock);
+       arch_spin_unlock(&launch_lock);
 }
 
 /*