diff options
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/setup_32.c | 5 | ||||
| -rw-r--r-- | arch/x86/kernel/setup_64.c | 4 |
2 files changed, 1 insertions, 8 deletions
diff --git a/arch/x86/kernel/setup_32.c b/arch/x86/kernel/setup_32.c index cad4e893df0..e274ee6ff58 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(); diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index c94464ab04b..9b516eecada 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(); |