From 412e78bd41ca469bd448712a85d3de621003e8e6 Mon Sep 17 00:00:00 2001
From: Glauber Costa <glommer@parallels.com>
Date: Sun, 15 Jan 2012 22:04:39 +0000
Subject: [PATCH] --- yaml --- r: 286179 b: refs/heads/master c:
 319d3b9c97b5e3191e419bb95496bf08ec50f096 h: refs/heads/master i:   286177:
 0792fd811f9074987722662573677817b8bd83b0   286175:
 9ae037049bb8fd3d58fb5722513c9572b2073487 v: v3

---
 [refs]                | 2 +-
 trunk/mm/memcontrol.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index dc3381726f03..ddbc752906f5 100644
--- 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
index 602207be9853..3dbff4dcde35 100644
--- 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))