Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee042421 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'efi-urgent' of... 

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: default avatarIngo Molnar <mingo@kernel.org>
parents f42bcf1a 70087011

arch/x86/platform/efi/efi.c

+7 −4
Original line number Diff line number Diff line
@@ -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 &&

		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;