diff options
author | Tejun Heo <tj@kernel.org> | 2011-05-02 08:18:52 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2011-05-02 08:18:52 -0400 |
commit | 797390d8554b1e07aabea37d0140933b0412dba0 (patch) | |
tree | 81ec97a19bcd03de733a73fea8c88a84b64044ad /arch/x86/mm/numa_32.c | |
parent | 84914ed0ec6787d38e84b510f92ad4ca3a572fd8 (diff) |
x86-32, NUMA: use sparse_memory_present_with_active_regions()
Instead of calling memory_present() for each region from NUMA init,
call sparse_memory_present_with_active_regions() from paging_init()
similarly to x86-64.
For flat and numaq, this results in exactly the same memory_present()
calls. For srat, if there are multiple memory chunks for a node,
after this change, memory_present() will be called separately for each
chunk instead of being called once to encompass the whole range, which
doesn't cause any harm and actually is the better behavior.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: David Rientjes <rientjes@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Diffstat (limited to 'arch/x86/mm/numa_32.c')
-rw-r--r-- | arch/x86/mm/numa_32.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c index e0d9716ab38..f847fa1e02d 100644 --- a/arch/x86/mm/numa_32.c +++ b/arch/x86/mm/numa_32.c | |||
@@ -119,7 +119,6 @@ int __init get_memcfg_numa_flat(void) | |||
119 | node_start_pfn[0] = 0; | 119 | node_start_pfn[0] = 0; |
120 | node_end_pfn[0] = max_pfn; | 120 | node_end_pfn[0] = max_pfn; |
121 | memblock_x86_register_active_regions(0, 0, max_pfn); | 121 | memblock_x86_register_active_regions(0, 0, max_pfn); |
122 | memory_present(0, 0, max_pfn); | ||
123 | 122 | ||
124 | /* Indicate there is one node available. */ | 123 | /* Indicate there is one node available. */ |
125 | nodes_clear(node_online_map); | 124 | nodes_clear(node_online_map); |