X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=block%2FKconfig.iosched;h=3199b76f795de33f9db31e140aad75a716a51d44;hb=9bad145ee2ef43ac36d397190a7d8b1a7306d3fb;hp=baad3dae3655ac201e0661641c66ba968e324fe7;hpb=492af6350a5ccf087e4964104a276ed358811458;p=safe%2Fjmp%2Flinux-2.6

diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
index baad3da..3199b76 100644
--- a/block/Kconfig.iosched
+++ b/block/Kconfig.iosched
@@ -23,13 +23,26 @@ config IOSCHED_DEADLINE
 
 config IOSCHED_CFQ
 	tristate "CFQ I/O scheduler"
+	# If BLK_CGROUP is a module, CFQ has to be built as module.
+	depends on (BLK_CGROUP=m && m) || !BLK_CGROUP || BLK_CGROUP=y
 	default y
 	---help---
 	  The CFQ I/O scheduler tries to distribute bandwidth equally
 	  among all processes in the system. It should provide a fair
-	  working environment, suitable for desktop systems.
+	  and low latency working environment, suitable for both desktop
+	  and server systems.
+
 	  This is the default I/O scheduler.
 
+	  Note: If BLK_CGROUP=m, then CFQ can be built only as module.
+
+config CFQ_GROUP_IOSCHED
+	bool "CFQ Group Scheduling support"
+	depends on IOSCHED_CFQ && BLK_CGROUP
+	default n
+	---help---
+	  Enable group IO scheduling in CFQ.
+
 choice
 	prompt "Default I/O scheduler"
 	default DEFAULT_CFQ