diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-21 01:38:41 -0700 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 12:48:33 +0200 |
commit | 04606618bb50c4ec754585a82732ea4facfe2bc9 (patch) | |
tree | e058e07afd175389a10286d4b02e802ea1011032 /arch/x86/kernel/setup_64.c | |
parent | ce38cc79964687d3c7e92663bc040552416fca27 (diff) | |
download | op-kernel-dev-04606618bb50c4ec754585a82732ea4facfe2bc9.zip op-kernel-dev-04606618bb50c4ec754585a82732ea4facfe2bc9.tar.gz |
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/x86/kernel/setup_64.c')
-rw-r--r-- | arch/x86/kernel/setup_64.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index c94464a..9b516ee 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(); |