diff options
Diffstat (limited to 'include/net/sock.h')
-rw-r--r-- | include/net/sock.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index a6ba1f8871fd..b3ebe6b3e7db 100644 --- a/include/net/sock.h +++ b/include/net/sock.h | |||
@@ -70,16 +70,16 @@ | |||
70 | struct cgroup; | 70 | struct cgroup; |
71 | struct cgroup_subsys; | 71 | struct cgroup_subsys; |
72 | #ifdef CONFIG_NET | 72 | #ifdef CONFIG_NET |
73 | int mem_cgroup_sockets_init(struct cgroup *cgrp, struct cgroup_subsys *ss); | 73 | int mem_cgroup_sockets_init(struct mem_cgroup *memcg, struct cgroup_subsys *ss); |
74 | void mem_cgroup_sockets_destroy(struct cgroup *cgrp); | 74 | void mem_cgroup_sockets_destroy(struct mem_cgroup *memcg); |
75 | #else | 75 | #else |
76 | static inline | 76 | static inline |
77 | int mem_cgroup_sockets_init(struct cgroup *cgrp, struct cgroup_subsys *ss) | 77 | int mem_cgroup_sockets_init(struct mem_cgroup *memcg, struct cgroup_subsys *ss) |
78 | { | 78 | { |
79 | return 0; | 79 | return 0; |
80 | } | 80 | } |
81 | static inline | 81 | static inline |
82 | void mem_cgroup_sockets_destroy(struct cgroup *cgrp) | 82 | void mem_cgroup_sockets_destroy(struct mem_cgroup *memcg) |
83 | { | 83 | { |
84 | } | 84 | } |
85 | #endif | 85 | #endif |
@@ -900,9 +900,9 @@ struct proto { | |||
900 | * This function has to setup any files the protocol want to | 900 | * This function has to setup any files the protocol want to |
901 | * appear in the kmem cgroup filesystem. | 901 | * appear in the kmem cgroup filesystem. |
902 | */ | 902 | */ |
903 | int (*init_cgroup)(struct cgroup *cgrp, | 903 | int (*init_cgroup)(struct mem_cgroup *memcg, |
904 | struct cgroup_subsys *ss); | 904 | struct cgroup_subsys *ss); |
905 | void (*destroy_cgroup)(struct cgroup *cgrp); | 905 | void (*destroy_cgroup)(struct mem_cgroup *memcg); |
906 | struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg); | 906 | struct cg_proto *(*proto_cgroup)(struct mem_cgroup *memcg); |
907 | #endif | 907 | #endif |
908 | }; | 908 | }; |