---

yaml --- r: 286179 b: refs/heads/master c: 319d3b9 h: refs/heads/master i: 286177: 0792fd8 286175: 9ae0370 v: v3
git-mirror · Jan 17, 2012 · 412e78b · 412e78b
1 parent 54b8e25
commit 412e78b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d9d399f14ea65aeb50c7404e986bceede93bb99
+refs/heads/master: 319d3b9c97b5e3191e419bb95496bf08ec50f096
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
@@ -373,7 +373,6 @@ static void mem_cgroup_put(struct mem_cgroup *memcg);
 
 /* Writing them here to avoid exposing memcg's inner layout */
 #ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM
-#ifdef CONFIG_INET
 #include <net/sock.h>
 #include <net/ip.h>
 
@@ -420,6 +419,7 @@ void sock_release_memcg(struct sock *sk)
 	}
 }
 
+#ifdef CONFIG_INET
 struct cg_proto *tcp_proto_cgroup(struct mem_cgroup *memcg)
 {
 	if (!memcg || mem_cgroup_is_root(memcg))