Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52c8e601 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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: default avatarLinus 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: default avatarIngo Molnar <mingo@kernel.org>
parent d94e0685

arch/x86/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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