---

yaml --- r: 299061 b: refs/heads/master c: 569530f h: refs/heads/master i: 299059: cf5c4e8 v: v3
git-mirror · Apr 12, 2012 · 463f8f3 · 463f8f3
1 parent 9f5654c
commit 463f8f3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 32050017cf3bf2b983571a90351328b4f66e463d
+refs/heads/master: 569530fb1b40ab2d2ca147ee79898ac807ebdf90
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
@@ -3763,7 +3763,7 @@ static int mem_cgroup_force_empty(struct mem_cgroup *memcg, bool free_all)
 			goto try_to_free;
 		cond_resched();
 	/* "ret" should also be checked to ensure all lists are empty. */
-	} while (memcg->res.usage > 0 || ret);
+	} while (res_counter_read_u64(&memcg->res, RES_USAGE) > 0 || ret);
 out:
 	css_put(&memcg->css);
 	return ret;
@@ -3778,7 +3778,7 @@ static int mem_cgroup_force_empty(struct mem_cgroup *memcg, bool free_all)
 	lru_add_drain_all();
 	/* try to free all pages in this cgroup */
 	shrink = 1;
-	while (nr_retries && memcg->res.usage > 0) {
+	while (nr_retries && res_counter_read_u64(&memcg->res, RES_USAGE) > 0) {
 		int progress;
 
 		if (signal_pending(current)) {