aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
Diffstat (limited to 'mm')
-rw-r--r--mm/memcontrol.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 4b5cfb509270..2c71f243186e 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -4967,7 +4967,7 @@ static int memcg_update_kmem_limit(struct cgroup_subsys_state *css, u64 val)
4967 */ 4967 */
4968 mutex_lock(&memcg_create_mutex); 4968 mutex_lock(&memcg_create_mutex);
4969 mutex_lock(&set_limit_mutex); 4969 mutex_lock(&set_limit_mutex);
4970 if (!memcg->kmem_account_flags && val != RESOURCE_MAX) { 4970 if (!memcg->kmem_account_flags && val != RES_COUNTER_MAX) {
4971 if (cgroup_task_count(css->cgroup) || memcg_has_children(memcg)) { 4971 if (cgroup_task_count(css->cgroup) || memcg_has_children(memcg)) {
4972 ret = -EBUSY; 4972 ret = -EBUSY;
4973 goto out; 4973 goto out;
@@ -4977,7 +4977,7 @@ static int memcg_update_kmem_limit(struct cgroup_subsys_state *css, u64 val)
4977 4977
4978 ret = memcg_update_cache_sizes(memcg); 4978 ret = memcg_update_cache_sizes(memcg);
4979 if (ret) { 4979 if (ret) {
4980 res_counter_set_limit(&memcg->kmem, RESOURCE_MAX); 4980 res_counter_set_limit(&memcg->kmem, RES_COUNTER_MAX);
4981 goto out; 4981 goto out;
4982 } 4982 }
4983 static_key_slow_inc(&memcg_kmem_enabled_key); 4983 static_key_slow_inc(&memcg_kmem_enabled_key);