From efd273078749353cc5cc039f82f4aa77bbf9156b Mon Sep 17 00:00:00 2001
From: Phil Carmody <ext-phil.2.carmody@nokia.com>
Date: Wed, 26 May 2010 14:42:43 -0700
Subject: [PATCH] --- yaml --- r: 198727 b: refs/heads/master c:
 315c1998e10527ff364a9883048455e609bc7232 h: refs/heads/master i:   198725:
 7abd455a9c5a3df0f74a67d37634b8f207518852   198723:
 9bf43e5d1c91e480d2c3ee1e55211325b066a571   198719:
 8cded3bd90373930e5c8595d650797bd3b7a5871 v: v3

---
 [refs]                | 2 +-
 trunk/mm/memcontrol.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 16b63a830764..b8020191af6e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5407a56257b6ade44fd9bcac972c99845b7413cd
+refs/heads/master: 315c1998e10527ff364a9883048455e609bc7232
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index 93b0239bc34d..8c200e86da4c 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/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)