From 9eb196752a15da2565aa6451eb6876e32c7f8c57 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Thu, 7 May 2009 15:35:42 +0300
Subject: [PATCH] --- yaml --- r: 145781 b: refs/heads/master c:
 087fa4e964e04371a67f340e1f6ac92c5db5e0a6 h: refs/heads/master i:   145779:
 c3b1cdcb406a6c5b79aa7af7b2a2e4e4d2a1e4c4 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/x86/mm/init_64.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 92a9e23c5bcb..bc573342ac5f 100644
--- 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
index be7e12791787..52bb9519bb86 100644
--- 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);
 }