---

yaml --- r: 127579 b: refs/heads/master c: 670ec2f h: refs/heads/master i: 127577: fa959b2 127575: 0b6b242 v: v3
git-mirror · Jan 8, 2009 · 0ab1ec0 · 0ab1ec0
1 parent b2564cb
commit 0ab1ec0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7fe942e94b2f66aa0f11d37699c0ec8155d3ad1
+refs/heads/master: 670ec2f170301425fc4fdfa63d40652071fe85f6
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
@@ -606,6 +606,8 @@ static int mem_cgroup_hierarchical_reclaim(struct mem_cgroup *root_mem,
 	ret = try_to_free_mem_cgroup_pages(root_mem, gfp_mask, noswap);
 	if (mem_cgroup_check_under_limit(root_mem))
 		return 0;
+	if (!root_mem->use_hierarchy)
+		return ret;
 
 	next_mem = mem_cgroup_get_first_node(root_mem);