---

yaml --- r: 145781 b: refs/heads/master c: 087fa4e h: refs/heads/master i: 145779: c3b1cdc v: v3
git-mirror · May 11, 2009 · 9eb1967 · 9eb1967
1 parent d0b084f
commit 9eb1967
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3551f88f6439cf4da3f5a3747b320280e30500de
+refs/heads/master: 087fa4e964e04371a67f340e1f6ac92c5db5e0a6
diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/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);
 }