cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits.: sparc64 From: Rusty Russell In fact, all cpumask ops will only be valid (in general) for bit numbers < nr_cpu_ids. So use that instead of NR_CPUS in various places. Signed-off-by: Rusty Russell Signed-off-by: Mike Travis --- arch/sparc64/kernel/ds.c | 2 +- arch/sparc64/kernel/irq.c | 4 ++-- arch/sparc64/mm/init.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) --- linux-2.6.orig/arch/sparc64/kernel/ds.c +++ linux-2.6/arch/sparc64/kernel/ds.c @@ -653,7 +653,7 @@ static void __cpuinit dr_cpu_data(struct if (cpu_list[i] == CPU_SENTINEL) continue; - if (cpu_list[i] < NR_CPUS) + if (cpu_list[i] < nr_cpu_ids) cpu_set(cpu_list[i], mask); } --- linux-2.6.orig/arch/sparc64/kernel/irq.c +++ linux-2.6/arch/sparc64/kernel/irq.c @@ -260,12 +260,12 @@ static int irq_choose_cpu(unsigned int v spin_lock_irqsave(&irq_rover_lock, flags); while (!cpu_online(irq_rover)) { - if (++irq_rover >= NR_CPUS) + if (++irq_rover >= nr_cpu_ids) irq_rover = 0; } cpuid = irq_rover; do { - if (++irq_rover >= NR_CPUS) + if (++irq_rover >= nr_cpu_ids) irq_rover = 0; } while (!cpu_online(irq_rover)); --- linux-2.6.orig/arch/sparc64/mm/init.c +++ linux-2.6/arch/sparc64/mm/init.c @@ -1080,7 +1080,7 @@ static void __init numa_parse_mdesc_grou if (strcmp(name, "cpu")) continue; id = mdesc_get_property(md, target, "id", NULL); - if (*id < NR_CPUS) + if (*id < nr_cpu_ids) cpu_set(*id, *mask); } }