---

yaml --- r: 284381 b: refs/heads/master c: 40f23a2 h: refs/heads/master i: 284379: fc7c1c5 v: v3
git-mirror · Jan 13, 2012 · 803c320 · 803c320
1 parent c4c1fc9
commit 803c320
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7a0524cfc8f9f585471a31b1282a9ce4a1a7d444
+refs/heads/master: 40f23a21a8501c1b2c65c50c19b516488ac31313
diff --git a/trunk/mm/memcontrol.c b/trunk/mm/memcontrol.c
@@ -3061,8 +3061,7 @@ void mem_cgroup_uncharge_page(struct page *page)
 	/* early check. */
 	if (page_mapped(page))
 		return;
-	if (page->mapping && !PageAnon(page))
-		return;
+	VM_BUG_ON(page->mapping && !PageAnon(page));
 	__mem_cgroup_uncharge_common(page, MEM_CGROUP_CHARGE_TYPE_MAPPED);
 }