Skip to content

Commit

Permalink
ARM: 8850/1: use memblocks_present
Browse files Browse the repository at this point in the history
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: Peng Fan <peng.fan@nxp.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
  • Loading branch information
Peng Fan authored and Russell King committed Apr 23, 2019
1 parent fe4fb99 commit 14b5f54
Showing 1 changed file with 1 addition and 16 deletions.
17 changes: 1 addition & 16 deletions arch/arm/mm/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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.
Expand Down

0 comments on commit 14b5f54

Please sign in to comment.