Merge tag 'pwm/for-5.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[linux-2.6-microblaze.git] / arch / arm64 / mm / init.c

diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 3685e12..0696a45 100644 (file)
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -35,6 +35,7 @@
 #include <asm/fixmap.h>
 #include <asm/kasan.h>
 #include <asm/kernel-pgtable.h>
+#include <asm/kvm_host.h>
 #include <asm/memory.h>
 #include <asm/numa.h>
 #include <asm/sections.h>
@@ -452,6 +453,8 @@ void __init bootmem_init(void)
 
        dma_pernuma_cma_reserve();
 
+       kvm_hyp_reserve();
+
        /*
         * sparse_init() tries to allocate memory from memblock, so must be
         * done after the fixed reservations
@@ -491,8 +494,6 @@ void __init mem_init(void)
        /* this will put all unused low memory onto the freelists */
        memblock_free_all();
 
-       mem_init_print_info(NULL);
-
        /*
         * Check boundaries twice: Some fundamental inconsistencies can be
         * detected at build time already.
@@ -521,7 +522,7 @@ void free_initmem(void)
         * prevents the region from being reused for kernel modules, which
         * is not supported by kallsyms.
         */
-       unmap_kernel_range((u64)__init_begin, (u64)(__init_end - __init_begin));
+       vunmap_range((u64)__init_begin, (u64)__init_end);
 }
 
 void dump_mem_limit(void)