Merge tag 'platform-drivers-x86-v4.20-1' of git://git.infradead.org/linux-platform...

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

diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 0cc8e04295a40dc1d16f308396afdfb7540aa48c..32e4845af2b66fe1af4c1b43601b05b1fd1c51f8 100644 (file)
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -11,7 +11,6 @@
 #include <linux/errno.h>
 #include <linux/swap.h>
 #include <linux/init.h>
-#include <linux/bootmem.h>
 #include <linux/mman.h>
 #include <linux/sched/signal.h>
 #include <linux/sched/task.h>
@@ -508,7 +507,7 @@ void __init mem_init(void)
 
        /* this will put all unused low memory onto the freelists */
        free_unused_memmap();
-       free_all_bootmem();
+       memblock_free_all();
 
 #ifdef CONFIG_SA1111
        /* now that our DMA memory is actually so designated, we can free it */