From: stephen hemminger <stephen@networkplumber.org>
Date: Fri, 22 Feb 2013 07:59:10 +0000 (+0000)
Subject: sock: only define socket limit if mem cgroup configured
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=cbda4eaffa2da9cefb89dd748803da689596d28b;p=linux.git

sock: only define socket limit if mem cgroup configured

The mem cgroup socket limit is only used if the config option is
enabled. Found with sparse

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/core/sock.c b/net/core/sock.c
index fe96c5d34299c..b261a79777462 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -186,8 +186,10 @@ void mem_cgroup_sockets_destroy(struct mem_cgroup *memcg)
 static struct lock_class_key af_family_keys[AF_MAX];
 static struct lock_class_key af_family_slock_keys[AF_MAX];
 
+#if defined(CONFIG_MEMCG_KMEM)
 struct static_key memcg_socket_limit_enabled;
 EXPORT_SYMBOL(memcg_socket_limit_enabled);
+#endif
 
 /*
  * Make lock validator output more readable. (we pre-construct these