[PATCH 4/4] x86/apic: Drop CONFIG_IO_APIC

[Andrew Cooper <andrew.cooper3@citrix.com>]

It is unconditionally selected, and compiling out IO-APIC support is not a
useful think to do these days.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---
CC: Jan Beulich <JBeulich@suse.com>
---
 xen/arch/x86/acpi/boot.c      | 12 ------------
 xen/arch/x86/apic.c           |  4 ++--
 xen/arch/x86/mpparse.c        |  3 ---
 xen/include/asm-x86/config.h  |  1 -
 xen/include/asm-x86/io_apic.h |  8 --------
 5 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c
index 6e6d338..83cbff9 100644
--- a/xen/arch/x86/acpi/boot.c
+++ b/xen/arch/x86/acpi/boot.c
@@ -204,8 +204,6 @@ acpi_parse_lapic_nmi(struct acpi_subtable_header * header, const unsigned long e
 	return 0;
 }
 
-#if defined(CONFIG_X86_IO_APIC) /*&& defined(CONFIG_ACPI_INTERPRETER)*/
-
 static int __init
 acpi_parse_ioapic(struct acpi_subtable_header * header, const unsigned long end)
 {
@@ -266,8 +264,6 @@ acpi_parse_nmi_src(struct acpi_subtable_header * header, const unsigned long end
 	return 0;
 }
 
-#endif /* CONFIG_X86_IO_APIC */
-
 #ifdef CONFIG_HPET_TIMER
 
 static int __init acpi_parse_hpet(struct acpi_table_header *table)
@@ -561,7 +557,6 @@ static int __init acpi_parse_madt_lapic_entries(void)
 	return 0;
 }
 
-#ifdef CONFIG_X86_IO_APIC
 /*
  * Parse IOAPIC related entries in MADT
  * returns 0 on success, < 0 on error
@@ -627,13 +622,6 @@ static int __init acpi_parse_madt_ioapic_entries(void)
 
 	return 0;
 }
-#else
-static inline int acpi_parse_madt_ioapic_entries(void)
-{
-	return -1;
-}
-#endif /* !CONFIG_X86_IO_APIC */
-
 
 static void __init acpi_process_madt(void)
 {
diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c
index a5ae4b6..8c6c2f5 100644
--- a/xen/arch/x86/apic.c
+++ b/xen/arch/x86/apic.c
@@ -1379,11 +1379,11 @@ int __init APIC_init_uniprocessor (void)
 
     if (nmi_watchdog == NMI_LOCAL_APIC)
         check_nmi_watchdog();
-#ifdef CONFIG_X86_IO_APIC
+
     if (smp_found_config)
         if (!skip_ioapic_setup && nr_ioapics)
             setup_IO_APIC();
-#endif
+
     setup_boot_APIC_clock();
 
     return 0;
diff --git a/xen/arch/x86/mpparse.c b/xen/arch/x86/mpparse.c
index efcbc61..efccde2 100644
--- a/xen/arch/x86/mpparse.c
+++ b/xen/arch/x86/mpparse.c
@@ -819,8 +819,6 @@ void mp_unregister_lapic(uint32_t apic_id, uint32_t cpu)
 	cpumask_clear_cpu(cpu, &cpu_present_map);
 }
 
-#ifdef	CONFIG_X86_IO_APIC
-
 #define MP_ISA_BUS		0
 #define MP_MAX_IOAPIC_PIN	127
 
@@ -1101,5 +1099,4 @@ int mp_register_gsi (u32 gsi, int triggering, int polarity)
 				       triggering, polarity);
 }
 
-#endif /* CONFIG_X86_IO_APIC */
 #endif /* CONFIG_ACPI */
diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index 7587112..dc424f9 100644
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -18,7 +18,6 @@
 #define BITS_PER_XEN_ULONG BITS_PER_LONG
 
 #define CONFIG_PAGING_ASSISTANCE 1
-#define CONFIG_X86_IO_APIC 1
 #define CONFIG_X86_PM_TIMER 1
 #define CONFIG_HPET_TIMER 1
 #define CONFIG_X86_MCE_THERMAL 1
diff --git a/xen/include/asm-x86/io_apic.h b/xen/include/asm-x86/io_apic.h
index 8029c8f..1706969 100644
--- a/xen/include/asm-x86/io_apic.h
+++ b/xen/include/asm-x86/io_apic.h
@@ -13,8 +13,6 @@
  * Copyright (C) 1997, 1998, 1999, 2000 Ingo Molnar
  */
 
-#ifdef CONFIG_X86_IO_APIC
-
 #define IO_APIC_BASE(idx) \
 		((volatile int *)(__fix_to_virt(FIX_IO_APIC_BASE_0 + idx) \
 		+ (mp_ioapics[idx].mpc_apicaddr & ~PAGE_MASK)))
@@ -199,12 +197,6 @@ extern int save_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);
 extern void mask_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);
 extern int restore_IO_APIC_setup(struct IO_APIC_route_entry **ioapic_entries);
 
-#else  /* !CONFIG_X86_IO_APIC */
-static inline void init_ioapic_mappings(void) {}
-static inline void ioapic_suspend(void) {}
-static inline void ioapic_resume(void) {}
-#endif
-
 unsigned highest_gsi(void);
 
 int ioapic_guest_read( unsigned long physbase, unsigned int reg, u32 *pval);
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel