Merge tag 'xfs-for-linus-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 3c74b549ea9a3bbb5e3962a7d202cb8079cb1f63..8b680a5cb25b23f0511d917546d107c658c927e4 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -155,6 +155,9 @@ config X86
        select VIRT_TO_BUS
        select X86_DEV_DMA_OPS                  if X86_64
        select X86_FEATURE_NAMES                if PROC_FS
+       select HAVE_STACK_VALIDATION            if X86_64
+       select ARCH_USES_HIGH_VMA_FLAGS         if X86_INTEL_MEMORY_PROTECTION_KEYS
+       select ARCH_HAS_PKEYS                   if X86_INTEL_MEMORY_PROTECTION_KEYS
 
 config INSTRUCTION_DECODER
        def_bool y
@@ -1718,6 +1721,20 @@ config X86_INTEL_MPX
 
          If unsure, say N.
 
+config X86_INTEL_MEMORY_PROTECTION_KEYS
+       prompt "Intel Memory Protection Keys"
+       def_bool y
+       # Note: only available in 64-bit mode
+       depends on CPU_SUP_INTEL && X86_64
+       ---help---
+         Memory Protection Keys provides a mechanism for enforcing
+         page-based protections, but without requiring modification of the
+         page tables when an application changes protection domains.
+
+         For details, see Documentation/x86/protection-keys.txt
+
+         If unsure, say y.
+
 config EFI
        bool "EFI runtime service support"
        depends on ACPI