diff options
| author | Vladimir Davydov <vdavydov@virtuozzo.com> | 2016-01-20 18:02:44 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-20 20:09:18 -0500 |
| commit | d55f90bfab40e3b5db323711d28186ff09461692 (patch) | |
| tree | ea3a5bea8619a39564fe13d343b919543a17e19f /net/ipv4/tcp_ipv4.c | |
| parent | 489c2a20a414351fe0813a727c34600c0f7292ae (diff) | |
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 <vdavydov@virtuozzo.com>
Acked-by: Johannes Weiner <hannes@cmpxchg.org>
Cc: "David S. Miller" <davem@davemloft.net>
Acked-by: Michal Hocko <mhocko@suse.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
| -rw-r--r-- | net/ipv4/tcp_ipv4.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index c7d1fb50f381..5ced3e4013e3 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c | |||
| @@ -73,7 +73,6 @@ | |||
| 73 | #include <net/timewait_sock.h> | 73 | #include <net/timewait_sock.h> |
| 74 | #include <net/xfrm.h> | 74 | #include <net/xfrm.h> |
| 75 | #include <net/secure_seq.h> | 75 | #include <net/secure_seq.h> |
| 76 | #include <net/tcp_memcontrol.h> | ||
| 77 | #include <net/busy_poll.h> | 76 | #include <net/busy_poll.h> |
| 78 | 77 | ||
| 79 | #include <linux/inet.h> | 78 | #include <linux/inet.h> |