diff --git a/[refs] b/[refs] index f0a0bdfcdc17..86bb25ce6ed7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 11ac75ed1eb9d8f5ff067fa9a82ebf5075989281 +refs/heads/master: 9f048bfba15a22d1d1ce0c1f44567fa16bed4d25 diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h index 18ecc9919d29..6fe0dae81451 100644 --- a/trunk/include/net/sock.h +++ b/trunk/include/net/sock.h @@ -64,6 +64,8 @@ #include #include +struct cgroup; +struct cgroup_subsys; int mem_cgroup_sockets_init(struct cgroup *cgrp, struct cgroup_subsys *ss); void mem_cgroup_sockets_destroy(struct cgroup *cgrp, struct cgroup_subsys *ss); /*