x86: remove some acpi ifdefs in setup_32/64

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 0 insertions, 4 deletions

diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index c94464ab04ba..9b516eecada0 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -355,13 +355,11 @@ void __init setup_arch(char **cmdline_p)
         kvmclock_init();
 #endif
 
-#ifdef CONFIG_ACPI
         /*
          * Initialize the ACPI boot-time table parser (gets the RSDP and SDT).
          * Call this early for SRAT node setup.
          */
         acpi_boot_table_init();
-#endif
 
         /* How many end-of-memory variables you have, grandma! */
         max_low_pfn = end_pfn;
@@ -432,12 +430,10 @@ void __init setup_arch(char **cmdline_p)
 
         early_quirks();
 
-#ifdef CONFIG_ACPI
         /*
          * Read APIC and some other early information from ACPI tables.
          */
         acpi_boot_init();
-#endif
 
         init_cpu_to_node();