summaryrefslogtreecommitdiffstats
path: root/arch/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-03-06 07:13:56 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-03-06 07:13:56 -0800
commitc8f5ed6ef972ed4fd10b0c2e2baec3b6803d3c73 (patch)
treee57a12ca1ed3b53c9cafc8bc99dd104bce40425e /arch/Kconfig
parent3717f613f48df0222311f974cf8a06c8a6c97bae (diff)
parent5c418dc789a3898717ebf2caa5716ba91a7150b2 (diff)
downloadlinux-c8f5ed6ef972ed4fd10b0c2e2baec3b6803d3c73.tar.gz
linux-c8f5ed6ef972ed4fd10b0c2e2baec3b6803d3c73.tar.bz2
linux-c8f5ed6ef972ed4fd10b0c2e2baec3b6803d3c73.zip
Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull EFI updates from Ingo Molnar: "The main EFI changes in this cycle were: - Use 32-bit alignment for efi_guid_t - Allow the SetVirtualAddressMap() call to be omitted - Implement earlycon=efifb based on existing earlyprintk code - Various minor fixes and code cleanups from Sai, Ard and me" * 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: efi: Fix build error due to enum collision between efi.h and ima.h efi/x86: Convert x86 EFI earlyprintk into generic earlycon implementation x86: Make ARCH_USE_MEMREMAP_PROT a generic Kconfig symbol efi/arm/arm64: Allow SetVirtualAddressMap() to be omitted efi: Replace GPL license boilerplate with SPDX headers efi/fdt: Apply more cleanups efi: Use 32-bit alignment for efi_guid_t efi/memattr: Don't bail on zero VA if it equals the region's PA x86/efi: Mark can_free_region() as an __init function
Diffstat (limited to 'arch/Kconfig')
-rw-r--r--arch/Kconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/Kconfig b/arch/Kconfig
index cd5f443865ec..3aff508ffd86 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -895,6 +895,9 @@ config HAVE_ARCH_PREL32_RELOCATIONS
architectures, and don't require runtime relocation on relocatable
kernels.
+config ARCH_USE_MEMREMAP_PROT
+ bool
+
source "kernel/gcov/Kconfig"
source "scripts/gcc-plugins/Kconfig"