Merge tag 'modules-for-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu...

[linux-2.6-microblaze.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index b77c60f..8a2c0e4 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
@@ -2262,25 +2272,8 @@ config MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS
 
          If unsure, say N.
 
-config UNUSED_SYMBOLS
-       bool "Enable unused/obsolete exported symbols"
-       default y if X86
-       help
-         Unused but exported symbols make the kernel needlessly bigger.  For
-         that reason most of these unused exports will soon be removed.  This
-         option is provided temporarily to provide a transition period in case
-         some external kernel module needs one of these symbols anyway. If you
-         encounter such a case in your module, consider if you are actually
-         using the right API.  (rationale: since nobody in the kernel is using
-         this in a module, there is a pretty good chance it's actually the
-         wrong interface to use).  If you really need the symbol, please send a
-         mail to the linux kernel mailing list mentioning the symbol and why
-         you really need it, and what the merge plan to the mainline kernel for
-         your module is.
-
 config TRIM_UNUSED_KSYMS
        bool "Trim unused exported kernel symbols"
-       depends on !UNUSED_SYMBOLS
        help
          The kernel and some modules make many symbols available for
          other modules to use via EXPORT_SYMBOL() and variants. Depending
@@ -2297,6 +2290,7 @@ config TRIM_UNUSED_KSYMS
 config UNUSED_KSYMS_WHITELIST
        string "Whitelist of symbols to keep in ksymtab"
        depends on TRIM_UNUSED_KSYMS
+       default "scripts/lto-used-symbollist.txt" if LTO_CLANG
        help
          By default, all unused exported symbols will be un-exported from the
          build when TRIM_UNUSED_KSYMS is selected.