Merge tag 'kbuild-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy...

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

diff --git a/init/Kconfig b/init/Kconfig
index c2339da..d97d205 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1122,6 +1122,20 @@ config CGROUP_BPF
          BPF_CGROUP_INET_INGRESS will be executed on the ingress path of
          inet sockets.
 
+config CGROUP_MISC
+       bool "Misc resource controller"
+       default n
+       help
+         Provides a controller for miscellaneous resources on a host.
+
+         Miscellaneous scalar resources are the resources on the host system
+         which cannot be abstracted like the other cgroups. This controller
+         tracks and limits the miscellaneous resources used by a process
+         attached to a cgroup hierarchy.
+
+         For more information, please check misc cgroup section in
+         /Documentation/admin-guide/cgroup-v2.rst.
+
 config CGROUP_DEBUG
        bool "Debug controller"
        default n
@@ -1720,6 +1734,8 @@ config BPF_SYSCALL
        select BPF
        select IRQ_WORK
        select TASKS_TRACE_RCU
+       select BINARY_PRINTF
+       select NET_SOCK_MSG if INET
        default n
        help
          Enable the bpf() system call that allows to manipulate eBPF
@@ -2321,7 +2337,7 @@ endif # MODULES
 
 config MODULES_TREE_LOOKUP
        def_bool y
-       depends on PERF_EVENTS || TRACING
+       depends on PERF_EVENTS || TRACING || CFI_CLANG
 
 config INIT_ALL_POSSIBLE
        bool