summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorVladimir Davydov <vdavydov@parallels.com>2014-12-12 16:54:50 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-13 12:42:46 -0800
commitbfda7e8fe428ff4a42653d7b117d4598fc446cda (patch)
tree1509b6b4aaa4f832502341226392d06c8513c1f5 /mm
parentb5be83e308f70e16c63c4e520ea7bb03ef57c46f (diff)
memcg: __mem_cgroup_free: remove stale disarm_static_keys comment
cpuset code stopped using cgroup_lock in favor of cpuset_mutex long ago. Signed-off-by: Vladimir Davydov <vdavydov@parallels.com> Cc: Johannes Weiner <hannes@cmpxchg.org> Cc: Michal Hocko <mhocko@suse.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/memcontrol.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 85df503ec023..e8bf0fc356b2 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -4724,17 +4724,6 @@ static void __mem_cgroup_free(struct mem_cgroup *memcg)
free_percpu(memcg->stat);
- /*
- * We need to make sure that (at least for now), the jump label
- * destruction code runs outside of the cgroup lock. This is because
- * get_online_cpus(), which is called from the static_branch update,
- * can't be called inside the cgroup_lock. cpusets are the ones
- * enforcing this dependency, so if they ever change, we might as well.
- *
- * schedule_work() will guarantee this happens. Be careful if you need
- * to move this code around, and make sure it is outside
- * the cgroup_lock.
- */
disarm_static_keys(memcg);
kfree(memcg);
}