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

Commit f78cda3a authored by Junjie Wu's avatar Junjie Wu Committed by Stephen Boyd
Browse files

mm: add HAVE_MEMBLOCK_NODE_MAP support 



ARCH_POPULATES_NODE_MAP in 3.0 is replaced by HAVE_MEMBLOCK_NODE_MAP in
3.4.  add_active_range() is replaced with memblock_set_node().  They do
basically the same thing, but embedding nid field into memblock_region
is much cleaner than a separate early_node_map.

HAVE_MEMBLOCK_NODE_MAP is not selected by default.

See commit 4a2164a7 for more info.

Change-Id: Icb44a8cea365b2d32df80628a57535a3d46fbd55
Signed-off-by: default avatarJunjie Wu <junjiew@codeaurora.org>
parent 23bb8f03

arch/arm/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -1761,9 +1761,6 @@ config ARCH_MEMORY_PROBE 
config ARCH_MEMORY_REMOVE

	def_bool n



config ARCH_POPULATES_NODE_MAP

	def_bool n



config ENABLE_DMM

	def_bool n

arch/arm/mm/init.c

+5 −5
Original line number Diff line number Diff line
@@ -250,8 +250,8 @@ void __init setup_dma_zone(struct machine_desc *mdesc) 
#endif

}



#ifdef CONFIG_ARCH_POPULATES_NODE_MAP

static void __init arm_bootmem_free_apnm(unsigned long max_low,

#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP

static void __init arm_bootmem_free_hmnm(unsigned long max_low,

	unsigned long max_high)

{

	unsigned long max_zone_pfns[MAX_NR_ZONES];
@@ -267,7 +267,7 @@ static void __init arm_bootmem_free_apnm(unsigned long max_low, 
		unsigned long start = memblock_region_memory_base_pfn(reg);

		unsigned long end = memblock_region_memory_end_pfn(reg);



		add_active_range(0, start, end);

		memblock_set_node(PFN_PHYS(start), PFN_PHYS(end - start), 0);

	}

	free_area_init_nodes(max_zone_pfns);

}
@@ -491,8 +491,8 @@ void __init bootmem_init(void) 
	 */

	sparse_init();



#ifdef CONFIG_ARCH_POPULATES_NODE_MAP

	arm_bootmem_free_apnm(max_low, max_high);

#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP

	arm_bootmem_free_hmnm(max_low, max_high);

#else

	/*

	 * Now free the memory - free_area_init_node needs