lkml.org 
[lkml]   [2008]   [Jun]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] x86: remove some ifdef about acpi in setup_32/64
Date

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.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();


\
 
 \ /
  Last update: 2008-06-21 10:41    [W:0.031 / U:0.260 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site