---

yaml --- r: 190187 b: refs/heads/master c: 93d5c9b h: refs/heads/master i: 190185: d231f87 190183: 1199380 v: v3
git-mirror · Apr 24, 2010 · 8a7f0d0 · 8a7f0d0
1 parent 49dca2c
commit 8a7f0d0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;
 }