aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/sun4m_smp.c
diff options
context:
space:
mode:
authorKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>2011-05-16 16:38:07 -0400
committerDavid S. Miller <davem@davemloft.net>2011-05-16 16:38:07 -0400
commitfb1fece5da027d3c7e69cf44ca8e58aaf0faf520 (patch)
treee2c50029304ea0eebef9ca40e8e33888900b7b72 /arch/sparc/kernel/sun4m_smp.c
parent55dd23eca666876e6028aa35d5e391cfced54871 (diff)
sparc: convert old cpumask API into new one
Adapt new API. Almost change is trivial, most important change are to remove following like =operator. cpumask_t cpu_mask = *mm_cpumask(mm); cpus_allowed = current->cpus_allowed; Because cpumask_var_t is =operator unsafe. These usage might prevent kernel core improvement. No functional change. Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/sun4m_smp.c')
-rw-r--r--arch/sparc/kernel/sun4m_smp.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c
index e2e687312e2e..594768686525 100644
--- a/arch/sparc/kernel/sun4m_smp.c
+++ b/arch/sparc/kernel/sun4m_smp.c
@@ -72,7 +72,7 @@ void __cpuinit smp4m_callin(void)
72 atomic_inc(&init_mm.mm_count); 72 atomic_inc(&init_mm.mm_count);
73 current->active_mm = &init_mm; 73 current->active_mm = &init_mm;
74 74
75 while (!cpu_isset(cpuid, smp_commenced_mask)) 75 while (!cpumask_test_cpu(cpuid, &smp_commenced_mask))
76 mb(); 76 mb();
77 77
78 local_irq_enable(); 78 local_irq_enable();
@@ -209,10 +209,10 @@ static void smp4m_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,
209 { 209 {
210 register int i; 210 register int i;
211 211
212 cpu_clear(smp_processor_id(), mask); 212 cpumask_clear_cpu(smp_processor_id(), &mask);
213 cpus_and(mask, cpu_online_map, mask); 213 cpumask_and(&mask, cpu_online_mask, &mask);
214 for (i = 0; i < ncpus; i++) { 214 for (i = 0; i < ncpus; i++) {
215 if (cpu_isset(i, mask)) { 215 if (cpumask_test_cpu(i, &mask)) {
216 ccall_info.processors_in[i] = 0; 216 ccall_info.processors_in[i] = 0;
217 ccall_info.processors_out[i] = 0; 217 ccall_info.processors_out[i] = 0;
218 set_cpu_int(i, IRQ_CROSS_CALL); 218 set_cpu_int(i, IRQ_CROSS_CALL);
@@ -228,7 +228,7 @@ static void smp4m_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,
228 228
229 i = 0; 229 i = 0;
230 do { 230 do {
231 if (!cpu_isset(i, mask)) 231 if (!cpumask_test_cpu(i, &mask))
232 continue; 232 continue;
233 while (!ccall_info.processors_in[i]) 233 while (!ccall_info.processors_in[i])
234 barrier(); 234 barrier();
@@ -236,7 +236,7 @@ static void smp4m_cross_call(smpfunc_t func, cpumask_t mask, unsigned long arg1,
236 236
237 i = 0; 237 i = 0;
238 do { 238 do {
239 if (!cpu_isset(i, mask)) 239 if (!cpumask_test_cpu(i, &mask))
240 continue; 240 continue;
241 while (!ccall_info.processors_out[i]) 241 while (!ccall_info.processors_out[i])
242 barrier(); 242 barrier();