From e4fdd68214e884a38443f6a025955ad3011395ec Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Sat, 22 Apr 2006 02:35:41 -0700 Subject: [PATCH] --- yaml --- r: 26101 b: refs/heads/master c: 3b5fd59fdd2e656dd4d10f2cedb41a7519b131b2 h: refs/heads/master i: 26099: 14cd01a952fe926f8c24698f7fb6616cdc12b053 v: v3 --- [refs] | 2 +- trunk/arch/x86_64/mm/numa.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d180938e20a5..9e41c83d703e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 73a88814542d3f5b8973f3db9d7f380bd29957c4 +refs/heads/master: 3b5fd59fdd2e656dd4d10f2cedb41a7519b131b2 diff --git a/trunk/arch/x86_64/mm/numa.c b/trunk/arch/x86_64/mm/numa.c index cc02573a3271..b2fac14baac0 100644 --- a/trunk/arch/x86_64/mm/numa.c +++ b/trunk/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,