summaryrefslogtreecommitdiff
path: root/include/linux/cgroup_subsys.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2015-01-06 20:02:46 +0300
committerTejun Heo <tj@kernel.org>2015-01-06 20:02:46 +0300
commit24dab7a7b3534ef40ecec20cfd7fb3ad99d9ff33 (patch)
tree1cb24d861d17ebfc5c614d8915ce1a9781379f9c /include/linux/cgroup_subsys.h
parentf595f76defe2b03c45231b9b7f8689be3d26d940 (diff)
downloadlinux-24dab7a7b3534ef40ecec20cfd7fb3ad99d9ff33.tar.xz
cgroup: reorder SUBSYS(blkio) in cgroup_subsys.h
The scheduled cgroup writeback support requires blkio to be initialized before memcg as memcg needs to provide certain blkcg related functionalities. Relocate blkio so that it's right above memory. Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include/linux/cgroup_subsys.h')
-rw-r--r--include/linux/cgroup_subsys.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/cgroup_subsys.h b/include/linux/cgroup_subsys.h
index 98c4f9b12b03..e4a96fb14403 100644
--- a/include/linux/cgroup_subsys.h
+++ b/include/linux/cgroup_subsys.h
@@ -15,6 +15,10 @@ SUBSYS(cpu)
SUBSYS(cpuacct)
#endif
+#if IS_ENABLED(CONFIG_BLK_CGROUP)
+SUBSYS(blkio)
+#endif
+
#if IS_ENABLED(CONFIG_MEMCG)
SUBSYS(memory)
#endif
@@ -31,10 +35,6 @@ SUBSYS(freezer)
SUBSYS(net_cls)
#endif
-#if IS_ENABLED(CONFIG_BLK_CGROUP)
-SUBSYS(blkio)
-#endif
-
#if IS_ENABLED(CONFIG_CGROUP_PERF)
SUBSYS(perf_event)
#endif