cpumask: Use accessors code.: mips From: Rusty Russell Use the accessors rather than frobbing bits directly. Most of this is in arch code I haven't even compiled, but it is mostly straightforward. Signed-off-by: Rusty Russell Signed-off-by: Mike Travis --- arch/mips/kernel/smp-cmp.c | 8 +++++--- arch/mips/kernel/smp-mt.c | 2 +- arch/mips/kernel/smp.c | 10 +++++----- arch/mips/kernel/smtc.c | 6 +++--- arch/mips/pmc-sierra/yosemite/smp.c | 5 ++--- arch/mips/sgi-ip27/ip27-smp.c | 2 +- arch/mips/sibyte/bcm1480/smp.c | 5 ++--- arch/mips/sibyte/sb1250/smp.c | 5 ++--- 8 files changed, 21 insertions(+), 22 deletions(-) diff -r 07ebea6b5b50 arch/mips/kernel/smp-cmp.c --- a/arch/mips/kernel/smp-cmp.c Fri Oct 31 11:22:33 2008 +1100 +++ b/arch/mips/kernel/smp-cmp.c Fri Oct 31 11:23:04 2008 +1100 @@ -52,8 +52,10 @@ static int __init allowcpus(char *str) cpus_clear(cpu_allow_map); if (cpulist_parse(str, &cpu_allow_map) == 0) { - cpu_set(0, cpu_allow_map); - cpus_and(cpu_possible_map, cpu_possible_map, cpu_allow_map); + unsigned int i; + for (i = 1; i < nr_cpu_ids; i++) + if (!cpumask_test_cpu(i, cpu_allow_map)) + set_cpu_possible(i, false); len = cpulist_scnprintf(buf, sizeof(buf)-1, &cpu_possible_map); buf[len] = '\0'; pr_debug("Allowable CPUs: %s\n", buf); @@ -226,7 +228,7 @@ void __init cmp_smp_setup(void) for (i = 1; i < nr_cpu_ids; 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; } diff -r 07ebea6b5b50 arch/mips/kernel/smp-mt.c --- a/arch/mips/kernel/smp-mt.c Fri Oct 31 11:22:33 2008 +1100 +++ b/arch/mips/kernel/smp-mt.c Fri Oct 31 11:23:04 2008 +1100 @@ -70,7 +70,7 @@ static unsigned int __init smvp_vpe_init 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; } diff -r 07ebea6b5b50 arch/mips/kernel/smp.c --- a/arch/mips/kernel/smp.c Fri Oct 31 11:22:33 2008 +1100 +++ b/arch/mips/kernel/smp.c Fri Oct 31 11:23:04 2008 +1100 @@ -157,7 +157,7 @@ static void stop_this_cpu(void *dummy) /* * Remove this CPU: */ - cpu_clear(smp_processor_id(), cpu_online_map); + set_cpu_online(smp_processor_id(), false); for (;;) { if (cpu_wait) (*cpu_wait)(); /* Wait if available. */ @@ -183,15 +183,15 @@ void __init smp_prepare_cpus(unsigned in 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); } @@ -221,7 +221,7 @@ int __cpuinit __cpu_up(unsigned int cpu) while (!cpu_isset(cpu, cpu_callin_map)) udelay(100); - cpu_set(cpu, cpu_online_map); + set_cpu_online(cpu, true); return 0; } diff -r 07ebea6b5b50 arch/mips/kernel/smtc.c --- a/arch/mips/kernel/smtc.c Fri Oct 31 11:22:33 2008 +1100 +++ b/arch/mips/kernel/smtc.c Fri Oct 31 11:23:04 2008 +1100 @@ -304,7 +304,7 @@ int __init smtc_build_cpu_map(int start_ */ ntcs = ((read_c0_mvpconf0() & MVPCONF0_PTC) >> MVPCONF0_PTC_SHIFT) + 1; for (i = start_cpu_slot; i < nr_cpu_ids && i < ntcs; i++) { - cpu_set(i, cpu_possible_map); + set_cpu_possible(i, true); __cpu_number_map[i] = i; __cpu_logical_map[i] = i; } @@ -521,8 +521,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++; } diff -r 07ebea6b5b50 arch/mips/pmc-sierra/yosemite/smp.c --- a/arch/mips/pmc-sierra/yosemite/smp.c Fri Oct 31 11:22:33 2008 +1100 +++ b/arch/mips/pmc-sierra/yosemite/smp.c Fri Oct 31 11:23:04 2008 +1100 @@ -150,10 +150,9 @@ static void __init yos_smp_setup(void) { int i; - cpus_clear(cpu_possible_map); - + init_cpu_possible(cpumask_of(0)); for (i = 0; i < 2; i++) { - cpu_set(i, cpu_possible_map); + set_cpu_possible(i, true); __cpu_number_map[i] = i; __cpu_logical_map[i] = i; } diff -r 07ebea6b5b50 arch/mips/sgi-ip27/ip27-smp.c --- a/arch/mips/sgi-ip27/ip27-smp.c Fri Oct 31 11:22:33 2008 +1100 +++ b/arch/mips/sgi-ip27/ip27-smp.c Fri Oct 31 11:23:04 2008 +1100 @@ -76,7 +76,7 @@ static int do_cpumask(cnodeid_t cnode, n /* Only let it join in if it's marked enabled */ if ((acpu->cpu_info.flags & KLINFO_ENABLE) && (tot_cpus_found != NR_CPUS)) { - cpu_set(cpuid, cpu_possible_map); + set_cpu_possible(cpuid, true); alloc_cpupda(cpuid, tot_cpus_found); cpus_found++; tot_cpus_found++; diff -r 07ebea6b5b50 arch/mips/sibyte/bcm1480/smp.c --- a/arch/mips/sibyte/bcm1480/smp.c Fri Oct 31 11:22:33 2008 +1100 +++ b/arch/mips/sibyte/bcm1480/smp.c Fri Oct 31 11:23:04 2008 +1100 @@ -145,14 +145,13 @@ static void __init bcm1480_smp_setup(voi { int i, num; - cpus_clear(cpu_possible_map); - cpu_set(0, cpu_possible_map); + init_cpu_possible(cpumask_of(0)); __cpu_number_map[0] = 0; __cpu_logical_map[0] = 0; for (i = 1, num = 0; i < nr_cpu_ids; i++) { if (cfe_cpu_stop(i) == 0) { - cpu_set(i, cpu_possible_map); + set_cpu_possible(i, true); __cpu_number_map[i] = ++num; __cpu_logical_map[num] = i; } diff -r 07ebea6b5b50 arch/mips/sibyte/sb1250/smp.c --- a/arch/mips/sibyte/sb1250/smp.c Fri Oct 31 11:22:33 2008 +1100 +++ b/arch/mips/sibyte/sb1250/smp.c Fri Oct 31 11:23:04 2008 +1100 @@ -133,14 +133,13 @@ static void __init sb1250_smp_setup(void { int i, num; - cpus_clear(cpu_possible_map); - cpu_set(0, cpu_possible_map); + init_cpu_possible(cpumask_of(0)); __cpu_number_map[0] = 0; __cpu_logical_map[0] = 0; for (i = 1, num = 0; i < nr_cpu_ids; i++) { if (cfe_cpu_stop(i) == 0) { - cpu_set(i, cpu_possible_map); + set_cpu_possible(i, true); __cpu_number_map[i] = ++num; __cpu_logical_map[num] = i; }