diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-04-29 16:15:57 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-04-29 16:15:57 +1000 |
| commit | 29f147d746326e4db5fe350c70373081d61a2965 (patch) | |
| tree | 04c065ace8c62953441bc22079b93449b996f283 /arch/x86_64/mm/numa.c | |
| parent | 916a3d5729c8b710d56acf579f3fdb4de7c03e77 (diff) | |
| parent | 6fb8f3acbe833586eb32598d1f844eb9f77c4fba (diff) | |
| download | linux-29f147d746326e4db5fe350c70373081d61a2965.tar.gz | |
Merge branch 'merge'
Diffstat (limited to 'arch/x86_64/mm/numa.c')
| -rw-r--r-- | arch/x86_64/mm/numa.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86_64/mm/numa.c b/arch/x86_64/mm/numa.c index cc02573a327170..b2fac14baac0fc 100644 --- a/arch/x86_64/mm/numa.c +++ b/arch/x86_64/mm/numa.c @@ -188,11 +188,13 @@ void __init setup_node_zones(int nodeid) 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 size_zones(zones, holes, start_pfn, end_pfn); free_area_init_node(nodeid, NODE_DATA(nodeid), zones, |