aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorBob Liu <lliubbo@gmail.com>2009-12-15 19:47:14 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-16 10:20:08 -0500
commitaa20d489ceb024f91aae084ee00c47fc6a12255c (patch)
tree1fc8e826114b1020d0e938d3b915e8a2016ded57 /mm
parent9ab322caa347c4b580bcaf08f2253ea4cbd9e9ad (diff)
memcg: code clean, remove unused variable in mem_cgroup_resize_limit()
Variable `progress' isn't used in mem_cgroup_resize_limit() any more. Remove it. [akpm@linux-foundation.org: cleanup] Signed-off-by: Bob Liu <lliubbo@gmail.com> Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> Reviewed-by: Balbir Singh <balbir@linux.vnet.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/memcontrol.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 1aff6c3fcbd..878808c4fcb 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -2311,7 +2311,6 @@ static int mem_cgroup_resize_limit(struct mem_cgroup *memcg,
2311 unsigned long long val) 2311 unsigned long long val)
2312{ 2312{
2313 int retry_count; 2313 int retry_count;
2314 int progress;
2315 u64 memswlimit; 2314 u64 memswlimit;
2316 int ret = 0; 2315 int ret = 0;
2317 int children = mem_cgroup_count_children(memcg); 2316 int children = mem_cgroup_count_children(memcg);
@@ -2355,8 +2354,7 @@ static int mem_cgroup_resize_limit(struct mem_cgroup *memcg,
2355 if (!ret) 2354 if (!ret)
2356 break; 2355 break;
2357 2356
2358 progress = mem_cgroup_hierarchical_reclaim(memcg, NULL, 2357 mem_cgroup_hierarchical_reclaim(memcg, NULL, GFP_KERNEL,
2359 GFP_KERNEL,
2360 MEM_CGROUP_RECLAIM_SHRINK); 2358 MEM_CGROUP_RECLAIM_SHRINK);
2361 curusage = res_counter_read_u64(&memcg->res, RES_USAGE); 2359 curusage = res_counter_read_u64(&memcg->res, RES_USAGE);
2362 /* Usage is reduced ? */ 2360 /* Usage is reduced ? */