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

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

diff --git a/init/Kconfig b/init/Kconfig
index 23a21ede2a40dd5ae9cfc2453efa4115f6545453..4592bf7997c000dc7a5537ca4c28b308713b9d65 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -398,6 +398,7 @@ config VIRT_CPU_ACCOUNTING_GEN
        bool "Full dynticks CPU time accounting"
        depends on HAVE_CONTEXT_TRACKING
        depends on HAVE_VIRT_CPU_ACCOUNTING_GEN
+       depends on GENERIC_CLOCKEVENTS
        select VIRT_CPU_ACCOUNTING
        select CONTEXT_TRACKING
        help
@@ -528,6 +529,17 @@ config PSI_DEFAULT_DISABLED
          per default but can be enabled through passing psi=1 on the
          kernel commandline during boot.
 
+         This feature adds some code to the task wakeup and sleep
+         paths of the scheduler. The overhead is too low to affect
+         common scheduling-intense workloads in practice (such as
+         webservers, memcache), but it does show up in artificial
+         scheduler stress tests, such as hackbench.
+
+         If you are paranoid and not sure what the kernel will be
+         used for, say Y.
+
+         Say N if unsure.
+
 endmenu # "CPU/Task time and stats accounting"
 
 config CPU_ISOLATION
@@ -841,7 +853,7 @@ config CGROUP_PIDS
          PIDs controller is designed to stop this from happening.
 
          It should be noted that organisational operations (such as attaching
-         to a cgroup hierarchy will *not* be blocked by the PIDs controller),
+         to a cgroup hierarchy) will *not* be blocked by the PIDs controller,
          since the PIDs limit only affects a process's ability to fork, not to
          attach to a cgroup.
 
@@ -1420,6 +1432,15 @@ config AIO
          by some high performance threaded applications. Disabling
          this option saves about 7k.
 
+config IO_URING
+       bool "Enable IO uring support" if EXPERT
+       select ANON_INODES
+       default y
+       help
+         This option enables support for the io_uring interface, enabling
+         applications to submit and complete IO through submission and
+         completion rings that are shared between the kernel and application.
+
 config ADVISE_SYSCALLS
        bool "Enable madvise/fadvise syscalls" if EXPERT
        default y