---

yaml --- r: 281969 b: refs/heads/master c: 3969eb3 h: refs/heads/master i: 281967: ca9f36b v: v3
git-mirror · Jan 9, 2012 · e9d7d6e · e9d7d6e
1 parent 43e1ac2
commit e9d7d6e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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>