From: Yinghai Lu Date: Wed, 30 Jan 2008 12:33:24 +0000 (+0100) Subject: x86: only support sparsemem X-Git-Tag: v2.6.25-rc1~1143^2~216 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc7250ab38346762c567813794b80ee6c57dfed6;p=linux-2.6 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 Reviewed-by: Christoph Lameter Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index e157cb274b..1268d33e7b 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, node_set_online(nodeid); } -#ifdef CONFIG_FLAT_NODE_MEM_MAP -/* Initialize final allocator for a zone */ -static void __init flat_setup_node_zones(int nodeid) -{ - unsigned long start_pfn, end_pfn, memmapsize, limit; - - start_pfn = node_start_pfn(nodeid); - end_pfn = node_end_pfn(nodeid); - - Dprintk(KERN_INFO "Setting up memmap for node %d %lx-%lx\n", - nodeid, start_pfn, end_pfn); - - /* - * Try to allocate mem_map at end to not fill up precious <4GB - * memory. - */ - memmapsize = sizeof(struct page) * (end_pfn-start_pfn); - limit = end_pfn << PAGE_SHIFT; - - NODE_DATA(nodeid)->node_mem_map = - __alloc_bootmem_core(NODE_DATA(nodeid)->bdata, - memmapsize, SMP_CACHE_BYTES, - round_down(limit - memmapsize, PAGE_SIZE), - limit); -} -#else -#define flat_setup_node_zones(i) do {} while (0) -#endif - /* * There are unfortunately some poorly designed mainboards around that * only connect memory to a single CPU. This breaks the 1:1 cpu->node @@ -600,9 +571,6 @@ void __init paging_init(void) sparse_memory_present_with_active_regions(MAX_NUMNODES); sparse_init(); - for_each_online_node(i) - flat_setup_node_zones(i); - free_area_init_nodes(max_zone_pfns); }