Merge tag 'v2.6.37' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / block / Kconfig

diff --git a/block/Kconfig b/block/Kconfig
index 9be0b56eaee19ee494d388f07cda821ffcc29ba0..6c9213ef15a1d69e83b381f88ce76d0d915eac02 100644 (file)
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -77,6 +77,18 @@ config BLK_DEV_INTEGRITY
        T10/SCSI Data Integrity Field or the T13/ATA External Path
        Protection.  If in doubt, say N.
 
+config BLK_DEV_THROTTLING
+       bool "Block layer bio throttling support"
+       depends on BLK_CGROUP=y && EXPERIMENTAL
+       default n
+       ---help---
+       Block layer bio throttling support. It can be used to limit
+       the IO rate to a device. IO rate policies are per cgroup and
+       one needs to mount and use blkio cgroup controller for creating
+       cgroups and specifying per device IO rate policies.
+
+       See Documentation/cgroups/blkio-controller.txt for more information.
+
 endif # BLOCK
 
 config BLOCK_COMPAT