Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index c9386a365eea2ce71642cbf973105ee30f4cc6f6..811641cc81e8dfb5f070d44dab7d9451bbbfc38e 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -382,6 +382,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
@@ -1414,6 +1415,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