mm: vmpressure: fix backport

Change-Id: I26f4303038ccedff56211f2b11250760e5a84ad8
RR-msm7x30 · Oct 22, 2015 · 39b271f · 39b271f
1 parent 4c46119
commit 39b271f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/mm/vmpressure.c b/mm/vmpressure.c
@@ -100,7 +100,7 @@ static struct vmpressure *work_to_vmpressure(struct work_struct *work)
 	return container_of(work, struct vmpressure, work);
 }
 
-#ifdef CONFIG_MEMCG
+#ifdef CONFIG_CGROUP_MEM_RES_CTLR
 static struct vmpressure *cg_to_vmpressure(struct cgroup *cg)
 {
 	return css_to_vmpressure(cgroup_subsys_state(cg, mem_cgroup_subsys_id));
@@ -351,7 +351,7 @@ void vmpressure(gfp_t gfp, struct mem_cgroup *memcg,
 	if (!memcg)
 		vmpressure_global(gfp, scanned, reclaimed);
 
-	if (IS_ENABLED(CONFIG_MEMCG))
+	if (IS_ENABLED(CONFIG_CGROUP_MEM_RES_CTLR))
 		vmpressure_memcg(gfp, memcg, scanned, reclaimed);
 }