Merge branch 'akpm-current/current'

[karo-tx-linux.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index e17c7aaffc671959e4cf3db382c73049caecee22..651ec15ecddbd76f1fb46839691330e4f579c1b7 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1599,6 +1599,19 @@ config AIO
          by some high performance threaded applications. Disabling
          this option saves about 7k.
 
+config AIO_THREAD
+       bool "Support kernel thread based AIO" if EXPERT
+       depends on AIO
+       default y
+       help
+          This option enables using kernel thread based AIO which implements
+          asynchronous operations using the kernel's queue_work() mechanism.
+          The automatic use of threads for async operations is currently
+          disabled by default until the security implications for usage
+          are completely understood.  This functionality can be enabled at
+          runtime if this option is enabled by setting the fs.aio-auto-threads
+          to one.
+
 config ADVISE_SYSCALLS
        bool "Enable madvise/fadvise syscalls" if EXPERT
        default y