From 803c3205094a23345bd52e087957b854c362e670 Mon Sep 17 00:00:00 2001
From: Johannes Weiner <jweiner@redhat.com>
Date: Thu, 12 Jan 2012 17:18:45 -0800
Subject: [PATCH] --- yaml --- r: 284381 b: refs/heads/master c:
 40f23a21a8501c1b2c65c50c19b516488ac31313 h: refs/heads/master i:   284379:
 fc7c1c5ffa9751b3ecee85ccbcd69fe89247cdc8 v: v3

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

diff --git a/[refs] b/[refs]
index 262e734a6352..44b051098784 100644
--- 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
index 2450d89486d4..71a9774e6ead 100644
--- 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);
 }