Merge tag 'clang-lto-v5.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/kernel/linux-starfive.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 5271138..57f859e 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -76,7 +76,6 @@ config CC_HAS_ASM_INLINE
 
 config CONSTRUCTORS
        bool
-       depends on !UML
 
 config IRQ_WORK
        bool
@@ -525,7 +524,7 @@ config SCHED_THERMAL_PRESSURE
          i.e. put less load on throttled CPUs than on non/less throttled ones.
 
          This requires the architecture to implement
-         arch_set_thermal_pressure() and arch_get_thermal_pressure().
+         arch_set_thermal_pressure() and arch_scale_thermal_pressure().
 
 config BSD_PROCESS_ACCT
        bool "BSD Process Accounting"
@@ -1194,6 +1193,7 @@ endif # NAMESPACES
 config CHECKPOINT_RESTORE
        bool "Checkpoint/restore support"
        select PROC_CHILDREN
+       select KCMP
        default n
        help
          Enables additional kernel features in a sake of checkpoint/restore.
@@ -1737,6 +1737,16 @@ config ARCH_HAS_MEMBARRIER_CALLBACKS
 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
@@ -2024,7 +2034,7 @@ config PROFILING
        bool "Profiling support"
        help
          Say Y here to enable the extended profiling support mechanisms used
-         by profilers such as OProfile.
+         by profilers.
 
 #
 # Place an empty function call at each tracepoint site. Can be