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

torvalds · torvalds · commit 3f3ee43a4623 · 2020-03-24T09:57:46.000-07:00
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
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
@@ -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;
 }

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,9 @@ static void __ioremap_check_other(resource_size_t addr, struct ioremap_desc *des`
`115`	`115`	`if (!sev_active())`
`116`	`116`	`return;`
`117`	`117`
	`118`	`+ if (!IS_ENABLED(CONFIG_EFI))`
	`119`	`+ return;`
	`120`	`+`
`118`	`121`	`if (efi_mem_type(addr) == EFI_RUNTIME_SERVICES_DATA)`
`119`	`122`	`desc->flags \|= IORES_MAP_ENCRYPTED;`
`120`	`123`	`}`