aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorJohannes Weiner <hannes@cmpxchg.org>2016-01-20 18:02:18 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-20 20:09:18 -0500
commit6d378dac7c4905db38f8127c4e618f0f627a4ced (patch)
treeeff640b738eedd12d0c62ae8e6eb0dbc6b26c8d8 /mm
parent545b5e2ad4771d23d4c67d0bcc18babd2070df13 (diff)
mm: memcontrol: drop unused @css argument in memcg_init_kmem
This series adds accounting of the historical "kmem" memory consumers to the cgroup2 memory controller. These consumers include the dentry cache, the inode cache, kernel stack pages, and a few others that are pointed out in patch 7/8. The footprint of these consumers is directly tied to userspace activity in common workloads, and so they have to be part of the minimally viable configuration in order to present a complete feature to our users. The cgroup2 interface of the memory controller is far from complete, but this series, along with the socket memory accounting series, provides the final semantic changes for the existing memory knobs in the cgroup2 interface, which is scheduled for initial release in the next merge window. This patch (of 8): Remove unused css argument frmo memcg_init_kmem() Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Acked-by: Michal Hocko <mhocko@suse.com> Cc: Tejun Heo <tj@kernel.org> Acked-by: Vladimir Davydov <vdavydov@virtuozzo.com> 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.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 0eda67376df4..f21f29cd14f9 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -3583,7 +3583,7 @@ static int mem_cgroup_oom_control_write(struct cgroup_subsys_state *css,
3583} 3583}
3584 3584
3585#ifdef CONFIG_MEMCG_KMEM 3585#ifdef CONFIG_MEMCG_KMEM
3586static int memcg_init_kmem(struct mem_cgroup *memcg, struct cgroup_subsys *ss) 3586static int memcg_init_kmem(struct mem_cgroup *memcg)
3587{ 3587{
3588 int ret; 3588 int ret;
3589 3589
@@ -3591,7 +3591,7 @@ static int memcg_init_kmem(struct mem_cgroup *memcg, struct cgroup_subsys *ss)
3591 if (ret) 3591 if (ret)
3592 return ret; 3592 return ret;
3593 3593
3594 return tcp_init_cgroup(memcg, ss); 3594 return tcp_init_cgroup(memcg);
3595} 3595}
3596 3596
3597static void memcg_deactivate_kmem(struct mem_cgroup *memcg) 3597static void memcg_deactivate_kmem(struct mem_cgroup *memcg)
@@ -4274,7 +4274,7 @@ mem_cgroup_css_online(struct cgroup_subsys_state *css)
4274 } 4274 }
4275 mutex_unlock(&memcg_create_mutex); 4275 mutex_unlock(&memcg_create_mutex);
4276 4276
4277 ret = memcg_init_kmem(memcg, &memory_cgrp_subsys); 4277 ret = memcg_init_kmem(memcg);
4278 if (ret) 4278 if (ret)
4279 return ret; 4279 return ret;
4280 4280