projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
[cascardo/linux.git]
/
net
/
ipv4
/
tcp_memcontrol.c
diff --git
a/net/ipv4/tcp_memcontrol.c
b/net/ipv4/tcp_memcontrol.c
index
602fb30
..
e795272
100644
(file)
--- a/
net/ipv4/tcp_memcontrol.c
+++ b/
net/ipv4/tcp_memcontrol.c
@@
-94,7
+94,7
@@
create_files:
}
EXPORT_SYMBOL(tcp_init_cgroup);
-void tcp_destroy_cgroup(struct cgroup *cgrp
, struct cgroup_subsys *ss
)
+void tcp_destroy_cgroup(struct cgroup *cgrp)
{
struct mem_cgroup *memcg = mem_cgroup_from_cont(cgrp);
struct cg_proto *cg_proto;