From: Li Zefan <lizf@cn.fujitsu.com>
Date: Tue, 16 Mar 2010 07:57:15 +0000 (+0100)
Subject: block: make CONFIG_BLK_CGROUP visible
X-Git-Tag: v2.6.34-rc4~11^2~13
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=910ac735bad53ce54741a72a5b19ab69794ae069;p=~shefty%2Frdma-dev.git

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>
---

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