X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=block%2FKconfig;h=6c9213ef15a1d69e83b381f88ce76d0d915eac02;hb=8abfc6e7a45eb74e51904bbae676fae008b11366;hp=f9e89f4d94bba17392f0416598d0ff7f27f92002;hpb=1c62c72b1a3c4478fb9069503d20c41b1f385ca1;p=karo-tx-linux.git

diff --git a/block/Kconfig b/block/Kconfig
index f9e89f4d94bb..6c9213ef15a1 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -77,28 +77,17 @@ config BLK_DEV_INTEGRITY
 	T10/SCSI Data Integrity Field or the T13/ATA External Path
 	Protection.  If in doubt, say N.
 
-config BLK_CGROUP
-	tristate "Block cgroup support"
-	depends on CGROUPS
-	depends on CFQ_GROUP_IOSCHED
+config BLK_DEV_THROTTLING
+	bool "Block layer bio throttling support"
+	depends on BLK_CGROUP=y && EXPERIMENTAL
 	default n
 	---help---
-	Generic block IO controller cgroup interface. This is the common
-	cgroup interface which should be used by various IO controlling
-	policies.
+	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.
 
-	Currently, CFQ IO scheduler uses it to recognize task groups and
-	control disk bandwidth allocation (proportional time slice allocation)
-	to such task groups.
-
-config DEBUG_BLK_CGROUP
-	bool
-	depends on BLK_CGROUP
-	default n
-	---help---
-	Enable some debugging help. Currently it stores the cgroup path
-	in the blk group which can be used by cfq for tracing various
-	group related activity.
+	See Documentation/cgroups/blkio-controller.txt for more information.
 
 endif # BLOCK