[PATCH] Remove all ifdefs for local/io apic

IO-APIC or local APIC can only be disabled at runtime anyways and
Kconfig has forced these options on for a long time now.

The Kconfigs are kept only now for the benefit of the shared acpi
boot.c code.

Signed-off-by: Andi Kleen <ak@suse.de>

1 files changed, 0 insertions, 6 deletions

diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index 34afad704824..fbe9f7faa2db 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -340,11 +340,9 @@ static __init void parse_cmdline_early (char ** cmdline_p)
                 else if (fullarg(from, "acpi=strict")) {
                         acpi_strict = 1;
                 }
-#ifdef CONFIG_X86_IO_APIC
                 else if (fullarg(from, "acpi_skip_timer_override"))
                         acpi_skip_timer_override = 1;
 #endif
-#endif
 
                 if (fullarg(from, "disable_timer_pin_1"))
                         disable_timer_pin_1 = 1;
@@ -625,12 +623,10 @@ void __init setup_arch(char **cmdline_p)
         */
        acpi_reserve_bootmem();
 #endif
-#ifdef CONFIG_X86_LOCAL_APIC
         /*
          * Find and reserve possible boot-time SMP configuration:
          */
         find_smp_config();
-#endif
 #ifdef CONFIG_BLK_DEV_INITRD
         if (LOADER_TYPE && INITRD_START) {
                 if (INITRD_START + INITRD_SIZE <= (end_pfn << PAGE_SHIFT)) {
@@ -674,14 +670,12 @@ void __init setup_arch(char **cmdline_p)
 
         init_cpu_to_node();
 
-#ifdef CONFIG_X86_LOCAL_APIC
         /*
          * get boot-time SMP configuration:
          */
         if (smp_found_config)
                 get_smp_config();
         init_apic_mappings();
-#endif
 
         /*
          * Request address space for all standard RAM and ROM resources