diff options
| author | Linus Torvalds | 2020-03-24 09:57:46 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2020-03-24 09:57:46 -0700 |
| commit | 3f3ee43a462344f6509bd15c988e39d330af91b3 (patch) | |
| tree | 6216bebf8665e3aee2c9a47972d36d9761086543 /arch | |
| parent | c6ac7188c1142c450eb601563ad69204bf1e9286 (diff) | |
| parent | 870b4333a62e45b0b2000d14b301b7b8b8cad9da (diff) | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/mm/ioremap.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 935a91e1fd77..18c637c0dc6f 100644 --- 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; } |