---

yaml --- r: 176676 b: refs/heads/master c: aa20d48 h: refs/heads/master v: v3
git-mirror · Dec 16, 2009 · 23fcbb9 · 23fcbb9
1 parent 2168984
commit 23fcbb9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ab322caa347c4b580bcaf08f2253ea4cbd9e9ad
+refs/heads/master: aa20d489ceb024f91aae084ee00c47fc6a12255c
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
@@ -2311,7 +2311,6 @@ static int mem_cgroup_resize_limit(struct mem_cgroup *memcg,
 				unsigned long long val)
 {
 	int retry_count;
-	int progress;
 	u64 memswlimit;
 	int ret = 0;
 	int children = mem_cgroup_count_children(memcg);
@@ -2355,8 +2354,7 @@ static int mem_cgroup_resize_limit(struct mem_cgroup *memcg,
 		if (!ret)
 			break;
 
-		progress = mem_cgroup_hierarchical_reclaim(memcg, NULL,
-						GFP_KERNEL,
+		mem_cgroup_hierarchical_reclaim(memcg, NULL, GFP_KERNEL,
 						MEM_CGROUP_RECLAIM_SHRINK);
 		curusage = res_counter_read_u64(&memcg->res, RES_USAGE);
 		/* Usage is reduced ? */