From: Jens Axboe <jens.axboe@oracle.com>
Date: Fri, 4 Dec 2009 09:07:38 +0000 (+0100)
Subject: io controller: quick fix for blk-cgroup and modular CFQ
X-Git-Tag: v3.12-rc1~12150^2~9
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=237e5bc4e51813e9d8ba9da0f63e7acc608882d7;p=kernel%2Fkernel-generic.git

io controller: quick fix for blk-cgroup and modular CFQ

It's currently not an allowed configuration, so express that in Kconfig.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
---

diff --git a/block/Kconfig.iosched b/block/Kconfig.iosched
index b71abfb..5368d74 100644
--- a/block/Kconfig.iosched
+++ b/block/Kconfig.iosched
@@ -34,7 +34,7 @@ config IOSCHED_CFQ
 
 config CFQ_GROUP_IOSCHED
 	bool "CFQ Group Scheduling support"
-	depends on IOSCHED_CFQ && CGROUPS
+	depends on IOSCHED_CFQ=y && CGROUPS
 	select BLK_CGROUP
 	default n
 	---help---