On Tue, Mar 19, 2019 at 12:13:57PM -0600, Logan Gunthorpe wrote: > Cleanup the arm_memory_present() function seeing it's very > similar to other arches. > > The new memblocks_present() helper checks for node ids which the > arm version did not. However, this is equivalent seeing > HAVE_MEMBLOCK_NODE_MAP should be false in this arch and therefore > memblock_get_region_node() should return 0. > > Signed-off-by: Logan Gunthorpe <[email protected]> > Cc: Russell King <[email protected]> > Cc: Kees Cook <[email protected]> > Cc: Philip Derrin <[email protected]> > Cc: "Steven Rostedt (VMware)" <[email protected]> > Cc: Nicolas Pitre <[email protected]>
Reviewed-by: Mike Rapoport <[email protected]> Strangely, I've got a feeling I've already reviewed such patch from a different person... > --- > arch/arm/mm/init.c | 17 +---------------- > 1 file changed, 1 insertion(+), 16 deletions(-) > > This is just a resend. > > diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c > index 478ea8b7db87..6c50dd407ba8 100644 > --- a/arch/arm/mm/init.c > +++ b/arch/arm/mm/init.c > @@ -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) > @@ -292,7 +277,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. > -- > 2.20.1 > -- Sincerely yours, Mike.
