Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0a5a58a authored by Bob Picco's avatar Bob Picco Committed by Andi Kleen
Browse files

[PATCH] x86-64: clean up sparsemem memory_present call 



Eliminate arch specific memory_present call x86_64 NUMA by utilizing
sparse_memory_present_with_active_regions.

Acked-by: default avatarMel Gorman <mel@csn.ul.ie>
Signed-off-by: default avatarBob Picco <bob.picco@hp.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 47a55cd7

arch/x86_64/mm/numa.c

+2 −15
Original line number Original line Diff line number Diff line
@@ -460,20 +460,6 @@ unsigned long __init numa_free_all_bootmem(void) 
	return pages;

	return pages;

} 

} 





#ifdef CONFIG_SPARSEMEM

static void __init arch_sparse_init(void)

{

	int i;



	for_each_online_node(i)

		memory_present(i, node_start_pfn(i), node_end_pfn(i));



	sparse_init();

}

#else

#define arch_sparse_init() do {} while (0)

#endif



void __init paging_init(void)

void __init paging_init(void)

{ 

{ 

	int i;

	int i;
@@ -483,7 +469,8 @@ void __init paging_init(void) 
	max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN;

	max_zone_pfns[ZONE_DMA32] = MAX_DMA32_PFN;

	max_zone_pfns[ZONE_NORMAL] = end_pfn;

	max_zone_pfns[ZONE_NORMAL] = end_pfn;





	arch_sparse_init();

	sparse_memory_present_with_active_regions(MAX_NUMNODES);

	sparse_init();





	for_each_online_node(i) {

	for_each_online_node(i) {

		setup_node_zones(i); 

		setup_node_zones(i);