init/Kconfig: move more items into the EXPERT menu

KCMP, RSEQ, CACHESTAT_SYSCALL, and PC104 depend on EXPERT but not shown in
the EXPERT menu.  Move some lines around so that they are displayed in the
EXPERT menu.

Drop one useless comment.

Change "enabled" to "enable" for DEBUG_RSEQ.

Link: https://lkml.kernel.org/r/20231208045819.2922-1-rdunlap@infradead.org
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Reviewed-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: "Paul E. McKenney" <paulmck@kernel.org>
Cc: Boqun Feng <boqun.feng@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/init/Kconfig b/init/Kconfig
index 9ffb103fc927bc283cd1ee4d0b745f902d6995dc..8df18f3a974846b48e41b2a8dcbc2f2f2f90128e 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1676,6 +1676,56 @@ config MEMBARRIER
 
          If unsure, say Y.
 
+config KCMP
+       bool "Enable kcmp() system call" if EXPERT
+       help
+         Enable the kernel resource comparison system call. It provides
+         user-space with the ability to compare two processes to see if they
+         share a common resource, such as a file descriptor or even virtual
+         memory space.
+
+         If unsure, say N.
+
+config RSEQ
+       bool "Enable rseq() system call" if EXPERT
+       default y
+       depends on HAVE_RSEQ
+       select MEMBARRIER
+       help
+         Enable the restartable sequences system call. It provides a
+         user-space cache for the current CPU number value, which
+         speeds up getting the current CPU number from user-space,
+         as well as an ABI to speed up user-space operations on
+         per-CPU data.
+
+         If unsure, say Y.
+
+config DEBUG_RSEQ
+       default n
+       bool "Enable debugging of rseq() system call" if EXPERT
+       depends on RSEQ && DEBUG_KERNEL
+       help
+         Enable extra debugging checks for the rseq system call.
+
+         If unsure, say N.
+
+config CACHESTAT_SYSCALL
+       bool "Enable cachestat() system call" if EXPERT
+       default y
+       help
+         Enable the cachestat system call, which queries the page cache
+         statistics of a file (number of cached pages, dirty pages,
+         pages marked for writeback, (recently) evicted pages).
+
+         If unsure say Y here.
+
+config PC104
+       bool "PC/104 support" if EXPERT
+       help
+         Expose PC/104 form factor device drivers and options available for
+         selection and configuration. Enable this option if your target
+         machine has a PC/104 bus.
+
 config KALLSYMS
        bool "Load all symbols for debugging/ksymoops" if EXPERT
        default y
@@ -1740,57 +1790,12 @@ config KALLSYMS_BASE_RELATIVE
 
 # end of the "standard kernel features (expert users)" menu
 
-# syscall, maps, verifier
-
 config ARCH_HAS_MEMBARRIER_CALLBACKS
        bool
 
 config ARCH_HAS_MEMBARRIER_SYNC_CORE
        bool
 
-config KCMP
-       bool "Enable kcmp() system call" if EXPERT
-       help
-         Enable the kernel resource comparison system call. It provides
-         user-space with the ability to compare two processes to see if they
-         share a common resource, such as a file descriptor or even virtual
-         memory space.
-
-         If unsure, say N.
-
-config RSEQ
-       bool "Enable rseq() system call" if EXPERT
-       default y
-       depends on HAVE_RSEQ
-       select MEMBARRIER
-       help
-         Enable the restartable sequences system call. It provides a
-         user-space cache for the current CPU number value, which
-         speeds up getting the current CPU number from user-space,
-         as well as an ABI to speed up user-space operations on
-         per-CPU data.
-
-         If unsure, say Y.
-
-config CACHESTAT_SYSCALL
-       bool "Enable cachestat() system call" if EXPERT
-       default y
-       help
-         Enable the cachestat system call, which queries the page cache
-         statistics of a file (number of cached pages, dirty pages,
-         pages marked for writeback, (recently) evicted pages).
-
-         If unsure say Y here.
-
-config DEBUG_RSEQ
-       default n
-       bool "Enabled debugging of rseq() system call" if EXPERT
-       depends on RSEQ && DEBUG_KERNEL
-       help
-         Enable extra debugging checks for the rseq system call.
-
-         If unsure, say N.
-
 config HAVE_PERF_EVENTS
        bool
        help
@@ -1805,13 +1810,6 @@ config PERF_USE_VMALLOC
        help
          See tools/perf/design.txt for details
 
-config PC104
-       bool "PC/104 support" if EXPERT
-       help
-         Expose PC/104 form factor device drivers and options available for
-         selection and configuration. Enable this option if your target
-         machine has a PC/104 bus.
-
 menu "Kernel Performance Events And Counters"
 
 config PERF_EVENTS