diff options
author | Yinghai Lu <yinghai@kernel.org> | 2009-11-24 05:48:18 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-11-24 06:10:51 -0500 |
commit | b24c2a925a9837cccf54d50aeac22ba0cbc15455 (patch) | |
tree | 41da574f9dd4c39c290fd0480cb615d808b84cb5 /arch/x86/mm | |
parent | eb41c8be89dbe079f49202774e04a79ccac48a09 (diff) |
x86: Move find_smp_config() earlier and avoid bootmem usage
Move the find_smp_config() call to before bootmem is initialized.
Use reserve_early() instead of reserve_bootmem() in it.
This simplifies the code, we only need to call find_smp_config()
once and can remove the now unneeded reserve parameter from
x86_init_mpparse::find_smp_config.
We thus also reduce x86's dependency on bootmem allocations.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
LKML-Reference: <4B0BB9F2.70907@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm')
-rw-r--r-- | arch/x86/mm/k8topology_64.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/x86/mm/k8topology_64.c b/arch/x86/mm/k8topology_64.c index b9e2dbfe55c3..970ed579d4e4 100644 --- a/arch/x86/mm/k8topology_64.c +++ b/arch/x86/mm/k8topology_64.c | |||
@@ -57,18 +57,6 @@ static __init void early_get_boot_cpu_id(void) | |||
57 | * need to get boot_cpu_id so can use that to create apicid_to_node | 57 | * need to get boot_cpu_id so can use that to create apicid_to_node |
58 | * in k8_scan_nodes() | 58 | * in k8_scan_nodes() |
59 | */ | 59 | */ |
60 | /* | ||
61 | * Find possible boot-time SMP configuration: | ||
62 | */ | ||
63 | #ifdef CONFIG_X86_MPPARSE | ||
64 | early_find_smp_config(); | ||
65 | #endif | ||
66 | #ifdef CONFIG_ACPI | ||
67 | /* | ||
68 | * Read APIC information from ACPI tables. | ||
69 | */ | ||
70 | early_acpi_boot_init(); | ||
71 | #endif | ||
72 | #ifdef CONFIG_X86_MPPARSE | 60 | #ifdef CONFIG_X86_MPPARSE |
73 | /* | 61 | /* |
74 | * get boot-time SMP configuration: | 62 | * get boot-time SMP configuration: |