Commit 376be5ff authored by Glauber Costa's avatar Glauber Costa Committed by David S. Miller

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: default avatarGlauber Costa <>
Reported-by: default avatarRandy Dunlap <>
CC: Hiroyouki Kamezawa <>
Signed-off-by: default avatarDavid S. Miller <>
parent 1a3bc369
......@@ -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 */
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)
......@@ -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;
......@@ -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;
memcg = sk->sk_cgrp->memcg;
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment