[tip:x86/mm] x86: use sparse_memory_present_with_active_regions() on UMA

From: tip-bot for Pekka Enberg
Date: Mon May 11 2009 - 06:12:08 EST


Commit-ID: 087fa4e964e04371a67f340e1f6ac92c5db5e0a6
Gitweb: http://git.kernel.org/tip/087fa4e964e04371a67f340e1f6ac92c5db5e0a6
Author: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
AuthorDate: Thu, 7 May 2009 15:35:42 +0300
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Mon, 11 May 2009 11:52:06 +0200

x86: use sparse_memory_present_with_active_regions() on UMA

There's no need to use call memory_present() manually on UMA because
initmem_init() sets up early_node_map by calling
e820_register_active_regions().

[ Impact: cleanup ]

Signed-off-by: Pekka Enberg <penberg@xxxxxxxxxxxxxx>
LKML-Reference: <1241699742.17846.31.camel@penberg-laptop>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>


---
arch/x86/mm/init_64.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index be7e127..52bb951 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -596,11 +596,7 @@ void __init paging_init(void)
max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN;
max_zone_pfns[ZONE_NORMAL] = max_pfn;

-#ifdef CONFIG_NUMA
sparse_memory_present_with_active_regions(MAX_NUMNODES);
-#else
- memory_present(0, 0, max_pfn);
-#endif
sparse_init();
free_area_init_nodes(max_zone_pfns);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/