Merge branch 'linus' into smp/urgent

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

diff --git a/mm/vmpressure.c b/mm/vmpressure.c
index d69019f..76518e4 100644 (file)
--- a/mm/vmpressure.c
+++ b/mm/vmpressure.c
@@ -74,8 +74,7 @@ static struct vmpressure *work_to_vmpressure(struct work_struct *work)
 
 static struct vmpressure *vmpressure_parent(struct vmpressure *vmpr)
 {
-       struct cgroup_subsys_state *css = vmpressure_to_css(vmpr);
-       struct mem_cgroup *memcg = mem_cgroup_from_css(css);
+       struct mem_cgroup *memcg = vmpressure_to_memcg(vmpr);
 
        memcg = parent_mem_cgroup(memcg);
        if (!memcg)
@@ -240,7 +239,12 @@ static void vmpressure_work_fn(struct work_struct *work)
 void vmpressure(gfp_t gfp, struct mem_cgroup *memcg, bool tree,
                unsigned long scanned, unsigned long reclaimed)
 {
-       struct vmpressure *vmpr = memcg_to_vmpressure(memcg);
+       struct vmpressure *vmpr;
+
+       if (mem_cgroup_disabled())
+               return;
+
+       vmpr = memcg_to_vmpressure(memcg);
 
        /*
         * Here we only want to account pressure that userland is able to