diff options
author | Tejun Heo <tj@kernel.org> | 2015-01-06 12:02:46 -0500 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2015-01-06 12:02:46 -0500 |
commit | 24dab7a7b3534ef40ecec20cfd7fb3ad99d9ff33 (patch) | |
tree | 1cb24d861d17ebfc5c614d8915ce1a9781379f9c | |
parent | f595f76defe2b03c45231b9b7f8689be3d26d940 (diff) |
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>
-rw-r--r-- | include/linux/cgroup_subsys.h | 8 |
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) | |||
15 | SUBSYS(cpuacct) | 15 | SUBSYS(cpuacct) |
16 | #endif | 16 | #endif |
17 | 17 | ||
18 | #if IS_ENABLED(CONFIG_BLK_CGROUP) | ||
19 | SUBSYS(blkio) | ||
20 | #endif | ||
21 | |||
18 | #if IS_ENABLED(CONFIG_MEMCG) | 22 | #if IS_ENABLED(CONFIG_MEMCG) |
19 | SUBSYS(memory) | 23 | SUBSYS(memory) |
20 | #endif | 24 | #endif |
@@ -31,10 +35,6 @@ SUBSYS(freezer) | |||
31 | SUBSYS(net_cls) | 35 | SUBSYS(net_cls) |
32 | #endif | 36 | #endif |
33 | 37 | ||
34 | #if IS_ENABLED(CONFIG_BLK_CGROUP) | ||
35 | SUBSYS(blkio) | ||
36 | #endif | ||
37 | |||
38 | #if IS_ENABLED(CONFIG_CGROUP_PERF) | 38 | #if IS_ENABLED(CONFIG_CGROUP_PERF) |
39 | SUBSYS(perf_event) | 39 | SUBSYS(perf_event) |
40 | #endif | 40 | #endif |