Merge tag 'iommu-fixes-v4.20-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / arm64 / mm / init.c

diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 3cf87341859f91345e30548344fafb1834560205..9b432d9fcada8dac8e7b1041437387f29785b2af 100644 (file)
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -22,7 +22,6 @@
 #include <linux/errno.h>
 #include <linux/swap.h>
 #include <linux/init.h>
-#include <linux/bootmem.h>
 #include <linux/cache.h>
 #include <linux/mman.h>
 #include <linux/nodemask.h>
@@ -484,8 +483,6 @@ void __init arm64_memblock_init(void)
        high_memory = __va(memblock_end_of_DRAM() - 1) + 1;
 
        dma_contiguous_reserve(arm64_dma_phys_limit);
-
-       memblock_allow_resize();
 }
 
 void __init bootmem_init(void)
@@ -536,7 +533,7 @@ static inline void free_memmap(unsigned long start_pfn, unsigned long end_pfn)
         * memmap array.
         */
        if (pg < pgend)
-               free_bootmem(pg, pgend - pg);
+               memblock_free(pg, pgend - pg);
 }
 
 /*
@@ -599,7 +596,7 @@ void __init mem_init(void)
        free_unused_memmap();
 #endif
        /* this will put all unused low memory onto the freelists */
-       free_all_bootmem();
+       memblock_free_all();
 
        kexec_reserve_crashkres_pages();