Merge branch 'spi-4.20' into spi-4.21 for bcm stuff.

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

diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c
index ba145065c579bfff5af1d0ca4e569a8b8c49da32..f8fe5668b30fd98412c8fbf45433d3b8718158d4 100644 (file)
--- a/arch/arc/mm/init.c
+++ b/arch/arc/mm/init.c
@@ -8,7 +8,6 @@
 
 #include <linux/kernel.h>
 #include <linux/mm.h>
-#include <linux/bootmem.h>
 #include <linux/memblock.h>
 #ifdef CONFIG_BLK_DEV_INITRD
 #include <linux/initrd.h>
@@ -218,7 +217,7 @@ void __init mem_init(void)
                free_highmem_page(pfn_to_page(tmp));
 #endif
 
-       free_all_bootmem();
+       memblock_free_all();
        mem_init_print_info(NULL);
 }