summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/setup_32.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/setup_32.c')
-rw-r--r--arch/x86/kernel/setup_32.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c
index cad4e893df05..e274ee6ff582 100644
--- a/arch/x86/kernel/setup_32.c
+++ b/arch/x86/kernel/setup_32.c
@@ -726,12 +726,10 @@ void __init setup_arch(char **cmdline_p)
io_delay_init();
-#ifdef CONFIG_ACPI
/*
* Parse the ACPI tables for possible boot-time SMP configuration.
*/
acpi_boot_table_init();
-#endif
#ifdef CONFIG_ACPI_NUMA
/*
@@ -812,9 +810,8 @@ void __init setup_arch(char **cmdline_p)
early_quirks();
-#ifdef CONFIG_ACPI
acpi_boot_init();
-#endif
+
#if defined(CONFIG_X86_MPPARSE) || defined(CONFIG_X86_VISWS)
if (smp_found_config)
get_smp_config();