diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-17 22:55:28 +1000 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-17 22:55:28 +1000 |
| commit | 0c929238ca4baefe47f4034732db4c154f2329c6 (patch) | |
| tree | 2636079800fa045501982a70e1be0425c1b968c2 /net/ipv4/tcp_memcontrol.c | |
| parent | 6d7120a713300283a8b73e7d86cd1bab8b9d1971 (diff) | |
| parent | 78da107a7ed14fbc6ef77ff4c41d92b11edc9036 (diff) | |
Merge branch 'sh/platform-updates' into sh-latest
Diffstat (limited to 'net/ipv4/tcp_memcontrol.c')
| -rw-r--r-- | net/ipv4/tcp_memcontrol.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_memcontrol.c b/net/ipv4/tcp_memcontrol.c index 7fed04f875c1..49978788a9dc 100644 --- a/net/ipv4/tcp_memcontrol.c +++ b/net/ipv4/tcp_memcontrol.c @@ -108,7 +108,7 @@ void tcp_destroy_cgroup(struct cgroup *cgrp, struct cgroup_subsys *ss) tcp = tcp_from_cgproto(cg_proto); percpu_counter_destroy(&tcp->tcp_sockets_allocated); - val = res_counter_read_u64(&tcp->tcp_memory_allocated, RES_USAGE); + val = res_counter_read_u64(&tcp->tcp_memory_allocated, RES_LIMIT); if (val != RESOURCE_MAX) jump_label_dec(&memcg_socket_limit_enabled); |