diff options
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/mm/numa_64.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index 84823148161..551e3590e5c 100644 --- a/arch/x86/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c @@ -233,8 +233,9 @@ 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 */ -void __init setup_node_zones(int nodeid) +static void __init flat_setup_node_zones(int nodeid) { unsigned long start_pfn, end_pfn, memmapsize, limit; @@ -250,14 +251,16 @@ void __init setup_node_zones(int nodeid) */ 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 } +#else +#define flat_setup_node_zones(i) do {} while (0) +#endif /* * There are unfortunately some poorly designed mainboards around that @@ -581,7 +584,7 @@ void __init paging_init(void) sparse_init(); for_each_online_node(i) - setup_node_zones(i); + flat_setup_node_zones(i); free_area_init_nodes(max_zone_pfns); } |