diff options
| author | Mark Brown <broonie@linaro.org> | 2014-03-09 07:33:42 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-03-09 07:33:42 +0000 |
| commit | 37763c8d1e5e8c4b755b7aa3f77c2f0a67654cc8 (patch) | |
| tree | 2db37841b64998802b8d818e20eb5c246fa4aa65 /mm | |
| parent | cc3d2fb369a274c678f5571c1a1a33c3c3fc5afb (diff) | |
| parent | 561ba47707bf63cac3d97143ab5928353d47459e (diff) | |
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
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 134e2106f467..6115b2bbd6ea 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; |