cpumask: Use accessors code.: powerpc 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/powerpc/kernel/setup-common.c | 6 +++--- arch/powerpc/kernel/smp.c | 6 +++--- arch/powerpc/platforms/powermac/setup.c | 2 +- arch/powerpc/platforms/powermac/smp.c | 4 ++-- arch/powerpc/platforms/pseries/hotplug-cpu.c | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff -r 07ebea6b5b50 arch/powerpc/kernel/setup-common.c --- a/arch/powerpc/kernel/setup-common.c Fri Oct 31 11:22:33 2008 +1100 +++ b/arch/powerpc/kernel/setup-common.c Fri Oct 31 11:23:04 2008 +1100 @@ -431,9 +431,9 @@ void __init smp_setup_cpu_maps(void) for (j = 0; j < nthreads && cpu < nr_cpu_ids; j++) { DBG(" thread %d -> cpu %d (hard id %d)\n", j, cpu, intserv[j]); - cpu_set(cpu, cpu_present_map); + set_cpu_present(cpu, true); set_hard_smp_processor_id(cpu, intserv[j]); - cpu_set(cpu, cpu_possible_map); + set_cpu_possible(cpu, true); cpu++; } } @@ -479,7 +479,7 @@ void __init smp_setup_cpu_maps(void) maxcpus); for (cpu = 0; cpu < maxcpus; cpu++) - cpu_set(cpu, cpu_possible_map); + set_cpu_possible(cpu, true); out: of_node_put(dn); } diff -r 07ebea6b5b50 arch/powerpc/kernel/smp.c --- a/arch/powerpc/kernel/smp.c Fri Oct 31 11:22:33 2008 +1100 +++ b/arch/powerpc/kernel/smp.c Fri Oct 31 11:23:04 2008 +1100 @@ -225,7 +225,7 @@ void __devinit smp_prepare_boot_cpu(void { BUG_ON(smp_processor_id() != boot_cpuid); - cpu_set(boot_cpuid, cpu_online_map); + set_cpu_online(boot_cpuid, true); cpu_set(boot_cpuid, per_cpu(cpu_sibling_map, boot_cpuid)); cpu_set(boot_cpuid, per_cpu(cpu_core_map, boot_cpuid)); #ifdef CONFIG_PPC64 @@ -245,7 +245,7 @@ int generic_cpu_disable(void) if (cpu == boot_cpuid) return -EBUSY; - cpu_clear(cpu, cpu_online_map); + set_cpu_online(cpu, false); #ifdef CONFIG_PPC64 vdso_data->processorCount--; fixup_irqs(cpu_online_map); @@ -299,7 +299,7 @@ void generic_mach_cpu_die(void) smp_wmb(); while (__get_cpu_var(cpu_state) != CPU_UP_PREPARE) cpu_relax(); - cpu_set(cpu, cpu_online_map); + set_cpu_online(cpu, true); local_irq_enable(); } #endif diff -r 07ebea6b5b50 arch/powerpc/platforms/powermac/setup.c --- a/arch/powerpc/platforms/powermac/setup.c Fri Oct 31 11:22:33 2008 +1100 +++ b/arch/powerpc/platforms/powermac/setup.c Fri Oct 31 11:23:04 2008 +1100 @@ -366,7 +366,7 @@ static void __init pmac_setup_arch(void) int cpu; for (cpu = 1; cpu < 4 && cpu < nr_cpu_ids; ++cpu) - cpu_set(cpu, cpu_possible_map); + set_cpu_possible(cpu, true); smp_ops = &psurge_smp_ops; } #endif diff -r 07ebea6b5b50 arch/powerpc/platforms/powermac/smp.c --- a/arch/powerpc/platforms/powermac/smp.c Fri Oct 31 11:22:33 2008 +1100 +++ b/arch/powerpc/platforms/powermac/smp.c Fri Oct 31 11:23:04 2008 +1100 @@ -317,7 +317,7 @@ static int __init smp_psurge_probe(void) if (ncpus > nr_cpu_ids) ncpus = nr_cpu_ids; for (i = 1; i < ncpus ; ++i) { - cpu_set(i, cpu_present_map); + set_cpu_present(i, true); set_hard_smp_processor_id(i, i); } @@ -861,7 +861,7 @@ static void __devinit smp_core99_setup_c int smp_core99_cpu_disable(void) { - cpu_clear(smp_processor_id(), cpu_online_map); + set_cpu_online(smp_processor_id(), false); /* XXX reset cpu affinity here */ mpic_cpu_set_priority(0xf); diff -r 07ebea6b5b50 arch/powerpc/platforms/pseries/hotplug-cpu.c --- a/arch/powerpc/platforms/pseries/hotplug-cpu.c Fri Oct 31 11:22:33 2008 +1100 +++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c Fri Oct 31 11:23:04 2008 +1100 @@ -94,7 +94,7 @@ static int pseries_cpu_disable(void) { int cpu = smp_processor_id(); - cpu_clear(cpu, cpu_online_map); + set_cpu_online(cpu, false); vdso_data->processorCount--; /*fix boot_cpuid here*/ @@ -185,7 +185,7 @@ static int pseries_add_processor(struct for_each_cpu_mask(cpu, tmp) { BUG_ON(cpu_isset(cpu, cpu_present_map)); - cpu_set(cpu, cpu_present_map); + set_cpu_present(cpu, true); set_hard_smp_processor_id(cpu, *intserv++); } err = 0; @@ -217,7 +217,7 @@ static void pseries_remove_processor(str if (get_hard_smp_processor_id(cpu) != intserv[i]) continue; BUG_ON(cpu_online(cpu)); - cpu_clear(cpu, cpu_present_map); + set_cpu_present(cpu, false); set_hard_smp_processor_id(cpu, -1); break; }