diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-09 07:33:18 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-09 07:33:18 +0000 |
| commit | 561ba47707bf63cac3d97143ab5928353d47459e (patch) | |
| tree | 1cdcdc0c6deef63e1822768e4283ce82330c7aa3 /mm | |
| parent | 0a92210a812d913cfb99cb959ec75f27473af664 (diff) | |
| parent | 6969595f011b46b49c3f1b9e0bd7da27768c1fd9 (diff) | |
Merge tag 'v3.10.33' into linux-linaro-lsk
This is the 3.10.33 stable release
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/memcontrol.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 134e2106f46..6115b2bbd6e 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -1220,7 +1220,7 @@ struct mem_cgroup *mem_cgroup_iter(struct mem_cgroup *root, if (dead_count == iter->last_dead_count) { smp_rmb(); last_visited = iter->last_visited; - if (last_visited && + if (last_visited && last_visited != root && !css_tryget(&last_visited->css)) last_visited = NULL; } @@ -1229,7 +1229,7 @@ struct mem_cgroup *mem_cgroup_iter(struct mem_cgroup *root, memcg = __mem_cgroup_iter_next(root, last_visited); if (reclaim) { - if (last_visited) + if (last_visited && last_visited != root) css_put(&last_visited->css); iter->last_visited = memcg; |