From e2e54b7aa47c1a5623ebe40a6a12df331e97446c Mon Sep 17 00:00:00 2001
From: Thiago Farina <tfransosi@gmail.com>
Date: Fri, 5 Mar 2010 13:42:04 -0800
Subject: [PATCH] --- yaml --- r: 186208 b: refs/heads/master c:
 648bcc771145172a14bc35eeb849ed08f6aa4f1e h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 59200d3ee725..22a2d2d32d3e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 19adf9c5d5793657118f2002237c0ee49c3b6185
+refs/heads/master: 648bcc771145172a14bc35eeb849ed08f6aa4f1e
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index 954032b80bed..d813823ab08f 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -2545,7 +2545,7 @@ static int mem_cgroup_force_empty_list(struct mem_cgroup *mem,
 		pc = list_entry(list->prev, struct page_cgroup, lru);
 		if (busy == pc) {
 			list_move(&pc->lru, list);
-			busy = 0;
+			busy = NULL;
 			spin_unlock_irqrestore(&zone->lru_lock, flags);
 			continue;
 		}