diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-06-04 00:40:40 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-04 00:40:40 -0400 |
| commit | ae20ea8525a80a863f70d332cf47b71bd9f54c1f (patch) | |
| tree | 9d3cedeb65db521a8436b545bd91641549a18d24 /arch/i386/kernel/setup.c | |
| parent | f497ba735fc9ff4e35a19641143708b3be1c7061 (diff) | |
| parent | 8be3de3fd8469154a2b3e18a4712032dac5b4a53 (diff) | |
Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
Diffstat (limited to 'arch/i386/kernel/setup.c')
| -rw-r--r-- | arch/i386/kernel/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c index 945ec73163c8..2bfbddebdbf8 100644 --- a/arch/i386/kernel/setup.c +++ b/arch/i386/kernel/setup.c | |||
| @@ -1502,11 +1502,13 @@ void __init setup_arch(char **cmdline_p) | |||
| 1502 | if (efi_enabled) | 1502 | if (efi_enabled) |
| 1503 | efi_map_memmap(); | 1503 | efi_map_memmap(); |
| 1504 | 1504 | ||
| 1505 | #ifdef CONFIG_ACPI_BOOT | ||
| 1505 | /* | 1506 | /* |
| 1506 | * Parse the ACPI tables for possible boot-time SMP configuration. | 1507 | * Parse the ACPI tables for possible boot-time SMP configuration. |
| 1507 | */ | 1508 | */ |
| 1508 | acpi_boot_table_init(); | 1509 | acpi_boot_table_init(); |
| 1509 | acpi_boot_init(); | 1510 | acpi_boot_init(); |
| 1511 | #endif | ||
| 1510 | 1512 | ||
| 1511 | #ifdef CONFIG_X86_LOCAL_APIC | 1513 | #ifdef CONFIG_X86_LOCAL_APIC |
| 1512 | if (smp_found_config) | 1514 | if (smp_found_config) |