From 8a7f0d0cb604773f19c079f1c76b5a83c69b43d6 Mon Sep 17 00:00:00 2001
From: Andrea Arcangeli <aarcange@redhat.com>
Date: Fri, 23 Apr 2010 13:17:39 -0400
Subject: [PATCH] --- yaml --- r: 190187 b: refs/heads/master c:
 93d5c9be1ddd57d4063ce463c9ac2be1e5ee14f1 h: refs/heads/master i:   190185:
 d231f87183c64de91380bb539a469ae13d664d03   190183:
 1199380abe9deb00c2321ae8fbdcd6b8bd003501 v: v3

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

diff --git a/[refs] b/[refs]
index b3c58bf8359f..88763fb94ad2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cac36f707119b792b2396aed371d6b5cdc194890
+refs/heads/master: 93d5c9be1ddd57d4063ce463c9ac2be1e5ee14f1
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
index f4ede99c8b9b..6c755de385f7 100644
--- a/trunk/mm/memcontrol.c
+++ b/trunk/mm/memcontrol.c
@@ -2429,11 +2429,11 @@ int mem_cgroup_prepare_migration(struct page *page, struct mem_cgroup **ptr)
 	}
 	unlock_page_cgroup(pc);
 
+	*ptr = mem;
 	if (mem) {
-		ret = __mem_cgroup_try_charge(NULL, GFP_KERNEL, &mem, false);
+		ret = __mem_cgroup_try_charge(NULL, GFP_KERNEL, ptr, false);
 		css_put(&mem->css);
 	}
-	*ptr = mem;
 	return ret;
 }