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

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

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



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 e305cb8f

arch/sparc/kernel/smp_32.c

+5 −6
Original line number Diff line number Diff line
@@ -70,10 +70,9 @@ void __init smp_cpus_done(unsigned int max_cpus) 
	extern void smp4m_smp_done(void);

	extern void smp4d_smp_done(void);

	unsigned long bogosum = 0;

	int cpu, num;

	int cpu, num = 0;



	for (cpu = 0, num = 0; cpu < NR_CPUS; cpu++)

		if (cpu_online(cpu)) {

	for_each_online_cpu(cpu) {

		num++;

		bogosum += cpu_data(cpu).udelay_val;

	}

arch/sparc/kernel/sun4d_smp.c

+4 −5
Original line number Diff line number Diff line
@@ -228,8 +228,7 @@ void __init smp4d_smp_done(void) 
	/* setup cpu list for irq rotation */

	first = 0;

	prev = &first;

	for (i = 0; i < NR_CPUS; i++)

		if (cpu_online(i)) {

	for_each_online_cpu(i) {

		*prev = i;

		prev = &cpu_data(i).next;

	}

arch/sparc/kernel/sun4m_smp.c

+3 −5
Original line number Diff line number Diff line
@@ -186,12 +186,10 @@ void __init smp4m_smp_done(void) 
	/* setup cpu list for irq rotation */

	first = 0;

	prev = &first;

	for (i = 0; i < NR_CPUS; i++) {

		if (cpu_online(i)) {

	for_each_online_cpu(i) {

		*prev = i;

		prev = &cpu_data(i).next;

	}

	}

	*prev = first;

	local_flush_cache_all();

arch/sparc/mm/srmmu.c

+1 −1
Original line number Diff line number Diff line
@@ -1425,7 +1425,7 @@ static void __init init_vac_layout(void) 
				min_line_size = vac_line_size;

			//FIXME: cpus not contiguous!!

			cpu++;

			if (cpu >= NR_CPUS || !cpu_online(cpu))

			if (cpu >= nr_cpu_ids || !cpu_online(cpu))

				break;

#else

			break;