diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-06 14:30:53 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-06 14:30:53 +0100 |
| commit | a3dfd8c06351968f2ec42feb1ae8dfab8b481225 (patch) | |
| tree | cd1066e0f76e02c6f1105f96b346be5d1e63896f /arch/x86/platform/efi/efi.c | |
| parent | 18d8ff256f495bee7bcf016d9006d4b330e29260 (diff) | |
| parent | cac65253a9c5a30d4c8d7bc4c60197935f9e2e70 (diff) | |
Merge tag 'v3.10.15' into linux-linaro-lsk
This is the 3.10.15 stable release
Diffstat (limited to 'arch/x86/platform/efi/efi.c')
| -rw-r--r-- | arch/x86/platform/efi/efi.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c index d2fbcedcf6e..91ac654ff4e 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -910,10 +910,13 @@ void __init efi_enter_virtual_mode(void) for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) { md = p; - if (!(md->attribute & EFI_MEMORY_RUNTIME) && - md->type != EFI_BOOT_SERVICES_CODE && - md->type != EFI_BOOT_SERVICES_DATA) - continue; + if (!(md->attribute & EFI_MEMORY_RUNTIME)) { +#ifdef CONFIG_X86_64 + if (md->type != EFI_BOOT_SERVICES_CODE && + md->type != EFI_BOOT_SERVICES_DATA) +#endif + continue; + } size = md->num_pages << EFI_PAGE_SHIFT; end = md->phys_addr + size; |