Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e305cb8f authored by Rusty Russell's avatar Rusty Russell
Browse files

cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits.: sparc64 



Impact: cleanup, futureproof

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.

This is always safe: no cpu number can be >= nr_cpu_ids, and
nr_cpu_ids is initialized to NR_CPUS at boot.

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarMike Travis <travis@sgi.com>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
parent 89229071

arch/sparc/kernel/ds.c

+1 −1
Original line number Diff line number Diff line
@@ -653,7 +653,7 @@ static void __cpuinit dr_cpu_data(struct ds_info *dp, 
		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);

	}

arch/sparc/kernel/irq_64.c

+2 −2
Original line number Diff line number Diff line
@@ -265,12 +265,12 @@ static int irq_choose_cpu(unsigned int virt_irq) 
		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));

arch/sparc/mm/init_64.c

+1 −1
Original line number Diff line number Diff line
@@ -1092,7 +1092,7 @@ static void __init numa_parse_mdesc_group_cpus(struct mdesc_handle *md, 
		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);

	}

}