netns xfrm: fix "ip xfrm state|policy count" misreport

[safe/jmp/linux-2.6] / block / Kconfig.iosched

diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
index baad3da..b71abfb 100644 (file)
--- a/block/Kconfig.iosched
+++ b/block/Kconfig.iosched
@@ -27,9 +27,28 @@ config IOSCHED_CFQ
        ---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.
 
+config CFQ_GROUP_IOSCHED
+       bool "CFQ Group Scheduling support"
+       depends on IOSCHED_CFQ && CGROUPS
+       select BLK_CGROUP
+       default n
+       ---help---
+         Enable group IO scheduling in CFQ.
+
+config DEBUG_CFQ_IOSCHED
+       bool "Debug CFQ Scheduling"
+       depends on CFQ_GROUP_IOSCHED
+       select DEBUG_BLK_CGROUP
+       default n
+       ---help---
+         Enable CFQ IO scheduling debugging in CFQ. Currently it makes
+         blktrace output more verbose.
+
 choice
        prompt "Default I/O scheduler"
        default DEFAULT_CFQ