diff options
Diffstat (limited to 'mm/memcontrol.c')
-rw-r--r-- | mm/memcontrol.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 4baddbae94cc..556859fec4ef 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
@@ -379,7 +379,7 @@ static void mem_cgroup_put(struct mem_cgroup *memcg); | |||
379 | static bool mem_cgroup_is_root(struct mem_cgroup *memcg); | 379 | static bool mem_cgroup_is_root(struct mem_cgroup *memcg); |
380 | void sock_update_memcg(struct sock *sk) | 380 | void sock_update_memcg(struct sock *sk) |
381 | { | 381 | { |
382 | if (static_branch(&memcg_socket_limit_enabled)) { | 382 | if (mem_cgroup_sockets_enabled) { |
383 | struct mem_cgroup *memcg; | 383 | struct mem_cgroup *memcg; |
384 | 384 | ||
385 | BUG_ON(!sk->sk_prot->proto_cgroup); | 385 | BUG_ON(!sk->sk_prot->proto_cgroup); |
@@ -411,7 +411,7 @@ EXPORT_SYMBOL(sock_update_memcg); | |||
411 | 411 | ||
412 | void sock_release_memcg(struct sock *sk) | 412 | void sock_release_memcg(struct sock *sk) |
413 | { | 413 | { |
414 | if (static_branch(&memcg_socket_limit_enabled) && sk->sk_cgrp) { | 414 | if (mem_cgroup_sockets_enabled && sk->sk_cgrp) { |
415 | struct mem_cgroup *memcg; | 415 | struct mem_cgroup *memcg; |
416 | WARN_ON(!sk->sk_cgrp->memcg); | 416 | WARN_ON(!sk->sk_cgrp->memcg); |
417 | memcg = sk->sk_cgrp->memcg; | 417 | memcg = sk->sk_cgrp->memcg; |