Merge tag 'x86_shstk_for_6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[thirdparty/linux.git] / arch / Kconfig

diff --git a/arch/Kconfig b/arch/Kconfig
index ec49c01005507d4c326db69d49a320585778aac1..12d51495caec181de91b5c362e8334bd8989598a 100644 (file)
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -931,6 +931,14 @@ config HAVE_ARCH_HUGE_VMALLOC
 config ARCH_WANT_HUGE_PMD_SHARE
        bool
 
+# Archs that want to use pmd_mkwrite on kernel memory need it defined even
+# if there are no userspace memory management features that use it
+config ARCH_WANT_KERNEL_PMD_MKWRITE
+       bool
+
+config ARCH_WANT_PMD_MKWRITE
+       def_bool TRANSPARENT_HUGEPAGE || ARCH_WANT_KERNEL_PMD_MKWRITE
+
 config HAVE_ARCH_SOFT_DIRTY
        bool