1 files changed, 27 insertions, 0 deletions

diff --git a/init/Kconfig b/init/Kconfig
index eb77e8ccde1c..087c14f3c595 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -612,6 +612,33 @@ config RT_GROUP_SCHED
 
 endif #CGROUP_SCHED
 
+config BLK_CGROUP
+        tristate "Block IO controller"
+        depends on CGROUPS && BLOCK
+        default n
+        ---help---
+        Generic block IO controller cgroup interface. This is the common
+        cgroup interface which should be used by various IO controlling
+        policies.
+
+        Currently, CFQ IO scheduler uses it to recognize task groups and
+        control disk bandwidth allocation (proportional time slice allocation)
+        to such task groups.
+
+        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).
+
+        See Documentation/cgroups/blkio-controller.txt for more information.
+
+config DEBUG_BLK_CGROUP
+        bool "Enable Block IO controller debugging"
+        depends on BLK_CGROUP
+        default n
+        ---help---
+        Enable some debugging help. Currently it exports additional stat
+        files in a cgroup which can be useful for debugging.
+
 endif # CGROUPS
 
 config MM_OWNER