summaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2012-03-05 13:14:54 -0800
committerJens Axboe <axboe@kernel.dk>2012-03-06 21:27:21 +0100
commit32e380aedc3de454c06ce1c254fe3bea35a676e1 (patch)
treeae48ced36af22f020451cb05ecca835ff561dc9d /init
parentb855b04a0b2213dbc1b59cf936056726e7ed97ad (diff)
downloadlinux-stable-32e380aedc3de454c06ce1c254fe3bea35a676e1.tar.gz
linux-stable-32e380aedc3de454c06ce1c254fe3bea35a676e1.tar.bz2
linux-stable-32e380aedc3de454c06ce1c254fe3bea35a676e1.zip
blkcg: make CONFIG_BLK_CGROUP bool
Block cgroup core can be built as module; however, it isn't too useful as blk-throttle can only be built-in and cfq-iosched is usually the default built-in scheduler. Scheduled blkcg cleanup requires calling into blkcg from block core. To simplify that, disallow building blkcg as module by making CONFIG_BLK_CGROUP bool. If building blkcg core as module really matters, which I doubt, we can revisit it after blkcg API cleanup. -v2: Vivek pointed out that IOSCHED_CFQ was incorrectly updated to depend on BLK_CGROUP. Fixed. Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Vivek Goyal <vgoyal@redhat.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 3f42cd66f0f8..da9222d5ae97 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -766,7 +766,7 @@ config RT_GROUP_SCHED
endif #CGROUP_SCHED
config BLK_CGROUP
- tristate "Block IO controller"
+ bool "Block IO controller"
depends on BLOCK
default n
---help---