From e9d7d6e9ac693838739e27e0746fcc27ce5bfe61 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 9 Jan 2012 13:44:23 -0800
Subject: [PATCH] --- yaml --- r: 281969 b: refs/heads/master c:
 3969eb3859e4fad4b32ca8f96d4ec8551c20704a h: refs/heads/master i:   281967:
 ca9f36bea90372569c20b1a767ce632d652610c4 v: v3

---
 [refs]                           | 2 +-
 trunk/include/linux/memcontrol.h | 2 --
 trunk/net/core/sock.c            | 1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b650767d8704..56261ad4bf15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2429f7ac2ef429378536d87fcbbf6f424aa5b47f
+refs/heads/master: 3969eb3859e4fad4b32ca8f96d4ec8551c20704a
diff --git a/trunk/include/linux/memcontrol.h b/trunk/include/linux/memcontrol.h
index 9b296ea41bb8..f944591765eb 100644
--- a/trunk/include/linux/memcontrol.h
+++ b/trunk/include/linux/memcontrol.h
@@ -390,7 +390,6 @@ enum {
 	OVER_LIMIT,
 };
 
-#ifdef CONFIG_INET
 struct sock;
 #ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM
 void sock_update_memcg(struct sock *sk);
@@ -403,6 +402,5 @@ static inline void sock_release_memcg(struct sock *sk)
 {
 }
 #endif /* CONFIG_CGROUP_MEM_RES_CTLR_KMEM */
-#endif /* CONFIG_INET */
 #endif /* _LINUX_MEMCONTROL_H */
 
diff --git a/trunk/net/core/sock.c b/trunk/net/core/sock.c
index c3ae73de0239..5c5af9988f94 100644
--- a/trunk/net/core/sock.c
+++ b/trunk/net/core/sock.c
@@ -112,6 +112,7 @@
 #include <linux/highmem.h>
 #include <linux/user_namespace.h>
 #include <linux/jump_label.h>
+#include <linux/memcontrol.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>