[PATCH 04/10] x86/mach-apic: Drop apic_id_registered()

[Andrew Cooper <andrew.cooper3@xxxxxxxxxx>]

It's an unnecessary wrapper.

Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
CC: Jan Beulich <JBeulich@xxxxxxxx>
CC: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
 xen/arch/x86/apic.c                               | 3 +--
 xen/arch/x86/include/asm/mach-generic/mach_apic.h | 6 ------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c
index 254ab5d388dc..9f3a374e9581 100644
--- a/xen/arch/x86/apic.c
+++ b/xen/arch/x86/apic.c
@@ -495,8 +495,7 @@ void setup_local_APIC(bool bsp)
     /*
      * Double-check whether this APIC is really registered.
      */
-    if (!apic_id_registered())
-        BUG();
+    BUG_ON(!physid_isset(get_apic_id(), phys_cpu_present_map));
 
     /*
      * Intel recommends to set DFR, LDR and TPR before enabling
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 50f39b72ccfb..3cf58d5f6b90 100644
--- a/xen/arch/x86/include/asm/mach-generic/mach_apic.h
+++ b/xen/arch/x86/include/asm/mach-generic/mach_apic.h
@@ -45,12 +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 int apic_id_registered(void)
-{
-       return physid_isset(get_apic_id(),
-                           phys_cpu_present_map);
-}
-
 static inline void ioapic_phys_id_map(physid_mask_t *map)
 {
        *map = phys_cpu_present_map;
-- 
2.39.5