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

Commit 4037ac6e authored by Rusty Russell's avatar Rusty Russell
Browse files

cpumask: Use accessors for cpu_*_mask: mips 



Use the accessors rather than frobbing bits directly (the new versions
are const).

Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarMike Travis <travis@sgi.com>
parent 2377afdd

arch/mips/kernel/smp-cmp.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ void __init cmp_smp_setup(void) 


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

		if (amon_cpu_avail(i)) {

			cpu_set(i, cpu_possible_map);

			set_cpu_possible(i, true);

			__cpu_number_map[i]	= ++ncpu;

			__cpu_logical_map[ncpu]	= i;

		}

arch/mips/kernel/smp-mt.c

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static unsigned int __init smvp_vpe_init(unsigned int tc, unsigned int mvpconf0, 
		write_vpe_c0_vpeconf0(tmp);



		/* Record this as available CPU */

		cpu_set(tc, cpu_possible_map);

		set_cpu_possible(tc, true);

		__cpu_number_map[tc]	= ++ncpu;

		__cpu_logical_map[ncpu]	= tc;

	}

arch/mips/kernel/smp.c

+3 −3
Original line number Diff line number Diff line
@@ -183,15 +183,15 @@ void __init smp_prepare_cpus(unsigned int max_cpus) 
	mp_ops->prepare_cpus(max_cpus);

	set_cpu_sibling_map(0);

#ifndef CONFIG_HOTPLUG_CPU

	cpu_present_map = cpu_possible_map;

	init_cpu_present(&cpu_possible_map);

#endif

}



/* preload SMP state for boot cpu */

void __devinit smp_prepare_boot_cpu(void)

{

	cpu_set(0, cpu_possible_map);

	cpu_set(0, cpu_online_map);

	set_cpu_possible(0, true);

	set_cpu_online(0, true);

	cpu_set(0, cpu_callin_map);

}

arch/mips/kernel/smtc.c

+3 −3
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ int __init smtc_build_cpu_map(int start_cpu_slot) 
	 */

	ntcs = ((read_c0_mvpconf0() & MVPCONF0_PTC) >> MVPCONF0_PTC_SHIFT) + 1;

	for (i=start_cpu_slot; i<NR_CPUS && i<ntcs; i++) {

		cpu_set(i, cpu_possible_map);

		set_cpu_possible(i, true);

		__cpu_number_map[i] = i;

		__cpu_logical_map[i] = i;

	}
@@ -525,8 +525,8 @@ void smtc_prepare_cpus(int cpus) 
	 * Pull any physically present but unused TCs out of circulation.

	 */

	while (tc < (((val & MVPCONF0_PTC) >> MVPCONF0_PTC_SHIFT) + 1)) {

		cpu_clear(tc, cpu_possible_map);

		cpu_clear(tc, cpu_present_map);

		set_cpu_possible(tc, false);

		set_cpu_present(tc, false);

		tc++;

	}