Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[firefly-linux-kernel-4.4.55.git] / net / ipv4 / tcp_memcontrol.c

diff --git a/net/ipv4/tcp_memcontrol.c b/net/ipv4/tcp_memcontrol.c
index d52196f56862a779dbd7d8c13b8450239488be80..da14436c1735677f7207030cfb8d76ae15a1157f 100644 (file)
--- a/net/ipv4/tcp_memcontrol.c
+++ b/net/ipv4/tcp_memcontrol.c
@@ -64,7 +64,6 @@ void tcp_destroy_cgroup(struct mem_cgroup *memcg)
 {
        struct cg_proto *cg_proto;
        struct tcp_memcontrol *tcp;
-       u64 val;
 
        cg_proto = tcp_prot.proto_cgroup(memcg);
        if (!cg_proto)