diff options
| author | Tejun Heo <tj@kernel.org> | 2015-09-18 11:56:28 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2015-09-18 11:56:28 -0400 |
| commit | fc5ed1e95410ad73b2ab8f33cd90eb3bcf6c98a1 (patch) | |
| tree | 796ae052c16ea4a381df3e7c12982b4eeefd5e54 /include/linux/memcontrol.h | |
| parent | 49d1dc4b81797f88270832b11e9f73809e7e7209 (diff) | |
| download | blackbird-op-linux-fc5ed1e95410ad73b2ab8f33cd90eb3bcf6c98a1.tar.gz blackbird-op-linux-fc5ed1e95410ad73b2ab8f33cd90eb3bcf6c98a1.zip | |
cgroup: replace cgroup_subsys->disabled tests with cgroup_subsys_enabled()
Replace cgroup_subsys->disabled tests in controllers with
cgroup_subsys_enabled(). cgroup_subsys_enabled() requires literal
subsys name as its parameter and thus can't be used for cgroup core
which iterates through controllers. For cgroup core, introduce and
use cgroup_ssid_enabled() which uses slower static_key_enabled() test
and can be indexed by subsys ID.
This leaves cgroup_subsys->disabled unused. Removed.
Signed-off-by: Tejun Heo <tj@kernel.org>
Acked-by: Zefan Li <lizefan@huawei.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Michal Hocko <mhocko@kernel.org>
Diffstat (limited to 'include/linux/memcontrol.h')
| -rw-r--r-- | include/linux/memcontrol.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index ad800e62cb7a..9aa7820c2177 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -347,9 +347,7 @@ ino_t page_cgroup_ino(struct page *page); static inline bool mem_cgroup_disabled(void) { - if (memory_cgrp_subsys.disabled) - return true; - return false; + return !cgroup_subsys_enabled(memory_cgrp_subsys); } /* |
