diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-09-20 09:52:09 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-09-20 09:52:09 +0200 |
| commit | ee0424218cd385c334c7b8916c4dda3fb797b3ce (patch) | |
| tree | 6e2264c21d2c025c18b0b36232be79b7d3ef8e44 /arch | |
| parent | f42bcf1aa84a4c4348d53ac3013eff2b642987e5 (diff) | |
| parent | 700870119f49084da004ab588ea2b799689efaf7 (diff) | |
| download | linux-ee0424218cd385c334c7b8916c4dda3fb797b3ce.tar.gz linux-ee0424218cd385c334c7b8916c4dda3fb797b3ce.tar.bz2 linux-ee0424218cd385c334c7b8916c4dda3fb797b3ce.zip | |
Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/urgent
Pull EFI fix from Matt Flemin:
" * Fix WARNING on i386 by only enabling a workaround for x86-64 since
we've never encountered the bug on i386 - Josh Boyer "
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch')
| -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 90f6ed127096..c7e22ab29a5a 100644 --- a/arch/x86/platform/efi/efi.c +++ b/arch/x86/platform/efi/efi.c @@ -912,10 +912,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; |