diff options
| author | Glauber Costa | 2012-01-20 05:57:14 +0100 |
|---|---|---|
| committer | David S. Miller | 2012-01-22 21:08:45 +0100 |
| commit | 376be5ff8a6a36efadd131860cf26841f366d44c (patch) | |
| tree | af7c37842eeb37c4a79195c46fc1dabbaf84be6f /include/net/sock.h | |
| parent | kernel-doc: fix new warning in net/sock.h (diff) | |
| download | kernel-qcow2-linux-376be5ff8a6a36efadd131860cf26841f366d44c.tar.gz kernel-qcow2-linux-376be5ff8a6a36efadd131860cf26841f366d44c.tar.xz kernel-qcow2-linux-376be5ff8a6a36efadd131860cf26841f366d44c.zip | |
net: fix socket memcg build with !CONFIG_NET
There is still a build bug with the sock memcg code, that triggers
with !CONFIG_NET, that survived my series of randconfig builds.
Signed-off-by: Glauber Costa <glommer@parallels.com>
Reported-by: Randy Dunlap <rdunlap@xenotime.net>
CC: Hiroyouki Kamezawa <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/sock.h')
| -rw-r--r-- | include/net/sock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h index 97fc0ad47da0..0e7a9b05f92b 100644 --- a/include/net/sock.h +++ b/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) |