diff options
Diffstat (limited to 'mm')
-rw-r--r-- | mm/memcontrol.c | 6 |
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 |
3586 | static int memcg_init_kmem(struct mem_cgroup *memcg, struct cgroup_subsys *ss) | 3586 | static 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 | ||
3597 | static void memcg_deactivate_kmem(struct mem_cgroup *memcg) | 3597 | static 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 | ||