blkio: Core implementation of throttle policy

[linux-drm-fsl-dcu.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index cb64c5889e028948db25fb08df5f9383eae8b32f..950ba26f723398ec227ed83f1c75347863dbe67f 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -320,13 +320,17 @@ config AUDITSYSCALL
        help
          Enable low-overhead system-call auditing infrastructure that
          can be used independently or with another kernel subsystem,
-         such as SELinux.  To use audit's filesystem watch feature, please
-         ensure that INOTIFY is configured.
+         such as SELinux.
+
+config AUDIT_WATCH
+       def_bool y
+       depends on AUDITSYSCALL
+       select FSNOTIFY
 
 config AUDIT_TREE
        def_bool y
        depends on AUDITSYSCALL
-       select INOTIFY
+       select FSNOTIFY
 
 menu "RCU Subsystem"
 
@@ -573,8 +577,8 @@ config CGROUP_MEM_RES_CTLR
          could in turn add some fork/exit overhead.
 
 config CGROUP_MEM_RES_CTLR_SWAP
-       bool "Memory Resource Controller Swap Extension(EXPERIMENTAL)"
-       depends on CGROUP_MEM_RES_CTLR && SWAP && EXPERIMENTAL
+       bool "Memory Resource Controller Swap Extension"
+       depends on CGROUP_MEM_RES_CTLR && SWAP
        help
          Add swap management feature to memory resource controller. When you
          enable this, you can limit mem+swap usage per cgroup. In other words,
@@ -630,11 +634,14 @@ config BLK_CGROUP
 
        Currently, CFQ IO scheduler uses it to recognize task groups and
        control disk bandwidth allocation (proportional time slice allocation)
-       to such task groups.
+       to such task groups. It is also used by bio throttling logic in
+       block layer to implement upper limit in IO rates on a device.
 
        This option only enables generic Block IO controller infrastructure.
-       One needs to also enable actual IO controlling logic in CFQ for it
-       to take effect. (CONFIG_CFQ_GROUP_IOSCHED=y).
+       One needs to also enable actual IO controlling logic/policy. For
+       enabling proportional weight division of disk bandwidth in CFQ seti
+       CONFIG_CFQ_GROUP_IOSCHED=y and for enabling throttling policy set
+       CONFIG_BLK_THROTTLE=y.
 
        See Documentation/cgroups/blkio-controller.txt for more information.