leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: remove some acpi ifdefs in setup_32/64

Browse Source 
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Yinghai Lu 2008-06-21 01:38:41 -07:00 committed by Ingo Molnar
parent ce38cc7996
commit 04606618bb
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/kernel/setup_32.c
View File

@ -726,12 +726,10 @@ void __init setup_arch(char **cmdline_p)
io_delay_init(); io_delay_init();
#ifdef CONFIG_ACPI
/* /*
* Parse the ACPI tables for possible boot-time SMP configuration. * Parse the ACPI tables for possible boot-time SMP configuration.
*/ */
acpi_boot_table_init(); acpi_boot_table_init();
#endif
#ifdef CONFIG_ACPI_NUMA #ifdef CONFIG_ACPI_NUMA
/* /*
@ -812,9 +810,8 @@ void __init setup_arch(char **cmdline_p)
early_quirks(); early_quirks();
#ifdef CONFIG_ACPI
acpi_boot_init(); acpi_boot_init();
#endif
#if defined(CONFIG_X86_MPPARSE) || defined(CONFIG_X86_VISWS) #if defined(CONFIG_X86_MPPARSE) || defined(CONFIG_X86_VISWS)
if (smp_found_config) if (smp_found_config)
get_smp_config(); get_smp_config();

4
arch/x86/kernel/setup_64.c
View File

@ -355,13 +355,11 @@ void __init setup_arch(char **cmdline_p)
kvmclock_init(); kvmclock_init();
#endif #endif
#ifdef CONFIG_ACPI
/* /*
* Initialize the ACPI boot-time table parser (gets the RSDP and SDT). * Initialize the ACPI boot-time table parser (gets the RSDP and SDT).
* Call this early for SRAT node setup. * Call this early for SRAT node setup.
*/ */
acpi_boot_table_init(); acpi_boot_table_init();
#endif
/* How many end-of-memory variables you have, grandma! */ /* How many end-of-memory variables you have, grandma! */
max_low_pfn = end_pfn; max_low_pfn = end_pfn;
@ -432,12 +430,10 @@ void __init setup_arch(char **cmdline_p)
early_quirks(); early_quirks();
#ifdef CONFIG_ACPI
/* /*
* Read APIC and some other early information from ACPI tables. * Read APIC and some other early information from ACPI tables.
*/ */
acpi_boot_init(); acpi_boot_init();
#endif
init_cpu_to_node(); init_cpu_to_node();