[<prev] [next>] [day] [month] [year] [list]
Message-Id: <200806210138.43100.yhlu.kernel@gmail.com>
Date: Sat, 21 Jun 2008 01:38:41 -0700
From: Yinghai Lu <yhlu.kernel@...il.com>
To: Ingo Molnar <mingo@...e.hu>, Thomas Gleixner <tglx@...utronix.de>,
"H. Peter Anvin" <hpa@...or.com>
Cc: "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: [PATCH] x86: remove some ifdef about acpi in setup_32/64
Signed-off-by: Yinghai Lu <yhlu.kernel@...il.com>
---
arch/x86/kernel/setup_32.c | 5 +----
arch/x86/kernel/setup_64.c | 4 ----
2 files changed, 1 insertion(+), 8 deletions(-)
Index: linux-2.6/arch/x86/kernel/setup_32.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/setup_32.c
+++ linux-2.6/arch/x86/kernel/setup_32.c
@@ -738,12 +738,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
/*
@@ -824,9 +822,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();
Index: linux-2.6/arch/x86/kernel/setup_64.c
===================================================================
--- linux-2.6.orig/arch/x86/kernel/setup_64.c
+++ linux-2.6/arch/x86/kernel/setup_64.c
@@ -372,13 +372,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;
@@ -449,12 +447,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();
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists