Commit 04606618 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar

x86: remove some acpi ifdefs in setup_32/64

Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent ce38cc79
......@@ -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();
......
......@@ -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();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment