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

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
...@@ -171,7 +171,7 @@ void __init cmp_smp_setup(void) ...@@ -171,7 +171,7 @@ void __init cmp_smp_setup(void)
for (i = 1; i < NR_CPUS; i++) { for (i = 1; i < NR_CPUS; i++) {
if (amon_cpu_avail(i)) { if (amon_cpu_avail(i)) {
cpu_set(i, cpu_possible_map); set_cpu_possible(i, true);
__cpu_number_map[i] = ++ncpu; __cpu_number_map[i] = ++ncpu;
__cpu_logical_map[ncpu] = i; __cpu_logical_map[ncpu] = i;
} }
......
...@@ -70,7 +70,7 @@ static unsigned int __init smvp_vpe_init(unsigned int tc, unsigned int mvpconf0, ...@@ -70,7 +70,7 @@ static unsigned int __init smvp_vpe_init(unsigned int tc, unsigned int mvpconf0,
write_vpe_c0_vpeconf0(tmp); write_vpe_c0_vpeconf0(tmp);
/* Record this as available CPU */ /* Record this as available CPU */
cpu_set(tc, cpu_possible_map); set_cpu_possible(tc, true);
__cpu_number_map[tc] = ++ncpu; __cpu_number_map[tc] = ++ncpu;
__cpu_logical_map[ncpu] = tc; __cpu_logical_map[ncpu] = tc;
} }
......
...@@ -183,15 +183,15 @@ void __init smp_prepare_cpus(unsigned int max_cpus) ...@@ -183,15 +183,15 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
mp_ops->prepare_cpus(max_cpus); mp_ops->prepare_cpus(max_cpus);
set_cpu_sibling_map(0); set_cpu_sibling_map(0);
#ifndef CONFIG_HOTPLUG_CPU #ifndef CONFIG_HOTPLUG_CPU
cpu_present_map = cpu_possible_map; init_cpu_present(&cpu_possible_map);
#endif #endif
} }
/* preload SMP state for boot cpu */ /* preload SMP state for boot cpu */
void __devinit smp_prepare_boot_cpu(void) void __devinit smp_prepare_boot_cpu(void)
{ {
cpu_set(0, cpu_possible_map); set_cpu_possible(0, true);
cpu_set(0, cpu_online_map); set_cpu_online(0, true);
cpu_set(0, cpu_callin_map); cpu_set(0, cpu_callin_map);
} }
......
...@@ -305,7 +305,7 @@ int __init smtc_build_cpu_map(int start_cpu_slot) ...@@ -305,7 +305,7 @@ int __init smtc_build_cpu_map(int start_cpu_slot)
*/ */
ntcs = ((read_c0_mvpconf0() & MVPCONF0_PTC) >> MVPCONF0_PTC_SHIFT) + 1; ntcs = ((read_c0_mvpconf0() & MVPCONF0_PTC) >> MVPCONF0_PTC_SHIFT) + 1;
for (i=start_cpu_slot; i<NR_CPUS && i<ntcs; i++) { 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_number_map[i] = i;
__cpu_logical_map[i] = i; __cpu_logical_map[i] = i;
} }
...@@ -525,8 +525,8 @@ void smtc_prepare_cpus(int cpus) ...@@ -525,8 +525,8 @@ void smtc_prepare_cpus(int cpus)
* Pull any physically present but unused TCs out of circulation. * Pull any physically present but unused TCs out of circulation.
*/ */
while (tc < (((val & MVPCONF0_PTC) >> MVPCONF0_PTC_SHIFT) + 1)) { while (tc < (((val & MVPCONF0_PTC) >> MVPCONF0_PTC_SHIFT) + 1)) {
cpu_clear(tc, cpu_possible_map); set_cpu_possible(tc, false);
cpu_clear(tc, cpu_present_map); set_cpu_present(tc, false);
tc++; tc++;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment