From d3cdaf707eb3da9d78a927583c2cd0685ca19a93 Mon Sep 17 00:00:00 2001
From: Glauber Costa <glommer@parallels.com>
Date: Fri, 20 Jan 2012 04:57:14 +0000
Subject: [PATCH] --- yaml --- r: 286693 b: refs/heads/master c:
 376be5ff8a6a36efadd131860cf26841f366d44c h: refs/heads/master i:   286691:
 63c5266dd22b8a835a2bab96443e45824eefe0e4 v: v3

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

diff --git a/[refs] b/[refs]
index 718f2bb6679d..6cde9f8d894f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a3bc369ba547c11ca8b3ed079d7584f27499e70
+refs/heads/master: 376be5ff8a6a36efadd131860cf26841f366d44c
diff --git a/trunk/include/net/sock.h b/trunk/include/net/sock.h
index 97fc0ad47da0..0e7a9b05f92b 100644
--- a/trunk/include/net/sock.h
+++ b/trunk/include/net/sock.h
@@ -922,7 +922,7 @@ inline void sk_refcnt_debug_release(const struct sock *sk)
 #define sk_refcnt_debug_release(sk) do { } while (0)
 #endif /* SOCK_REFCNT_DEBUG */
 
-#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM
+#if defined(CONFIG_CGROUP_MEM_RES_CTLR_KMEM) && defined(CONFIG_NET)
 extern struct jump_label_key memcg_socket_limit_enabled;
 static inline struct cg_proto *parent_cg_proto(struct proto *proto,
 					       struct cg_proto *cg_proto)
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index 3dbff4dcde35..c3688dfd9a5f 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -379,7 +379,7 @@ static void mem_cgroup_put(struct mem_cgroup *memcg);
 static bool mem_cgroup_is_root(struct mem_cgroup *memcg);
 void sock_update_memcg(struct sock *sk)
 {
-	if (static_branch(&memcg_socket_limit_enabled)) {
+	if (mem_cgroup_sockets_enabled) {
 		struct mem_cgroup *memcg;
 
 		BUG_ON(!sk->sk_prot->proto_cgroup);
@@ -411,7 +411,7 @@ EXPORT_SYMBOL(sock_update_memcg);
 
 void sock_release_memcg(struct sock *sk)
 {
-	if (static_branch(&memcg_socket_limit_enabled) && sk->sk_cgrp) {
+	if (mem_cgroup_sockets_enabled && sk->sk_cgrp) {
 		struct mem_cgroup *memcg;
 		WARN_ON(!sk->sk_cgrp->memcg);
 		memcg = sk->sk_cgrp->memcg;