mm: move alloc_node_mem_map within CONFIG_FLAT_NODE_MEM_MAP block
Subsystems (2)
PATCH 1/1 mm: move alloc_node_mem_map within CONFIG_FLAT_NODE_MEM_MAP block
I was checking free_area_init_node() and I saw that it calls alloc_node_mem_map(), but this function does nothing unless we have CONFIG_FLAT_NODE_MEM_MAP, so we might want to:
a) move the call within the #ifdef CONFIG_FLAT_NODE_MEM_MAP block
that follows afterwards.
b) now, alloc_node_mem_map() has the bulk of its code within #ifdef CONFIG_FLAT_NODE_MEM_MAP, so I guess we can put the whole function within an #ifdef CONFIG_FLAT_NODE_MEM_MAP block.
Signed-off-by Oscar Salvador <[email protected]>
--- mm/page_alloc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
mm/page_alloc.c +3 -3
@@ -6126,6 +6126,7 @@ static void __paginginit free_area_init_core(struct pglist_data *pgdat) } } +#ifdef CONFIG_FLAT_NODE_MEM_MAP static void __ref alloc_node_mem_map (struct pglist_data *pgdat) {unsigned long __maybe_unused start =0 ;
@@ -6135,7 +6136,6 @@ static void __ref alloc_node_mem_map(struct pglist_data *pgdat)if (!pgdat->node_spanned_pages)return ; -#ifdef CONFIG_FLAT_NODE_MEM_MAP start = pgdat->node_start_pfn & ~(MAX_ORDER_NR_PAGES -1 ); offset = pgdat->node_start_pfn - start;/* ia64 gets its own node_mem_map, before this, without bootmem */
@@ -6169,8 +6169,8 @@ static void __ref alloc_node_mem_map(struct pglist_data *pgdat)#endif /* CONFIG_HAVE_MEMBLOCK_NODE_MAP */ }#endif -#endif /* CONFIG_FLAT_NODE_MEM_MAP */ } +#endif /* CONFIG_FLAT_NODE_MEM_MAP */ void __paginginit free_area_init_node(int nid, unsigned long *zones_size,unsigned long node_start_pfn,unsigned long *zholes_size)
@@ -6196,8 +6196,8 @@ void __paginginit free_area_init_node(int nid, unsigned long *zones_size,calculate_node_totalpages (pgdat, start_pfn, end_pfn, zones_size, zholes_size); -alloc_node_mem_map (pgdat);#ifdef CONFIG_FLAT_NODE_MEM_MAP +alloc_node_mem_map (pgdat);printk (KERN_DEBUG "free_area_init_node: node %d, pgdat %08lx, node_mem_map %08lx\n" , nid, (unsigned long )pgdat, (unsigned long )pgdat->node_mem_map);
Signature · 7 lines
2.13.5 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"[email protected]"> [email protected] </a>