summaryrefslogtreecommitdiffstats
path: root/arch/x86/platform
diff options
context:
space:
mode:
authorDaniel Kiper <daniel.kiper@oracle.com>2014-06-30 19:52:57 +0200
committerMatt Fleming <matt.fleming@intel.com>2014-07-18 21:23:54 +0100
commit67a9b9c53cafd3f391dccc84a3af45334c6267fc (patch)
tree6b3d88f0a51007c51b0958b44fda262bcafb454a /arch/x86/platform
parentabc93f8eb6e46a480485f19256bdbda36ec78a84 (diff)
downloadlinux-67a9b9c53cafd3f391dccc84a3af45334c6267fc.tar.bz2
arch/x86: Do not access EFI memory map if it is not available
Do not access EFI memory map if it is not available. At least Xen dom0 EFI implementation does not have an access to it. Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'arch/x86/platform')
-rw-r--r--arch/x86/platform/efi/efi.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index b40597209623..7d627a02ed82 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -946,6 +946,9 @@ u64 efi_mem_attributes(unsigned long phys_addr)
efi_memory_desc_t *md;
void *p;
+ if (!efi_enabled(EFI_MEMMAP))
+ return 0;
+
for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
md = p;
if ((md->phys_addr <= phys_addr) &&