Merge branch 'next' (accumulated 3.16 merge window patches) into master

[karo-tx-linux.git] / arch / x86 / platform / efi / efi.c

diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 835b24820eaa0594dde093bd1f8d545ab3010c02..87fc96bcc13ceb1b4d90895e35528dda85641954 100644 (file)
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -917,6 +917,9 @@ static void __init save_runtime_map(void)
        void *tmp, *p, *q = NULL;
        int count = 0;
 
+       if (efi_enabled(EFI_OLD_MEMMAP))
+               return;
+
        for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
                md = p;