Merge tag 'bootconfig-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace...

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

diff --git a/init/Kconfig b/init/Kconfig
index 53bb993..8a27575 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1045,6 +1045,10 @@ config RT_GROUP_SCHED
 
 endif #CGROUP_SCHED
 
+config SCHED_MM_CID
+       def_bool y
+       depends on SMP && RSEQ
+
 config UCLAMP_TASK_GROUP
        bool "Utilization clamping per group of tasks"
        depends on CGROUP_SCHED
@@ -1882,7 +1886,6 @@ config PERF_EVENTS
        default y if PROFILING
        depends on HAVE_PERF_EVENTS
        select IRQ_WORK
-       select SRCU
        help
          Enable kernel support for various performance events provided
          by software and hardware.
@@ -1952,7 +1955,7 @@ config RUST
        depends on !MODVERSIONS
        depends on !GCC_PLUGINS
        depends on !RANDSTRUCT
-       depends on !DEBUG_INFO_BTF
+       depends on !DEBUG_INFO_BTF || PAHOLE_HAS_LANG_EXCLUDE
        select CONSTRUCTORS
        help
          Enables Rust support in the kernel.