Skip to contentSkip to conversation

arch/sparc: remove references to cpu_*_map.

PATCH Applied Rusty Russell 3 participants 3 messages Feb 15, 2012 SPARC + UltraSPARC (sparc/sparc64)

lore
Share & tools
lore
#0 lore raw

PATCH 8/12 arch/sparc: remove references to cpu_*_map.

From: Rusty Russell <[email protected]>

This has been obsolescent for a while; time for the final push.

Also get rid of obsolescent first_cpu().

---
 arch/sparc/kernel/leon_kernel.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/sparc/kernel/leon_kernel.c +3 -3
@@ -104,11 +104,11 @@ static int irq_choose_cpu(const struct c
 {
 	cpumask_t mask;
 
-	cpus_and(mask, cpu_online_map, *affinity);
-	if (cpus_equal(mask, cpu_online_map) || cpus_empty(mask))
+	cpumask_and(&mask, cpu_online_mask, affinity);
+	if (cpumask_equal(&mask, cpu_online_mask) || cpus_empty(mask))
 		return boot_cpu_id;
 	else
-		return first_cpu(mask);
+		return cpumask_first(&mask);
 }
 #else
 #define irq_choose_cpu(affinity) boot_cpu_id
Reviewed-by on v1 8/12
#2 lore raw
In reply to Rusty Russell
Quoted 17 lines · Rusty Russell

From: Rusty Russell <[email protected]>

This has been obsolescent for a while; time for the final push.

Also get rid of obsolescent first_cpu().

---
 arch/sparc/kernel/leon_kernel.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

arch/sparc/kernel/leon_kernel.c static int irq_choose_cpu(const struct c · line 108

Quoted 7 lines
arch/sparc/kernel/leon_kernel.c +2 -2
@@ -104,11 +104,11 @@ static int irq_choose_cpu(const struct c
 {
 	cpumask_t mask;
 
-	cpus_and(mask, cpu_online_map, *affinity);
-	if (cpus_equal(mask, cpu_online_map) || cpus_empty(mask))
+	cpumask_and(&mask, cpu_online_mask, affinity);
+	if (cpumask_equal(&mask, cpu_online_mask) || cpus_empty(mask))

You could even change that cpus_empty() to cpumask_empty(&mask)... Either way, it is fine..

Regards,
Srivatsa S. Bhat