Merge tag 'efi-next-for-v5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi

[platform/kernel/linux-rpi.git] / arch / arm64 / mm / init.c

diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index b6ef26f..b9af30b 100644 (file)
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -350,8 +350,8 @@ void __init arm64_memblock_init(void)
                        "initrd not fully accessible via the linear mapping -- please check your bootloader ...\n")) {
                        phys_initrd_size = 0;
                } else {
-                       memblock_remove(base, size); /* clear MEMBLOCK_ flags */
                        memblock_add(base, size);
+                       memblock_clear_nomap(base, size);
                        memblock_reserve(base, size);
                }
        }