diff options
author | Pekka Enberg <penberg@cs.helsinki.fi> | 2009-05-07 08:35:42 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 05:52:06 -0400 |
commit | 087fa4e964e04371a67f340e1f6ac92c5db5e0a6 (patch) | |
tree | eaa085d802bb2a58a52a8db9d62e8d1c561639e6 /arch/x86/mm/init_64.c | |
parent | 3551f88f6439cf4da3f5a3747b320280e30500de (diff) |
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@cs.helsinki.fi>
LKML-Reference: <1241699742.17846.31.camel@penberg-laptop>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/init_64.c')
-rw-r--r-- | 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 be7e12791787..52bb9519bb86 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c | |||
@@ -596,11 +596,7 @@ void __init paging_init(void) | |||
596 | max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN; | 596 | max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN; |
597 | max_zone_pfns[ZONE_NORMAL] = max_pfn; | 597 | max_zone_pfns[ZONE_NORMAL] = max_pfn; |
598 | 598 | ||
599 | #ifdef CONFIG_NUMA | ||
600 | sparse_memory_present_with_active_regions(MAX_NUMNODES); | 599 | sparse_memory_present_with_active_regions(MAX_NUMNODES); |
601 | #else | ||
602 | memory_present(0, 0, max_pfn); | ||
603 | #endif | ||
604 | sparse_init(); | 600 | sparse_init(); |
605 | free_area_init_nodes(max_zone_pfns); | 601 | free_area_init_nodes(max_zone_pfns); |
606 | } | 602 | } |