Skip to contentSkip to conversation

x86: use sparse_memory_present_with_active_regions() on UMA

PATCH In review Pekka Enberg 1 participant 2 messages May 7, 2009 – May 11, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 2/2 x86: use sparse_memory_present_with_active_regions() on UMA

From: Pekka Enberg <[email protected]>

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 ]

---
 arch/x86/mm/init_64.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
arch/x86/mm/init_64.c +0 -4
index ccc0e6e..5ded102 100644
@@ -639,11 +639,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);
 }
Signature · 1 line
1.5.6.3
#1 lore raw
Commit-ID:  087fa4e964e04371a67f340e1f6ac92c5db5e0a6
Gitweb:     http://git.kernel.org/tip/087fa4e964e04371a67f340e1f6ac92c5db5e0a6
Author:     Pekka Enberg <[email protected]>
AuthorDate: Thu, 7 May 2009 15:35:42 +0300
Committer:  Ingo Molnar <[email protected]>
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 ]

LKML-Reference: <1241699742.17846.31.camel@penberg-laptop>

---
 arch/x86/mm/init_64.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)
arch/x86/mm/init_64.c +0 -4
index be7e127..52bb951 100644
@@ -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);
 }