cpumask: Use accessors code.: x86 From: Rusty Russell Use the accessors rather than frobbing bits directly. Signed-off-by: Rusty Russell Signed-off-by: Mike Travis --- arch/x86/kernel/acpi/boot.c | 2 +- arch/x86/kernel/apic.c | 4 ++-- arch/x86/kernel/smp.c | 2 +- arch/x86/kernel/smpboot.c | 12 ++++++------ arch/x86/mach-voyager/voyager_smp.c | 16 ++++++++-------- arch/x86/xen/smp.c | 8 ++++---- 6 files changed, 22 insertions(+), 22 deletions(-) diff -r e36b63452ef6 arch/x86/kernel/acpi/boot.c --- a/arch/x86/kernel/acpi/boot.c Fri Nov 07 23:17:54 2008 +1100 +++ b/arch/x86/kernel/acpi/boot.c Fri Nov 07 23:17:57 2008 +1100 @@ -598,7 +598,7 @@ int acpi_unmap_lsapic(int cpu) int acpi_unmap_lsapic(int cpu) { per_cpu(x86_cpu_to_apicid, cpu) = -1; - cpu_clear(cpu, cpu_present_map); + set_cpu_present(cpu, false); num_processors--; return (0); diff -r e36b63452ef6 arch/x86/kernel/apic.c --- a/arch/x86/kernel/apic.c Fri Nov 07 23:17:54 2008 +1100 +++ b/arch/x86/kernel/apic.c Fri Nov 07 23:17:57 2008 +1100 @@ -1903,8 +1903,8 @@ void __cpuinit generic_processor_info(in } #endif - cpu_set(cpu, cpu_possible_map); - cpu_set(cpu, cpu_present_map); + set_cpu_possible(cpu, true); + set_cpu_present(cpu, true); } #ifdef CONFIG_X86_64 diff -r e36b63452ef6 arch/x86/kernel/smp.c --- a/arch/x86/kernel/smp.c Fri Nov 07 23:17:54 2008 +1100 +++ b/arch/x86/kernel/smp.c Fri Nov 07 23:17:57 2008 +1100 @@ -146,7 +146,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); disable_local_APIC(); if (hlt_works(smp_processor_id())) for (;;) halt(); diff -r e36b63452ef6 arch/x86/kernel/smpboot.c --- a/arch/x86/kernel/smpboot.c Fri Nov 07 23:17:54 2008 +1100 +++ b/arch/x86/kernel/smpboot.c Fri Nov 07 23:17:57 2008 +1100 @@ -943,7 +943,7 @@ restore_state: numa_remove_cpu(cpu); /* was set by numa_add_cpu */ cpu_clear(cpu, cpu_callout_map); /* was set by do_boot_cpu() */ cpu_clear(cpu, cpu_initialized); /* was set by cpu_init() */ - cpu_clear(cpu, cpu_present_map); + set_cpu_present(cpu, false); per_cpu(x86_cpu_to_apicid, cpu) = BAD_APICID; } @@ -1032,8 +1032,8 @@ int __cpuinit native_cpu_up(unsigned int */ static __init void disable_smp(void) { - cpu_present_map = cpumask_of_cpu(0); - cpu_possible_map = cpumask_of_cpu(0); + init_cpu_present(cpumask_of(0)); + init_cpu_possible(cpumask_of(0)); smpboot_clear_io_apic_irqs(); if (smp_found_config) @@ -1064,14 +1064,14 @@ static int __init smp_sanity_check(unsig nr = 0; for_each_present_cpu(cpu) { if (nr >= 8) - cpu_clear(cpu, cpu_present_map); + set_cpu_present(cpu, false); nr++; } nr = 0; for_each_possible_cpu(cpu) { if (nr >= 8) - cpu_clear(cpu, cpu_possible_map); + set_cpu_possible(cpu, false); nr++; } @@ -1290,7 +1290,7 @@ __init void prefill_possible_map(void) possible, max_t(int, possible - num_processors, 0)); for (i = 0; i < possible; i++) - cpu_set(i, cpu_possible_map); + set_cpu_possible(i, true); nr_cpu_ids = possible; } diff -r e36b63452ef6 arch/x86/mach-voyager/voyager_smp.c --- a/arch/x86/mach-voyager/voyager_smp.c Fri Nov 07 23:17:54 2008 +1100 +++ b/arch/x86/mach-voyager/voyager_smp.c Fri Nov 07 23:17:57 2008 +1100 @@ -378,7 +378,7 @@ void __init find_smp_config(void) cpus_addr(phys_cpu_present_map)[0] |= voyager_extended_cmos_read(VOYAGER_PROCESSOR_PRESENT_MASK + 3) << 24; - cpu_possible_map = phys_cpu_present_map; + init_cpu_possible(&phys_cpu_present_map); printk("VOYAGER SMP: phys_cpu_present_map = 0x%lx\n", cpus_addr(phys_cpu_present_map)[0]); /* Here we set up the VIC to enable SMP */ @@ -479,7 +479,7 @@ static void __init start_secondary(void local_flush_tlb(); - cpu_set(cpuid, cpu_online_map); + set_cpu_online(cpuid, true); wmb(); cpu_idle(); } @@ -603,7 +603,7 @@ static void __init do_boot_cpu(__u8 cpu) print_cpu_info(&cpu_data(cpu)); wmb(); cpu_set(cpu, cpu_callout_map); - cpu_set(cpu, cpu_present_map); + set_cpu_present(cpu, true); } else { printk("CPU%d FAILED TO BOOT: ", cpu); if (* @@ -666,7 +666,7 @@ void __init smp_boot_cpus(void) /* enable our own CPIs */ vic_enable_cpi(); - cpu_set(boot_cpu_id, cpu_online_map); + set_cpu_online(boot_cpu_id, true); cpu_set(boot_cpu_id, cpu_callout_map); /* loop over all the extended VIC CPUs and boot them. The @@ -949,7 +949,7 @@ static void smp_stop_cpu_function(void * static void smp_stop_cpu_function(void *dummy) { VDEBUG(("VOYAGER SMP: CPU%d is STOPPING\n", smp_processor_id())); - cpu_clear(smp_processor_id(), cpu_online_map); + set_cpu_online(smp_processor_id(), false); local_irq_disable(); for (;;) halt(); @@ -1750,10 +1750,10 @@ static void __cpuinit voyager_smp_prepar init_gdt(smp_processor_id()); switch_to_new_gdt(); - cpu_set(smp_processor_id(), cpu_online_map); + set_cpu_online(smp_processor_id(), true); cpu_set(smp_processor_id(), cpu_callout_map); - cpu_set(smp_processor_id(), cpu_possible_map); - cpu_set(smp_processor_id(), cpu_present_map); + set_cpu_possible(smp_processor_id(), true); + set_cpu_present(smp_processor_id(), true); } static int __cpuinit voyager_cpu_up(unsigned int cpu) diff -r e36b63452ef6 arch/x86/xen/smp.c --- a/arch/x86/xen/smp.c Fri Nov 07 23:17:54 2008 +1100 +++ b/arch/x86/xen/smp.c Fri Nov 07 23:17:57 2008 +1100 @@ -77,7 +77,7 @@ static __cpuinit void cpu_bringup(void) xen_setup_cpu_clockevents(); - cpu_set(cpu, cpu_online_map); + set_cpu_online(cpu, true); x86_write_percpu(cpu_state, CPU_ONLINE); wmb(); @@ -162,7 +162,7 @@ static void __init xen_fill_possible_map rc = HYPERVISOR_vcpu_op(VCPUOP_is_up, i, NULL); if (rc >= 0) { num_processors++; - cpu_set(i, cpu_possible_map); + set_cpu_possible(i, true); } } } @@ -198,7 +198,7 @@ static void __init xen_smp_prepare_cpus( while ((num_possible_cpus() > 1) && (num_possible_cpus() > max_cpus)) { for (cpu = NR_CPUS - 1; !cpu_possible(cpu); cpu--) continue; - cpu_clear(cpu, cpu_possible_map); + set_cpu_possible(cpu, false); } for_each_possible_cpu (cpu) { @@ -211,7 +211,7 @@ static void __init xen_smp_prepare_cpus( if (IS_ERR(idle)) panic("failed fork for CPU %d", cpu); - cpu_set(cpu, cpu_present_map); + set_cpu_present(cpu, true); } }