summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorPhil Carmody <ext-phil.2.carmody@nokia.com>2010-05-27 01:42:43 +0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-27 20:12:44 +0400
commit315c1998e10527ff364a9883048455e609bc7232 (patch)
tree081c072b7e7a48df369fd80142e611c3f36d3cfd /mm
parent5407a56257b6ade44fd9bcac972c99845b7413cd (diff)
downloadlinux-315c1998e10527ff364a9883048455e609bc7232.tar.xz
mm: memcontrol - uninitialised return value
Only an out of memory error will cause ret to be set. Signed-off-by: Phil Carmody <ext-phil.2.carmody@nokia.com> Acked-by: Kirill A. Shutemov <kirill@shutemov.name> Cc: Balbir Singh <balbir@in.ibm.com> Cc: Daisuke Nishimura <nishimura@mxp.nes.nec.co.jp> Acked-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 93b0239bc34d..8c200e86da4c 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -3563,7 +3563,7 @@ static int mem_cgroup_usage_unregister_event(struct cgroup *cgrp,
int type = MEMFILE_TYPE(cft->private);
u64 usage;
int size = 0;
- int i, j, ret;
+ int i, j, ret = 0;
mutex_lock(&memcg->thresholds_lock);
if (type == _MEM)