aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--block/Makefile1
-rw-r--r--block/bfq-iosched.c2
-rw-r--r--include/linux/cgroup_subsys.h6
3 files changed, 8 insertions, 1 deletions
diff --git a/block/Makefile b/block/Makefile
index aee799cb4..65d39cbed 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -17,6 +17,7 @@ obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o
obj-$(CONFIG_IOSCHED_SIO) += sio-iosched.o
obj-$(CONFIG_IOSCHED_ROW) += row-iosched.o
obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o
+obj-$(CONFIG_IOSCHED_BFQ) += bfq-iosched.o
obj-$(CONFIG_IOSCHED_ZEN) += zen-iosched.o
obj-$(CONFIG_IOSCHED_SIOPLUS) += sioplus-iosched.o
obj-$(CONFIG_IOSCHED_FIOPS) += fiops-iosched.o
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c
index b1a10b779..c6b849bab 100644
--- a/block/bfq-iosched.c
+++ b/block/bfq-iosched.c
@@ -80,7 +80,7 @@ static const int bfq_back_max = 16 * 1024;
static const int bfq_back_penalty = 2;
/* Idling period duration, in jiffies. */
-static int bfq_slice_idle = 0;
+static int bfq_slice_idle = HZ / 125;
/* Default maximum budget values, in sectors and number of requests. */
static const int bfq_default_max_budget = 16 * 1024;
diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h
index 6e7ec64b6..e5e6b0dd4 100644
--- a/include/linux/cgroup_subsys.h
+++ b/include/linux/cgroup_subsys.h
@@ -84,3 +84,9 @@ SUBSYS(bcache)
#endif
/* */
+
+#if IS_SUBSYS_ENABLED(CONFIG_CGROUP_BFQIO)
+SUBSYS(bfqio)
+#endif
+
+/* */