x86/mpparse: Remove the physid_t bitmap wrapper

[linux-2.6-block.git] / arch / x86 / kernel / apic / apic.c

diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index 814e15c8b8cd5e5a8936bcbe61e9af3f082e1bed..ce6d31bfc6e3f0f0a934b4706d21d8ae6921f135 100644 (file)
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -19,6 +19,7 @@
 #include <linux/kernel_stat.h>
 #include <linux/mc146818rtc.h>
 #include <linux/acpi_pmtmr.h>
+#include <linux/bitmap.h>
 #include <linux/clockchips.h>
 #include <linux/interrupt.h>
 #include <linux/memblock.h>
@@ -77,10 +78,8 @@ EXPORT_SYMBOL_GPL(boot_cpu_physical_apicid);
 
 u8 boot_cpu_apic_version __ro_after_init;
 
-/*
- * Bitmask of physically existing CPUs:
- */
-physid_mask_t phys_cpu_present_map;
+/* Bitmap of physically present CPUs. */
+DECLARE_BITMAP(phys_cpu_present_map, MAX_LOCAL_APIC);
 
 /*
  * Processor to be disabled specified by kernel parameter
@@ -2387,7 +2386,7 @@ static void cpu_update_apic(int cpu, u32 apicid)
        early_per_cpu(x86_cpu_to_apicid, cpu) = apicid;
 #endif
        set_cpu_possible(cpu, true);
-       physid_set(apicid, phys_cpu_present_map);
+       set_bit(apicid, phys_cpu_present_map);
        set_cpu_present(cpu, true);
        num_processors++;
 
@@ -2489,7 +2488,7 @@ static void __init apic_bsp_up_setup(void)
 #ifdef CONFIG_X86_64
        apic_write(APIC_ID, apic->set_apic_id(boot_cpu_physical_apicid));
 #endif
-       physid_set_mask_of_physid(boot_cpu_physical_apicid, &phys_cpu_present_map);
+       reset_phys_cpu_present_map(boot_cpu_physical_apicid);
 }
 
 /**