diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2010-02-27 06:53:37 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2010-02-27 06:53:37 -0500 |
commit | 2bd0073656963f7683275dbda600bf5dfc05232a (patch) | |
tree | e60844d071cf1ff1ce0820ce1127551e89b081c1 | |
parent | 1a73f0478a289ee5bb2e4f44a6ecf1d6d6410eab (diff) |
MIPS: Yosemite: Convert SMP startup lock to arch spinlock.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/pmc-sierra/yosemite/smp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/pmc-sierra/yosemite/smp.c b/arch/mips/pmc-sierra/yosemite/smp.c index 326fe7a392e8..efc9e889b349 100644 --- a/arch/mips/pmc-sierra/yosemite/smp.c +++ b/arch/mips/pmc-sierra/yosemite/smp.c | |||
@@ -8,7 +8,7 @@ | |||
8 | 8 | ||
9 | #define LAUNCHSTACK_SIZE 256 | 9 | #define LAUNCHSTACK_SIZE 256 |
10 | 10 | ||
11 | static __cpuinitdata DEFINE_SPINLOCK(launch_lock); | 11 | static __cpuinitdata arch_spinlock_t launch_lock = __ARCH_SPIN_LOCK_UNLOCKED; |
12 | 12 | ||
13 | static unsigned long secondary_sp __cpuinitdata; | 13 | static unsigned long secondary_sp __cpuinitdata; |
14 | static unsigned long secondary_gp __cpuinitdata; | 14 | static unsigned long secondary_gp __cpuinitdata; |
@@ -20,7 +20,7 @@ static void __init prom_smp_bootstrap(void) | |||
20 | { | 20 | { |
21 | local_irq_disable(); | 21 | local_irq_disable(); |
22 | 22 | ||
23 | while (spin_is_locked(&launch_lock)); | 23 | while (arch_spin_is_locked(&launch_lock)); |
24 | 24 | ||
25 | __asm__ __volatile__( | 25 | __asm__ __volatile__( |
26 | " move $sp, %0 \n" | 26 | " move $sp, %0 \n" |
@@ -37,7 +37,7 @@ static void __init prom_smp_bootstrap(void) | |||
37 | */ | 37 | */ |
38 | void __init prom_grab_secondary(void) | 38 | void __init prom_grab_secondary(void) |
39 | { | 39 | { |
40 | spin_lock(&launch_lock); | 40 | arch_spin_lock(&launch_lock); |
41 | 41 | ||
42 | pmon_cpustart(1, &prom_smp_bootstrap, | 42 | pmon_cpustart(1, &prom_smp_bootstrap, |
43 | launchstack + LAUNCHSTACK_SIZE, 0); | 43 | launchstack + LAUNCHSTACK_SIZE, 0); |
@@ -138,7 +138,7 @@ static void __cpuinit yos_boot_secondary(int cpu, struct task_struct *idle) | |||
138 | secondary_sp = sp; | 138 | secondary_sp = sp; |
139 | secondary_gp = gp; | 139 | secondary_gp = gp; |
140 | 140 | ||
141 | spin_unlock(&launch_lock); | 141 | arch_spin_unlock(&launch_lock); |
142 | } | 142 | } |
143 | 143 | ||
144 | /* | 144 | /* |