diff options
| author | Vladimir Davydov <[email protected]> | 2016-01-20 23:02:44 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2016-01-21 01:09:18 +0000 |
| commit | d55f90bfab40e3b5db323711d28186ff09461692 (patch) | |
| tree | ea3a5bea8619a39564fe13d343b919543a17e19f /net/ipv6/tcp_ipv6.c | |
| parent | mm: memcontrol: introduce CONFIG_MEMCG_LEGACY_KMEM (diff) | |
| download | kernel-d55f90bfab40e3b5db323711d28186ff09461692.tar.gz kernel-d55f90bfab40e3b5db323711d28186ff09461692.zip | |
net: drop tcp_memcontrol.c
tcp_memcontrol.c only contains legacy memory.tcp.kmem.* file definitions
and mem_cgroup->tcp_mem init/destroy stuff. This doesn't belong to
network subsys. Let's move it to memcontrol.c. This also allows us to
reuse generic code for handling legacy memcg files.
Signed-off-by: Vladimir Davydov <[email protected]>
Acked-by: Johannes Weiner <[email protected]>
Cc: "David S. Miller" <[email protected]>
Acked-by: Michal Hocko <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Diffstat (limited to 'net/ipv6/tcp_ipv6.c')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 4ad8edb46f7c..006396e31cb0 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -61,7 +61,6 @@ #include <net/timewait_sock.h> #include <net/inet_common.h> #include <net/secure_seq.h> -#include <net/tcp_memcontrol.h> #include <net/busy_poll.h> #include <linux/proc_fs.h> |