aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/tcp.c4
-rw-r--r--net/ipv4/tcp_memcontrol.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 461003d258ba..86023b9be47f 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -3071,8 +3071,8 @@ void __init tcp_init(void)
3071 3071
3072 BUILD_BUG_ON(sizeof(struct tcp_skb_cb) > sizeof(skb->cb)); 3072 BUILD_BUG_ON(sizeof(struct tcp_skb_cb) > sizeof(skb->cb));
3073 3073
3074 percpu_counter_init(&tcp_sockets_allocated, 0); 3074 percpu_counter_init(&tcp_sockets_allocated, 0, GFP_KERNEL);
3075 percpu_counter_init(&tcp_orphan_count, 0); 3075 percpu_counter_init(&tcp_orphan_count, 0, GFP_KERNEL);
3076 tcp_hashinfo.bind_bucket_cachep = 3076 tcp_hashinfo.bind_bucket_cachep =
3077 kmem_cache_create("tcp_bind_bucket", 3077 kmem_cache_create("tcp_bind_bucket",
3078 sizeof(struct inet_bind_bucket), 0, 3078 sizeof(struct inet_bind_bucket), 0,
diff --git a/net/ipv4/tcp_memcontrol.c b/net/ipv4/tcp_memcontrol.c
index 3af522622fad..1d191357bf88 100644
--- a/net/ipv4/tcp_memcontrol.c
+++ b/net/ipv4/tcp_memcontrol.c
@@ -32,7 +32,7 @@ int tcp_init_cgroup(struct mem_cgroup *memcg, struct cgroup_subsys *ss)
32 res_parent = &parent_cg->memory_allocated; 32 res_parent = &parent_cg->memory_allocated;
33 33
34 res_counter_init(&cg_proto->memory_allocated, res_parent); 34 res_counter_init(&cg_proto->memory_allocated, res_parent);
35 percpu_counter_init(&cg_proto->sockets_allocated, 0); 35 percpu_counter_init(&cg_proto->sockets_allocated, 0, GFP_KERNEL);
36 36
37 return 0; 37 return 0;
38} 38}