---

yaml --- r: 232411 b: refs/heads/master c: 8dba474 h: refs/heads/master i: 232409: 8974c42 232407: 6fc1a70 v: v3
git-mirror · Jan 26, 2011 · 836b962 · 836b962
1 parent 88b9598
commit 836b962
Show file tree

Hide file tree

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