diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-11-15 10:15:03 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-11-15 10:34:08 +0100 |
| commit | 52c8e6017c764dcae33cc5c65c1fd37084b04b30 (patch) | |
| tree | 7e1d1ad09e06bdd8d1587bf8549e299997557fcd /arch/x86/Kconfig | |
| parent | d94e068573f2cf9aa92759f37829c5e5259e5cf1 (diff) | |
| download | talos-op-linux-52c8e6017c764dcae33cc5c65c1fd37084b04b30.tar.gz talos-op-linux-52c8e6017c764dcae33cc5c65c1fd37084b04b30.zip | |
x86/kconfig, x86/pkeys: Move pkeys selects to X86_INTEL_MEMORY_PROTECTION_KEYS
Move the pkeys selects from the generic x86 config section to
the X86_INTEL_MEMORY_PROTECTION_KEYS section.
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 8feebec902ee..efd35b1b6806 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -170,8 +170,6 @@ config X86 select VIRT_TO_BUS 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 @@ -1744,6 +1742,8 @@ config X86_INTEL_MEMORY_PROTECTION_KEYS def_bool y # Note: only available in 64-bit mode depends on CPU_SUP_INTEL && X86_64 + select ARCH_USES_HIGH_VMA_FLAGS + select ARCH_HAS_PKEYS ---help--- Memory Protection Keys provides a mechanism for enforcing page-based protections, but without requiring modification of the |
