diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-16 09:42:50 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-16 09:43:54 +0100 |
| commit | 02ac81a812fe0575a8475a93bdc22fb291ebad91 (patch) | |
| tree | 690f1b48b070f5e268d51c54b63943dc3b807e50 /arch/x86/mm/amdtopology_64.c | |
| parent | 9a6d44b9adb777ca9549e88cd55bd8f2673c52a2 (diff) | |
| parent | d2137d5af4259f50c19addb8246a186c9ffac325 (diff) | |
Merge branch 'x86/bootmem' into x86/mm
Merge reason: the topic is ready - consolidate it into the more generic x86/mm tree
and prevent conflicts.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/amdtopology_64.c')
| -rw-r--r-- | arch/x86/mm/amdtopology_64.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/x86/mm/amdtopology_64.c b/arch/x86/mm/amdtopology_64.c index f21962c435e..49b334cdd64 100644 --- a/arch/x86/mm/amdtopology_64.c +++ b/arch/x86/mm/amdtopology_64.c @@ -278,12 +278,14 @@ int __init amd_scan_nodes(void) apicid_base = boot_cpu_physical_apicid; } - for_each_node_mask(i, node_possible_map) { - int j; - + for_each_node_mask(i, node_possible_map) memblock_x86_register_active_regions(i, nodes[i].start >> PAGE_SHIFT, nodes[i].end >> PAGE_SHIFT); + init_memory_mapping_high(); + for_each_node_mask(i, node_possible_map) { + int j; + for (j = apicid_base; j < cores + apicid_base; j++) apicid_to_node[(i << bits) + j] = i; setup_node_bootmem(i, nodes[i].start, nodes[i].end); |