From fd75efda181e9687f1846e4b24cb26dd5d134f4e Mon Sep 17 00:00:00 2001
From: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Date: Thu, 1 Oct 2009 15:44:08 -0700
Subject: [PATCH] --- yaml --- r: 166648 b: refs/heads/master c:
 26251eaf98e26dc2ce2dc26d63bc502700760704 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 16fd884af11b..e7ddfeb37d72 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 447e4460a4ef44a275f81d992d227f34673be2a8
+refs/heads/master: 26251eaf98e26dc2ce2dc26d63bc502700760704
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index e2b98a6875c0..21a30629ca80 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -447,9 +447,10 @@ static struct mem_cgroup_per_zone *
 __mem_cgroup_largest_soft_limit_node(struct mem_cgroup_tree_per_zone *mctz)
 {
 	struct rb_node *rightmost = NULL;
-	struct mem_cgroup_per_zone *mz = NULL;
+	struct mem_cgroup_per_zone *mz;
 
 retry:
+	mz = NULL;
 	rightmost = rb_last(&mctz->rb_root);
 	if (!rightmost)
 		goto done;		/* Nothing to reclaim from */