diff options
| author | Yinghai Lu | 2008-06-21 10:38:41 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2008-07-08 12:48:33 +0200 |
| commit | 04606618bb50c4ec754585a82732ea4facfe2bc9 (patch) | |
| tree | e058e07afd175389a10286d4b02e802ea1011032 /arch | |
| parent | x86: clean up init_amd() (diff) | |
| download | kernel-qcow2-linux-04606618bb50c4ec754585a82732ea4facfe2bc9.tar.gz kernel-qcow2-linux-04606618bb50c4ec754585a82732ea4facfe2bc9.tar.xz kernel-qcow2-linux-04606618bb50c4ec754585a82732ea4facfe2bc9.zip | |
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>
Diffstat (limited to 'arch')
| -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 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(); 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(); |