From: Peter Xu Subject: mm/uffd: hide PTE_MARKER option The PTE_MARKER option should not need to be exposed to the kernel builder, keep it internal and remove the prompt so it won't be seen. Instead, make the PTE_MARKER_UFFD_WP option to explicitly choose PTE_MARKER when necessary. While PTE_MARKER_UFFD_WP will still prompt to user, change the wording so that it'll not mention PTE_MARKER at all but renaming it to "Userfaultfd write protection support for shmem/hugetlbfs". Link: https://lkml.kernel.org/r/20220419202531.27415-1-peterx@redhat.com Signed-off-by: Peter Xu Reported-by: Johannes Weiner Acked-by: Johannes Weiner Signed-off-by: Andrew Morton --- mm/Kconfig | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/mm/Kconfig~mm-enable-pte-markers-by-default-fix +++ a/mm/Kconfig @@ -910,16 +910,16 @@ config ANON_VMA_NAME difference in their name. config PTE_MARKER - bool "Marker PTEs support" - default y + bool help Allows to create marker PTEs for file-backed memory. config PTE_MARKER_UFFD_WP - bool "Marker PTEs support for userfaultfd write protection" + bool "Userfaultfd write protection support for shmem/hugetlbfs" default y - depends on PTE_MARKER && HAVE_ARCH_USERFAULTFD_WP + depends on HAVE_ARCH_USERFAULTFD_WP + select PTE_MARKER help Allows to create marker PTEs for userfaultfd write protection _