diff options
| author | Logan Gunthorpe | 2019-01-09 21:21:00 +0100 |
|---|---|---|
| committer | Catalin Marinas | 2019-01-21 18:34:29 +0100 |
| commit | a2c801c53d1682871fba1e037c9d3b0c9fffee8a (patch) | |
| tree | 00d5bdf4db88f8b673c5389bb77cc49b3c0294b1 | |
| parent | arm64: Remove asm/memblock.h (diff) | |
| download | kernel-qcow2-linux-a2c801c53d1682871fba1e037c9d3b0c9fffee8a.tar.gz kernel-qcow2-linux-a2c801c53d1682871fba1e037c9d3b0c9fffee8a.tar.xz kernel-qcow2-linux-a2c801c53d1682871fba1e037c9d3b0c9fffee8a.zip | |
arm64: mm: make use of new memblocks_present() helper
Cleanup the arm64_memory_present() function seeing it's very
similar to other arches.
memblocks_present() is a direct replacement of arm64_memory_present()
Acked-by: Will Deacon <will.deacon@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Logan Gunthorpe <logang@deltatee.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
| -rw-r--r-- | arch/arm64/mm/init.c | 20 |
1 files changed, 1 insertions, 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); |