Merge tag 'x86_cache_for_v5.10' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / mm / vmpressure.c

diff --git a/mm/vmpressure.c b/mm/vmpressure.c
index 4bac22f..d69019f 100644 (file)
--- a/mm/vmpressure.c
+++ b/mm/vmpressure.c
@@ -280,7 +280,7 @@ void vmpressure(gfp_t gfp, struct mem_cgroup *memcg, bool tree,
                enum vmpressure_levels level;
 
                /* For now, no users for root-level efficiency */
-               if (!memcg || memcg == root_mem_cgroup)
+               if (!memcg || mem_cgroup_is_root(memcg))
                        return;
 
                spin_lock(&vmpr->sr_lock);
@@ -371,10 +371,8 @@ int vmpressure_register_event(struct mem_cgroup *memcg,
        int ret = 0;
 
        spec_orig = spec = kstrndup(args, MAX_VMPRESSURE_ARGS_LEN, GFP_KERNEL);
-       if (!spec) {
-               ret = -ENOMEM;
-               goto out;
-       }
+       if (!spec)
+               return -ENOMEM;
 
        /* Find required level */
        token = strsep(&spec, ",");