Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / arch / x86 / platform / efi / efi.c

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index d2fbcedcf6eaf2fd77179075c1be2c5c4d3d8347..b410b71bdcf767fc97fbb8f08dcaed1ea46f4c1f 100644 (file)
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -929,6 +929,13 @@ void __init efi_enter_virtual_mode(void)
                        va = efi_ioremap(md->phys_addr, size,
                                         md->type, md->attribute);
 
+               if (!(md->attribute & EFI_MEMORY_RUNTIME)) {
+                       if (!va)
+                               pr_err("ioremap of 0x%llX failed!\n",
+                                      (unsigned long long)md->phys_addr);
+                       continue;
+               }
+
                md->virt_addr = (u64) (unsigned long) va;
 
                if (!va) {