From 836b96230fe8b980b4e6d0c4bd6ece1340a73b4e Mon Sep 17 00:00:00 2001
From: Jesper Juhl <jj@chaosbits.net>
Date: Tue, 25 Jan 2011 15:07:24 -0800
Subject: [PATCH] --- yaml --- r: 232411 b: refs/heads/master c:
 8dba474f034c322d96ada39cb20cac711d80dcb2 h: refs/heads/master i:   232409:
 8974c422b78cbe0ea51bcd738420ac51ebd1e8df   232407:
 6fc1a702acf7913163011ff32806ec1c4aca21ef v: v3

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

diff --git a/[refs] b/[refs]
index e42f21fb17d6..4802d1ea26ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ff754fa8f416e82327f2d8f1354a033b66286df
+refs/heads/master: 8dba474f034c322d96ada39cb20cac711d80dcb2
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index db76ef726293..4fcf47a62550 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -2292,9 +2292,10 @@ static int mem_cgroup_move_parent(struct page_cgroup *pc,
 	ret = mem_cgroup_move_account(pc, child, parent, true, charge);
 	if (ret)
 		mem_cgroup_cancel_charge(parent, charge);
-put_back:
+
 	if (charge > PAGE_SIZE)
 		compound_unlock_irqrestore(page, flags);
+put_back:
 	putback_lru_page(page);
 put:
 	put_page(page);