diff options
| author | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-11-19 05:32:12 -0500 |
| commit | b10778a00d40b3d9fdaaf5891e802794781ff71c (patch) | |
| tree | 6ba4cbac86eecedc3f30650e7f764ecf00c83898 /net/ipv4/tcp_memcontrol.c | |
| parent | 594081ee7145cc30a3977cb4e218f81213b63dc5 (diff) | |
| parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) | |
Merge commit 'v3.17' into next
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 f7a2ec3ac584..3af522622fad 100644 --- a/net/ipv4/tcp_memcontrol.c +++ b/net/ipv4/tcp_memcontrol.c | |||
| @@ -222,7 +222,7 @@ static struct cftype tcp_files[] = { | |||
| 222 | 222 | ||
| 223 | static int __init tcp_memcontrol_init(void) | 223 | static int __init tcp_memcontrol_init(void) |
| 224 | { | 224 | { |
| 225 | WARN_ON(cgroup_add_cftypes(&memory_cgrp_subsys, tcp_files)); | 225 | WARN_ON(cgroup_add_legacy_cftypes(&memory_cgrp_subsys, tcp_files)); |
| 226 | return 0; | 226 | return 0; |
| 227 | } | 227 | } |
| 228 | __initcall(tcp_memcontrol_init); | 228 | __initcall(tcp_memcontrol_init); |