x86/apic: Drop CONFIG_LOCAL_APIC

It is unconditionally selected, and all 64bit processors have local APICs.

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

diff --git a/xen/arch/x86/acpi/boot.c b/xen/arch/x86/acpi/boot.c
index 33c91338127089c4f48a4583741cb09344b9ccfa..6e6d33893e405b3f0247d1bad590bb40395bd40b 100644 (file)
--- a/xen/arch/x86/acpi/boot.c
+++ b/xen/arch/x86/acpi/boot.c
@@ -54,15 +54,12 @@ bool_t __initdata acpi_ioapic;
 static bool_t acpi_skip_timer_override __initdata;
 boolean_param("acpi_skip_timer_override", acpi_skip_timer_override);
 
-#ifdef CONFIG_X86_LOCAL_APIC
 static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;
-#endif
 
 /* --------------------------------------------------------------------------
                               Boot-time Configuration
    -------------------------------------------------------------------------- */
 
-#ifdef CONFIG_X86_LOCAL_APIC
 static int __init acpi_parse_madt(struct acpi_table_header *table)
 {
        struct acpi_table_madt *madt;
@@ -207,8 +204,6 @@ acpi_parse_lapic_nmi(struct acpi_subtable_header * header, const unsigned long e
        return 0;
 }
 
-#endif                         /*CONFIG_X86_LOCAL_APIC */
-
 #if defined(CONFIG_X86_IO_APIC) /*&& defined(CONFIG_ACPI_INTERPRETER)*/
 
 static int __init
@@ -510,7 +505,6 @@ static int __init acpi_parse_fadt(struct acpi_table_header *table)
        return 0;
 }
 
-#ifdef CONFIG_X86_LOCAL_APIC
 /*
  * Parse LAPIC entries in MADT
  * returns 0 on success, < 0 on error
@@ -566,7 +560,6 @@ static int __init acpi_parse_madt_lapic_entries(void)
        }
        return 0;
 }
-#endif /* CONFIG_X86_LOCAL_APIC */
 
 #ifdef CONFIG_X86_IO_APIC
 /*
@@ -644,7 +637,6 @@ static inline int acpi_parse_madt_ioapic_entries(void)
 
 static void __init acpi_process_madt(void)
 {
-#ifdef CONFIG_X86_LOCAL_APIC
        int error;
 
        if (!acpi_table_parse(ACPI_SIG_MADT, acpi_parse_madt)) {
@@ -677,8 +669,6 @@ static void __init acpi_process_madt(void)
                        disable_acpi();
                }
        }
-#endif
-       return;
 }
 
 /*

diff --git a/xen/include/asm-x86/apic.h b/xen/include/asm-x86/apic.h
index d840ee5f14d0c01536b1953643fa07570cfb2815..342db73a9d059871884ae272bc53840cbed58424 100644 (file)
--- a/xen/include/asm-x86/apic.h
+++ b/xen/include/asm-x86/apic.h
@@ -49,8 +49,6 @@ const struct genapic *apic_x2apic_probe(void);
        } while (0)
 
 
-#ifdef CONFIG_X86_LOCAL_APIC
-
 /*
  * Basic functions accessing APICs.
  */
@@ -205,10 +203,4 @@ extern unsigned int nmi_watchdog;
 #define NMI_IO_APIC    1
 #define NMI_LOCAL_APIC 2
 
-#else /* !CONFIG_X86_LOCAL_APIC */
-static inline int lapic_suspend(void) {return 0;}
-static inline int lapic_resume(void) {return 0;}
-
-#endif /* !CONFIG_X86_LOCAL_APIC */
-
 #endif /* __ASM_APIC_H */

diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index ba486d5221b4a345204e306d730bc0dbef2f5b2d..7587112541c1cb28ed8654bafe12448d942dcd77 100644 (file)
--- 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_LOCAL_APIC 1
 #define CONFIG_X86_IO_APIC 1
 #define CONFIG_X86_PM_TIMER 1
 #define CONFIG_HPET_TIMER 1