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

Commit 14b5f54b authored by Peng Fan's avatar Peng Fan Committed by Russell King
Browse files

ARM: 8850/1: use memblocks_present 

arm_memory_present is doing same thing as memblocks_present, so
let's use common code memblocks_present instead of platform
specific arm_memory_present.

Patchwork: https://patchwork.kernel.org/patch/10805693/



Signed-off-by: default avatarPeng Fan <peng.fan@nxp.com>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
parent fe4fb990

arch/arm/mm/init.c

+1 −16
Original line number Diff line number Diff line
@@ -182,21 +182,6 @@ int pfn_valid(unsigned long pfn) 
EXPORT_SYMBOL(pfn_valid);

#endif



#ifndef CONFIG_SPARSEMEM

static void __init arm_memory_present(void)

{

}

#else

static void __init arm_memory_present(void)

{

	struct memblock_region *reg;



	for_each_memblock(memory, reg)

		memory_present(0, memblock_region_memory_base_pfn(reg),

			       memblock_region_memory_end_pfn(reg));

}

#endif



static bool arm_memblock_steal_permitted = true;



phys_addr_t __init arm_memblock_steal(phys_addr_t size, phys_addr_t align)
@@ -293,7 +278,7 @@ void __init bootmem_init(void) 
	 * Sparsemem tries to allocate bootmem in memory_present(),

	 * so must be done after the fixed reservations

	 */

	arm_memory_present();

	memblocks_present();



	/*

	 * sparse_init() needs the bootmem allocator up and running.