cpumask: replace for_each_cpu_mask_nr with for_each_cpu: x86 From: Rusty Russell Simple replacement, now the _nr is redundant. This only replaces those who want a pointer version anyway: the others will be handled later as they are converted to cpumask_var_t. Signed-off-by: Rusty Russell Signed-off-by: Mike Travis --- arch/x86/include/asm/ipi.h | 4 ++-- arch/x86/kernel/genx2apic_cluster.c | 4 ++-- arch/x86/kernel/genx2apic_phys.c | 6 ++---- arch/x86/kernel/genx2apic_uv_x.c | 4 ++-- arch/x86/kernel/ipi.c | 4 ++-- 5 files changed, 10 insertions(+), 12 deletions(-) diff -r 9aa486922a95 arch/x86/include/asm/ipi.h --- a/arch/x86/include/asm/ipi.h Tue Nov 18 21:41:34 2008 +1030 +++ b/arch/x86/include/asm/ipi.h Tue Nov 18 21:42:17 2008 +1030 @@ -129,7 +129,7 @@ * - mbligh */ local_irq_save(flags); - for_each_cpu_mask_nr(query_cpu, *mask) { + for_each_cpu(query_cpu, mask) { __send_IPI_dest_field(per_cpu(x86_cpu_to_apicid, query_cpu), vector, APIC_DEST_PHYSICAL); } @@ -146,7 +146,7 @@ /* See Hack comment above */ local_irq_save(flags); - for_each_cpu_mask_nr(query_cpu, *mask) + for_each_cpu(query_cpu, mask) if (query_cpu != this_cpu) __send_IPI_dest_field( per_cpu(x86_cpu_to_apicid, query_cpu), diff -r 9aa486922a95 arch/x86/kernel/genx2apic_cluster.c --- a/arch/x86/kernel/genx2apic_cluster.c Tue Nov 18 21:41:34 2008 +1030 +++ b/arch/x86/kernel/genx2apic_cluster.c Tue Nov 18 21:42:17 2008 +1030 @@ -61,7 +61,7 @@ unsigned long query_cpu; local_irq_save(flags); - for_each_cpu_mask_nr(query_cpu, *mask) + for_each_cpu_and(query_cpu, mask, cpu_online_mask) __x2apic_send_IPI_dest( per_cpu(x86_cpu_to_logical_apicid, query_cpu), vector, APIC_DEST_LOGICAL); @@ -75,7 +75,7 @@ unsigned long this_cpu = smp_processor_id(); local_irq_save(flags); - for_each_cpu_mask_nr(query_cpu, *mask) + for_each_cpu_and(query_cpu, mask, cpu_online_mask) if (query_cpu != this_cpu) __x2apic_send_IPI_dest( per_cpu(x86_cpu_to_logical_apicid, query_cpu), diff -r 9aa486922a95 arch/x86/kernel/genx2apic_phys.c --- a/arch/x86/kernel/genx2apic_phys.c Tue Nov 18 21:41:34 2008 +1030 +++ b/arch/x86/kernel/genx2apic_phys.c Tue Nov 18 21:42:17 2008 +1030 @@ -59,10 +59,9 @@ unsigned long query_cpu; local_irq_save(flags); - for_each_cpu_mask_nr(query_cpu, *mask) { + for_each_cpu_and(query_cpu, mask, cpu_online_mask) __x2apic_send_IPI_dest(per_cpu(x86_cpu_to_apicid, query_cpu), vector, APIC_DEST_PHYSICAL); - } local_irq_restore(flags); } @@ -73,12 +72,11 @@ unsigned long this_cpu = smp_processor_id(); local_irq_save(flags); - for_each_cpu_mask_nr(query_cpu, *mask) { + for_each_cpu_and(query_cpu, mask, cpu_online_mask) if (query_cpu != this_cpu) __x2apic_send_IPI_dest( per_cpu(x86_cpu_to_apicid, query_cpu), vector, APIC_DEST_PHYSICAL); - } local_irq_restore(flags); } diff -r 9aa486922a95 arch/x86/kernel/genx2apic_uv_x.c --- a/arch/x86/kernel/genx2apic_uv_x.c Tue Nov 18 21:41:34 2008 +1030 +++ b/arch/x86/kernel/genx2apic_uv_x.c Tue Nov 18 21:42:17 2008 +1030 @@ -126,7 +126,7 @@ { unsigned int cpu; - for_each_cpu_mask_nr(cpu, *mask) + for_each_cpu_and(cpu, mask, cpu_online_mask) uv_send_IPI_one(cpu, vector); } @@ -135,7 +135,7 @@ unsigned int cpu; unsigned int this_cpu = smp_processor_id(); - for_each_cpu_mask_nr(cpu, *mask) + for_each_cpu_and(cpu, mask, cpu_online_mask) if (cpu != this_cpu) uv_send_IPI_one(cpu, vector); } diff -r 9aa486922a95 arch/x86/kernel/ipi.c --- a/arch/x86/kernel/ipi.c Tue Nov 18 21:41:34 2008 +1030 +++ b/arch/x86/kernel/ipi.c Tue Nov 18 21:42:17 2008 +1030 @@ -139,7 +139,7 @@ */ local_irq_save(flags); - for_each_cpu_mask_nr(query_cpu, *mask) + for_each_cpu(query_cpu, mask) __send_IPI_dest_field(cpu_to_logical_apicid(query_cpu), vector); local_irq_restore(flags); } @@ -153,7 +153,7 @@ /* See Hack comment above */ local_irq_save(flags); - for_each_cpu_mask_nr(query_cpu, *mask) + for_each_cpu(query_cpu, mask) if (query_cpu != this_cpu) __send_IPI_dest_field(cpu_to_logical_apicid(query_cpu), vector);