aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYinghai Lu <Yinghai.Lu@Sun.COM>2008-01-30 07:33:24 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:33:24 -0500
commitfc7250ab38346762c567813794b80ee6c57dfed6 (patch)
treed5294dd3f40962c6c40858c73ba334818284b5db
parent70edcd77a0d6d0f8731c826764f5eb6732f521e9 (diff)
x86: only support sparsemem
sparsemem is only one supported, so could remove FLAT_NODE_MEM related, that is only needed !SPARSEMEM Signed-off-by: Yinghai Lu <yinghai.lu@sun.com> Reviewed-by: Christoph Lameter <clameter@sgi.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.c32
1 files changed, 0 insertions, 32 deletions
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
index e157cb274b25..1268d33e7b6e 100644
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@ -240,35 +240,6 @@ void __init setup_node_bootmem(int nodeid, unsigned long start,
240 node_set_online(nodeid); 240 node_set_online(nodeid);
241} 241}
242 242
243#ifdef CONFIG_FLAT_NODE_MEM_MAP
244/* Initialize final allocator for a zone */
245static void __init flat_setup_node_zones(int nodeid)
246{
247 unsigned long start_pfn, end_pfn, memmapsize, limit;
248
249 start_pfn = node_start_pfn(nodeid);
250 end_pfn = node_end_pfn(nodeid);
251
252 Dprintk(KERN_INFO "Setting up memmap for node %d %lx-%lx\n",
253 nodeid, start_pfn, end_pfn);
254
255 /*
256 * Try to allocate mem_map at end to not fill up precious <4GB
257 * memory.
258 */
259 memmapsize = sizeof(struct page) * (end_pfn-start_pfn);
260 limit = end_pfn << PAGE_SHIFT;
261
262 NODE_DATA(nodeid)->node_mem_map =
263 __alloc_bootmem_core(NODE_DATA(nodeid)->bdata,
264 memmapsize, SMP_CACHE_BYTES,
265 round_down(limit - memmapsize, PAGE_SIZE),
266 limit);
267}
268#else
269#define flat_setup_node_zones(i) do {} while (0)
270#endif
271
272/* 243/*
273 * There are unfortunately some poorly designed mainboards around that 244 * There are unfortunately some poorly designed mainboards around that
274 * only connect memory to a single CPU. This breaks the 1:1 cpu->node 245 * only connect memory to a single CPU. This breaks the 1:1 cpu->node
@@ -600,9 +571,6 @@ void __init paging_init(void)
600 sparse_memory_present_with_active_regions(MAX_NUMNODES); 571 sparse_memory_present_with_active_regions(MAX_NUMNODES);
601 sparse_init(); 572 sparse_init();
602 573
603 for_each_online_node(i)
604 flat_setup_node_zones(i);
605
606 free_area_init_nodes(max_zone_pfns); 574 free_area_init_nodes(max_zone_pfns);
607} 575}
608 576