summaryrefslogtreecommitdiff
path: root/net/ipv4
diff options
context:
space:
mode:
authorJohannes Weiner <hannes@cmpxchg.org>2016-01-15 02:21:20 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2016-01-15 03:00:49 +0300
commit80e95fe0fdcde2812c341ad4209d62dc1a7af53b (patch)
treefb9c8890f258373ac33c31ead466083f7ceb78c4 /net/ipv4
parentbaac50bbc3cdfd184ebf586b1704edbfcee866df (diff)
downloadlinux-80e95fe0fdcde2812c341ad4209d62dc1a7af53b.tar.xz
mm: memcontrol: generalize the socket accounting jump label
The unified hierarchy memory controller is going to use this jump label as well to control the networking callbacks. Move it to the memory controller code and give it a more generic name. Signed-off-by: Johannes Weiner <hannes@cmpxchg.org> Acked-by: Michal Hocko <mhocko@suse.com> Reviewed-by: Vladimir Davydov <vdavydov@virtuozzo.com> Acked-by: David S. Miller <davem@davemloft.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/tcp_memcontrol.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/tcp_memcontrol.c b/net/ipv4/tcp_memcontrol.c
index e5078259cbe3..9a22e2dfd64a 100644
--- a/net/ipv4/tcp_memcontrol.c
+++ b/net/ipv4/tcp_memcontrol.c
@@ -34,7 +34,7 @@ void tcp_destroy_cgroup(struct mem_cgroup *memcg)
return;
if (memcg->tcp_mem.active)
- static_key_slow_dec(&memcg_socket_limit_enabled);
+ static_key_slow_dec(&memcg_sockets_enabled_key);
}
static int tcp_update_limit(struct mem_cgroup *memcg, unsigned long nr_pages)
@@ -65,7 +65,7 @@ static int tcp_update_limit(struct mem_cgroup *memcg, unsigned long nr_pages)
* because when this value change, the code to process it is not
* patched in yet.
*/
- static_key_slow_inc(&memcg_socket_limit_enabled);
+ static_key_slow_inc(&memcg_sockets_enabled_key);
memcg->tcp_mem.active = true;
}