summaryrefslogtreecommitdiffstats
path: root/block/Makefile
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2021-08-11 07:41:45 -1000
committerJens Axboe <axboe@kernel.dk>2021-08-11 13:47:26 -0600
commit0f78399551146bfbed357759e2ad5abb8d39e50a (patch)
tree35c04358d12cd454ec16af98ac5c0a7df951cd29 /block/Makefile
parent11431e26c9c43fa26f6b33ee1a90989f57b86024 (diff)
downloadlinux-stable-0f78399551146bfbed357759e2ad5abb8d39e50a.tar.gz
linux-stable-0f78399551146bfbed357759e2ad5abb8d39e50a.tar.bz2
linux-stable-0f78399551146bfbed357759e2ad5abb8d39e50a.zip
Revert "block/mq-deadline: Add cgroup support"
This reverts commit 08a9ad8bf607 ("block/mq-deadline: Add cgroup support") and a follow-up commit c06bc5a3fb42 ("block/mq-deadline: Remove a WARN_ON_ONCE() call"). The added cgroup support has the following issues: * It breaks cgroup interface file format rule by adding custom elements to a nested key-value file. * It registers mq-deadline as a cgroup-aware policy even though all it's doing is collecting per-cgroup stats. Even if we need these stats, this isn't the right way to add them. * It hasn't been reviewed from cgroup side. Cc: Bart Van Assche <bvanassche@acm.org> Cc: Jens Axboe <axboe@kernel.dk> Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/Makefile')
-rw-r--r--block/Makefile2
1 files changed, 0 insertions, 2 deletions
diff --git a/block/Makefile b/block/Makefile
index bfbe4e13ca1e..1e1afa10f869 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -22,8 +22,6 @@ obj-$(CONFIG_BLK_CGROUP_IOPRIO) += blk-ioprio.o
obj-$(CONFIG_BLK_CGROUP_IOLATENCY) += blk-iolatency.o
obj-$(CONFIG_BLK_CGROUP_IOCOST) += blk-iocost.o
obj-$(CONFIG_MQ_IOSCHED_DEADLINE) += mq-deadline.o
-mq-deadline-y += mq-deadline-main.o
-mq-deadline-$(CONFIG_MQ_IOSCHED_DEADLINE_CGROUP)+= mq-deadline-cgroup.o
obj-$(CONFIG_MQ_IOSCHED_KYBER) += kyber-iosched.o
bfq-y := bfq-iosched.o bfq-wf2q.o bfq-cgroup.o
obj-$(CONFIG_IOSCHED_BFQ) += bfq.o