efi/arm/arm64: Allow SetVirtualAddressMap() to be omitted

[linux.git] / drivers / firmware / efi / libstub / arm-stub.c

diff --git a/drivers/firmware/efi/libstub/arm-stub.c b/drivers/firmware/efi/libstub/arm-stub.c
index eee42d5e25eecacbcf379ef9138f73f1e6ffb27b..626ec4b4a664c5aa8d35dcb935503f29d344479b 100644 (file)
--- a/drivers/firmware/efi/libstub/arm-stub.c
+++ b/drivers/firmware/efi/libstub/arm-stub.c
@@ -370,6 +370,11 @@ void efi_get_virtmap(efi_memory_desc_t *memory_map, unsigned long map_size,
                paddr = in->phys_addr;
                size = in->num_pages * EFI_PAGE_SIZE;
 
+               if (novamap()) {
+                       in->virt_addr = in->phys_addr;
+                       continue;
+               }
+
                /*
                 * Make the mapping compatible with 64k pages: this allows
                 * a 4k page size kernel to kexec a 64k page size kernel and