Merge tag 'xtensa-20181101' of git://github.com/jcmvbkbc/linux-xtensa

[mirror_ubuntu-jammy-kernel.git] / arch / xtensa / mm / init.c

diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
index b385e6b73065f9db79d3c2a5ea68eb2189fff7df..30a48bba4a47372b81ce5f0e6e40aec8ca564dcd 100644 (file)
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c
@@ -18,7 +18,7 @@
 
 #include <linux/kernel.h>
 #include <linux/errno.h>
-#include <linux/bootmem.h>
+#include <linux/memblock.h>
 #include <linux/gfp.h>
 #include <linux/highmem.h>
 #include <linux/swap.h>
@@ -152,7 +152,7 @@ void __init mem_init(void)
        max_mapnr = max_pfn - ARCH_PFN_OFFSET;
        high_memory = (void *)__va(max_low_pfn << PAGE_SHIFT);
 
-       free_all_bootmem();
+       memblock_free_all();
 
        mem_init_print_info(NULL);
        pr_info("virtual kernel memory layout:\n"