aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYinghai Lu <Yinghai.Lu@Sun.COM>2008-01-30 13:33:09 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:33:09 +0100
commita261670aed2b5b77a20ce9b15fed57abeb126c0e (patch)
treeb0ad46aff4a4bfd2cc47193dc0b36074440976a1
parent94878efdd0815fe3a4159007b1454b25c7696d53 (diff)
x86: cleanup setup_node_zones called by paging_init()
setup_node_zones() calcuates some variables but only use them when FLAT_NODE_MEM_MAP is set so change the MACRO postion to avoid calculating. also change it to static, and rename it to flat_setup_node_zones(). Signed-off-by: Yinghai Lu <yinghai.lu@sun.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/mm/numa_64.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
index 84823148161..551e3590e5c 100644
--- a/arch/x86/mm/numa_64.c
+++ b/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);
}