Merge branch 'for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[~andy/linux] / net / ipv4 / tcp_memcontrol.c

diff --git a/net/ipv4/tcp_memcontrol.c b/net/ipv4/tcp_memcontrol.c
index 49978788a9dc31e13cec48b472c45234343be13a..e795272fbe9ed5683f32e33dd7a6767f9ca3837c 100644 (file)
--- a/net/ipv4/tcp_memcontrol.c
+++ b/net/ipv4/tcp_memcontrol.c
@@ -94,7 +94,7 @@ create_files:
 }
 EXPORT_SYMBOL(tcp_init_cgroup);
 
-void tcp_destroy_cgroup(struct cgroup *cgrp, struct cgroup_subsys *ss)
+void tcp_destroy_cgroup(struct cgroup *cgrp)
 {
        struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp);
        struct cg_proto *cg_proto;
@@ -111,7 +111,7 @@ void tcp_destroy_cgroup(struct cgroup *cgrp, struct cgroup_subsys *ss)
        val = res_counter_read_u64(&tcp->tcp_memory_allocated, RES_LIMIT);
 
        if (val != RESOURCE_MAX)
-               jump_label_dec(&memcg_socket_limit_enabled);
+               static_key_slow_dec(&memcg_socket_limit_enabled);
 }
 EXPORT_SYMBOL(tcp_destroy_cgroup);
 
@@ -143,9 +143,9 @@ static int tcp_update_limit(struct mem_cgroup *memcg, u64 val)
                                             net->ipv4.sysctl_tcp_mem[i]);
 
        if (val == RESOURCE_MAX && old_lim != RESOURCE_MAX)
-               jump_label_dec(&memcg_socket_limit_enabled);
+               static_key_slow_dec(&memcg_socket_limit_enabled);
        else if (old_lim == RESOURCE_MAX && val != RESOURCE_MAX)
-               jump_label_inc(&memcg_socket_limit_enabled);
+               static_key_slow_inc(&memcg_socket_limit_enabled);
 
        return 0;
 }