Commit 3f3ee43a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fix from Ingo Molnar:
 "A build fix with certain Kconfig combinations"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/ioremap: Fix CONFIG_EFI=n build
parents c6ac7188 870b4333

arch/x86/mm/ioremap.c

+3 −0
Original line number Diff line number Diff line
@@ -115,6 +115,9 @@ static void __ioremap_check_other(resource_size_t addr, struct ioremap_desc *des 
	if (!sev_active())

		return;



	if (!IS_ENABLED(CONFIG_EFI))

		return;



	if (efi_mem_type(addr) == EFI_RUNTIME_SERVICES_DATA)

		desc->flags |= IORES_MAP_ENCRYPTED;

}