On Sun, Feb 10, 2019 at 09:28:43AM +0000, Peng Fan wrote: > arm64_memory_present is doing same thing as memblocks_present, so > let's use common code memblocks_present instead of platform > specific arm64_memory_present. > > Signed-off-by: Peng Fan <[email protected]>
Acked-by: Mike Rapoport <[email protected]> > --- > arch/arm64/mm/init.c | 20 +------------------- > 1 file changed, 1 insertion(+), 19 deletions(-) > > diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c > index 7205a9085b4d..2302b4093a63 100644 > --- a/arch/arm64/mm/init.c > +++ b/arch/arm64/mm/init.c > @@ -285,24 +285,6 @@ int pfn_valid(unsigned long pfn) > } > EXPORT_SYMBOL(pfn_valid); > > -#ifndef CONFIG_SPARSEMEM > -static void __init arm64_memory_present(void) > -{ > -} > -#else > -static void __init arm64_memory_present(void) > -{ > - struct memblock_region *reg; > - > - for_each_memblock(memory, reg) { > - int nid = memblock_get_region_node(reg); > - > - memory_present(nid, memblock_region_memory_base_pfn(reg), > - memblock_region_memory_end_pfn(reg)); > - } > -} > -#endif > - > static phys_addr_t memory_limit = PHYS_ADDR_MAX; > > /* > @@ -489,7 +471,7 @@ void __init bootmem_init(void) > * Sparsemem tries to allocate bootmem in memory_present(), so must be > * done after the fixed reservations. > */ > - arm64_memory_present(); > + memblocks_present(); > > sparse_init(); > zone_sizes_init(min, max); > -- > 2.14.1 > -- Sincerely yours, Mike.
