x86/mach-apic: Drop ioapic_phys_id_map()

It's an unnecessary wrapper.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>

diff --git a/xen/arch/x86/include/asm/mach-generic/mach_apic.h b/xen/arch/x86/include/asm/mach-generic/mach_apic.h
index 3cf58d5f6b90f9f34d37ccd9b48bd64a28ec3c16..b3e9ea6600ef494fb90ac6813eed538124ba3c49 100644 (file)
--- a/xen/arch/x86/include/asm/mach-generic/mach_apic.h
+++ b/xen/arch/x86/include/asm/mach-generic/mach_apic.h
@@ -45,11 +45,6 @@ static inline int multi_timer_check(int apic, int irq)
  * really not sure why, since all local APICs should have distinct physical
  * IDs, and we need to know what they are.
  */
-static inline void ioapic_phys_id_map(physid_mask_t *map)
-{
-       *map = phys_cpu_present_map;
-}
-
 static inline int check_apicid_used(const physid_mask_t *map, int apicid)
 {
        return physid_isset(apicid, *map);

diff --git a/xen/arch/x86/io_apic.c b/xen/arch/x86/io_apic.c
index 11b74d3eaf8a0af56cc467ce2c3a00df21aaf80c..0123edab649b7a6cbc2bec514dffb3d672364c56 100644 (file)
--- a/xen/arch/x86/io_apic.c
+++ b/xen/arch/x86/io_apic.c
@@ -1491,7 +1491,7 @@ static void __init setup_ioapic_ids_from_mpc(void)
      * This is broken; anything with a real cpu count has to
      * circumvent this idiocy regardless.
      */
-    ioapic_phys_id_map(&phys_id_present_map);
+    phys_id_present_map = phys_cpu_present_map;
 
     /*
      * Set the IOAPIC ID to the value stored in the MPC table.
@@ -2237,7 +2237,7 @@ int __init io_apic_get_unique_id (int ioapic, int apic_id)
      */
 
     if (physids_empty(apic_id_map))
-        ioapic_phys_id_map(&apic_id_map);
+        apic_id_map = phys_cpu_present_map;
 
     spin_lock_irqsave(&ioapic_lock, flags);
     reg_00.raw = io_apic_read(ioapic, 0);