redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

x86: cleanup setup_node_zones called by paging_init()

Browse source 
setup_node_zones() calcuates some variables but only use them when
FLAT_NODE_MEM_MAP is set

so change the MACRO postion to avoid calculating.

also change it to static, and rename it to flat_setup_node_zones().

Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Yinghai Lu 2008-01-30 13:33:09 +01:00 committed by Ingo Molnar
parent 94878efdd0
commit a261670aed
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/x86/mm/numa_64.c
View file

@ -233,8 +233,9 @@ void __init setup_node_bootmem(int nodeid, unsigned long start,
node_set_online(nodeid); node_set_online(nodeid);
} }
#ifdef CONFIG_FLAT_NODE_MEM_MAP
/* Initialize final allocator for a zone */ /* 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; 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); memmapsize = sizeof(struct page) * (end_pfn-start_pfn);
limit = end_pfn << PAGE_SHIFT; limit = end_pfn << PAGE_SHIFT;
#ifdef CONFIG_FLAT_NODE_MEM_MAP
NODE_DATA(nodeid)->node_mem_map = NODE_DATA(nodeid)->node_mem_map =
__alloc_bootmem_core(NODE_DATA(nodeid)->bdata, __alloc_bootmem_core(NODE_DATA(nodeid)->bdata,
memmapsize, SMP_CACHE_BYTES, memmapsize, SMP_CACHE_BYTES,
round_down(limit - memmapsize, PAGE_SIZE), round_down(limit - memmapsize, PAGE_SIZE),
limit); limit);
#endif
} }
#else
#define flat_setup_node_zones(i) do {} while (0)
#endif
/* /*
* There are unfortunately some poorly designed mainboards around that * There are unfortunately some poorly designed mainboards around that
@ -581,7 +584,7 @@ void __init paging_init(void)
sparse_init(); sparse_init();
for_each_online_node(i) for_each_online_node(i)
setup_node_zones(i); flat_setup_node_zones(i);
free_area_init_nodes(max_zone_pfns); free_area_init_nodes(max_zone_pfns);
} }