1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
index 388a929baf95..1a6a77df8a5e 100644
--- a/drivers/firmware/efi/arm-init.c
+++ b/drivers/firmware/efi/arm-init.c
@@ -265,6 +265,10 @@ void __init efi_init(void)
                                     (params.mmap & ~PAGE_MASK)));
 
         init_screen_info();
+
+        /* ARM does not permit early mappings to persist across paging_init() */
+        if (IS_ENABLED(CONFIG_ARM))
+                efi_memmap_unmap();
 }
 
 static int __init register_gop_device(void)