aboutsummaryrefslogtreecommitdiffstats
path: root/include/net/sock.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/net/sock.h')
-rw-r--r--include/net/sock.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/sock.h b/include/net/sock.h
index e067f8c18f88..cee528c119ca 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -913,7 +913,7 @@ struct proto {
913#ifdef SOCK_REFCNT_DEBUG 913#ifdef SOCK_REFCNT_DEBUG
914 atomic_t socks; 914 atomic_t socks;
915#endif 915#endif
916#ifdef CONFIG_CGROUP_MEM_RES_CTLR_KMEM 916#ifdef CONFIG_MEMCG_KMEM
917 /* 917 /*
918 * cgroup specific init/deinit functions. Called once for all 918 * cgroup specific init/deinit functions. Called once for all
919 * protocols that implement it, from cgroups populate function. 919 * protocols that implement it, from cgroups populate function.
@@ -994,7 +994,7 @@ inline void sk_refcnt_debug_release(const struct sock *sk)
994#define sk_refcnt_debug_release(sk) do { } while (0) 994#define sk_refcnt_debug_release(sk) do { } while (0)
995#endif /* SOCK_REFCNT_DEBUG */ 995#endif /* SOCK_REFCNT_DEBUG */
996 996
997#if defined(CONFIG_CGROUP_MEM_RES_CTLR_KMEM) && defined(CONFIG_NET) 997#if defined(CONFIG_MEMCG_KMEM) && defined(CONFIG_NET)
998extern struct static_key memcg_socket_limit_enabled; 998extern struct static_key memcg_socket_limit_enabled;
999static inline struct cg_proto *parent_cg_proto(struct proto *proto, 999static inline struct cg_proto *parent_cg_proto(struct proto *proto,
1000 struct cg_proto *cg_proto) 1000 struct cg_proto *cg_proto)