summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorLi Zefan <lizf@cn.fujitsu.com>2010-03-16 08:57:15 +0100
committerJens Axboe <jens.axboe@oracle.com>2010-03-16 08:57:15 +0100
commit910ac735bad53ce54741a72a5b19ab69794ae069 (patch)
treeec5ae540280af53066142963695666a22a7e605f /block
parent97fedbbe1046b3118f49df249840ca21041eefe4 (diff)
downloadlinux-3.10-910ac735bad53ce54741a72a5b19ab69794ae069.tar.gz
linux-3.10-910ac735bad53ce54741a72a5b19ab69794ae069.tar.bz2
linux-3.10-910ac735bad53ce54741a72a5b19ab69794ae069.zip
block: make CONFIG_BLK_CGROUP visible
Make the config visible, so we can choose from CONFIG_BLK_CGROUP=y and CONFIG_BLK_CGROUP=m when CONFIG_IOSCHED_CFQ=m. Signed-off-by: Li Zefan <lizf@cn.fujitsu.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block')
-rw-r--r--block/Kconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/block/Kconfig b/block/Kconfig
index e20fbde0875..f9e89f4d94b 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -78,8 +78,9 @@ config BLK_DEV_INTEGRITY
Protection. If in doubt, say N.
config BLK_CGROUP
- bool
+ tristate "Block cgroup support"
depends on CGROUPS
+ depends on CFQ_GROUP_IOSCHED
default n
---help---
Generic block IO controller cgroup interface. This is the common