1 From 0287f0c5b8cc93150b60a27183475dd60d62e94e Mon Sep 17 00:00:00 2001
2 From: Arianna Avanzini <avanzini.arianna@gmail.com>
3 Date: Tue, 18 Oct 2011 21:23:04 +0200
4 Subject: [PATCH 2/3] block: cgroups, kconfig, build bits for BFQ-v3r1-3.1
6 Add a Kconfig option and do the related Makefile changes to compile
7 the BFQ I/O scheduler. Also let the cgroups subsystem know about the
10 Signed-off-by: Fabio Checconi <fabio@gandalf.sssup.it>
11 Signed-off-by: Paolo Valente <paolo.valente@unimore.it>
12 Signed-off-by: Arianna Avanzini <avanzini.arianna@gmail.com>
15 include/linux/cgroup_subsys.h | 6 ++++++
16 2 files changed, 7 insertions(+), 0 deletions(-)
18 diff --git a/block/Makefile b/block/Makefile
19 index 514c6e4..653d27b 100644
22 @@ -14,6 +14,7 @@ obj-$(CONFIG_BLK_DEV_THROTTLING) += blk-throttle.o
23 obj-$(CONFIG_IOSCHED_NOOP) += noop-iosched.o
24 obj-$(CONFIG_IOSCHED_DEADLINE) += deadline-iosched.o
25 obj-$(CONFIG_IOSCHED_CFQ) += cfq-iosched.o
26 +obj-$(CONFIG_IOSCHED_BFQ) += bfq-iosched.o
28 obj-$(CONFIG_BLOCK_COMPAT) += compat_ioctl.o
29 obj-$(CONFIG_BLK_DEV_INTEGRITY) += blk-integrity.o
30 diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h
31 index ac663c1..c966638 100644
32 --- a/include/linux/cgroup_subsys.h
33 +++ b/include/linux/cgroup_subsys.h
34 @@ -64,3 +64,9 @@ SUBSYS(perf)
39 +#ifdef CONFIG_CGROUP_BFQIO