lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sparc64: Fix IPI call locking.

Browse Source 
When I switched sparc64 over to the generic helpers for
smp_call_function(), I didn't convert the dinky call_lock
we had.

Use ipi_call_lock() and ipi_call_unlock().

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2008-09-03 02:14:39 -07:00
parent dbb8c35d90
commit e5bd1c3fdd
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/sparc64/kernel/smp.c
View File

@@ -80,8 +80,6 @@ void smp_bogo(struct seq_file *m)
i, cpu_data(i).clock_tick); i, cpu_data(i).clock_tick);
} }
static __cacheline_aligned_in_smp DEFINE_SPINLOCK(call_lock);
extern void setup_sparc64_timer(void); extern void setup_sparc64_timer(void);
static volatile unsigned long callin_flag = 0; static volatile unsigned long callin_flag = 0;
@@ -120,9 +118,9 @@ void __cpuinit smp_callin(void)
while (!cpu_isset(cpuid, smp_commenced_mask)) while (!cpu_isset(cpuid, smp_commenced_mask))
rmb(); rmb();
spin_lock(&call_lock); ipi_call_lock();
cpu_set(cpuid, cpu_online_map); cpu_set(cpuid, cpu_online_map);
spin_unlock(&call_lock); ipi_call_unlock();
/* idle thread is expected to have preempt disabled */ /* idle thread is expected to have preempt disabled */
preempt_disable(); preempt_disable();
@@ -1305,9 +1303,9 @@ int __cpu_disable(void)
c->core_id = 0; c->core_id = 0;
c->proc_id = -1; c->proc_id = -1;
spin_lock(&call_lock); ipi_call_lock();
cpu_clear(cpu, cpu_online_map); cpu_clear(cpu, cpu_online_map);
spin_unlock(&call_lock); ipi_call_unlock();
smp_wmb(); smp_wmb();