From 0ab1ec076afec5f6a27a48a6c2f48c2790a2d13f Mon Sep 17 00:00:00 2001 From: Daisuke Nishimura Date: Wed, 7 Jan 2009 18:08:13 -0800 Subject: [PATCH] --- yaml --- r: 127579 b: refs/heads/master c: 670ec2f170301425fc4fdfa63d40652071fe85f6 h: refs/heads/master i: 127577: fa959b29927543a39d37a771a3b0bf54dcb6e009 127575: 0b6b2425ba37a3fc211bc4df32002fd0d2a81c17 v: v3 --- [refs] | 2 +- trunk/mm/memcontrol.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 11bb098cdbc6..bfd89b48d127 100644 --- 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 index 964a70035e8f..9b4993ee46b3 100644 --- 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);