From 6254a9316bf01705fe1787318d8cb7504ea87260 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <Yinghai.Lu@Sun.COM>
Date: Wed, 30 Jan 2008 13:33:09 +0100
Subject: [PATCH] --- yaml --- r: 80271 b: refs/heads/master c:
 a261670aed2b5b77a20ce9b15fed57abeb126c0e h: refs/heads/master i:   80269:
 537222ba4e5e00a3ec102ee4dd2e8e9ba96f69e9   80267:
 ff66f4c54d6620454fb8b18a0ced9f067d258d3b   80263:
 047a5adf7e8dd10341dbf94f4c9028304047c5d3   80255:
 6e7548ffbb4dda2312f184c47808a6c6f73d0b40 v: v3

---
 [refs]                      |  2 +-
 trunk/arch/x86/mm/numa_64.c | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 3dec9a34ab24..6a568208648b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 94878efdd0815fe3a4159007b1454b25c7696d53
+refs/heads/master: a261670aed2b5b77a20ce9b15fed57abeb126c0e
diff --git a/trunk/arch/x86/mm/numa_64.c b/trunk/arch/x86/mm/numa_64.c
index 848231481619..551e3590e5c5 100644
--- a/trunk/arch/x86/mm/numa_64.c
+++ b/trunk/arch/x86/mm/numa_64.c
@@ -233,8 +233,9 @@ void __init setup_node_bootmem(int nodeid, unsigned long start,
 	node_set_online(nodeid);
 }
 
+#ifdef CONFIG_FLAT_NODE_MEM_MAP
 /* Initialize final allocator for a zone */
-void __init setup_node_zones(int nodeid)
+static void __init flat_setup_node_zones(int nodeid)
 {
 	unsigned long start_pfn, end_pfn, memmapsize, limit;
 
@@ -250,14 +251,16 @@ void __init setup_node_zones(int nodeid)
 	 */
 	memmapsize = sizeof(struct page) * (end_pfn-start_pfn);
 	limit = end_pfn << PAGE_SHIFT;
-#ifdef CONFIG_FLAT_NODE_MEM_MAP
+
 	NODE_DATA(nodeid)->node_mem_map =
 		__alloc_bootmem_core(NODE_DATA(nodeid)->bdata,
 				     memmapsize, SMP_CACHE_BYTES,
 				     round_down(limit - memmapsize, PAGE_SIZE),
 				     limit);
-#endif
 }
+#else
+#define flat_setup_node_zones(i) do {} while (0)
+#endif
 
 /*
  * There are unfortunately some poorly designed mainboards around that
@@ -581,7 +584,7 @@ void __init paging_init(void)
 	sparse_init();
 
 	for_each_online_node(i)
-		setup_node_zones(i);
+		flat_setup_node_zones(i);
 
 	free_area_init_nodes(max_zone_pfns);
 }