Messages in this thread Patch in this message | | | Date | Sat, 12 Jan 2008 03:26:25 -0800 | From | Yinghai Lu <> | Subject | Re: [PATCH] x86_64: cleanup setup_node_zones called by paging_init v2 |
| |
On Wednesday 09 January 2008 11:19:01 am Christoph Lameter wrote: > On Wed, 9 Jan 2008, Yinghai Lu wrote: >
Christoph's
x86: 64-bit, make sparsemem vmemmap the only memory model
is in x86.git mm
so we could remove setup_node_zones because it is not needed by SPARSEMEM
please check the following patch.
YH
[PATCH] x86_84: only support sparsemem fix sparsemem is only one supported, so could remove FLAT_NODE_MEM related code, that is only needed !SPARSEMEM
Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index 8482314..4c286b7 100644 --- a/arch/x86/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c @@ -233,32 +233,6 @@ void __init setup_node_bootmem(int nodeid, unsigned long start, node_set_online(nodeid); } -/* Initialize final allocator for a zone */ -void __init 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; -#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 -} - /* * There are unfortunately some poorly designed mainboards around that * only connect memory to a single CPU. This breaks the 1:1 cpu->node @@ -580,9 +554,6 @@ void __init paging_init(void) sparse_memory_present_with_active_regions(MAX_NUMNODES); sparse_init(); - for_each_online_node(i) - setup_node_zones(i); - free_area_init_nodes(max_zone_pfns); }
| |