From 2e08f2307d8129730ed48dcf262d18335edaca5d Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Wed, 11 Oct 2006 01:21:27 -0700
Subject: [PATCH] --- yaml --- r: 39316 b: refs/heads/master c:
 b16bc64d1aed40fb9cff9187061005b2a89b5d5d h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index b8bab87cdc6e..e9d7dec45cb7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 469340236a7c9673df3e6a2425f559517f01464e
+refs/heads/master: b16bc64d1aed40fb9cff9187061005b2a89b5d5d
diff --git a/trunk/mm/rmap.c b/trunk/mm/rmap.c
index e2155d791d99..a9136d8b7577 100644
--- a/trunk/mm/rmap.c
+++ b/trunk/mm/rmap.c
@@ -576,15 +576,14 @@ void page_add_file_rmap(struct page *page)
 void page_remove_rmap(struct page *page)
 {
 	if (atomic_add_negative(-1, &page->_mapcount)) {
-#ifdef CONFIG_DEBUG_VM
 		if (unlikely(page_mapcount(page) < 0)) {
 			printk (KERN_EMERG "Eeek! page_mapcount(page) went negative! (%d)\n", page_mapcount(page));
 			printk (KERN_EMERG "  page->flags = %lx\n", page->flags);
 			printk (KERN_EMERG "  page->count = %x\n", page_count(page));
 			printk (KERN_EMERG "  page->mapping = %p\n", page->mapping);
+			BUG();
 		}
-#endif
-		BUG_ON(page_mapcount(page) < 0);
+
 		/*
 		 * It would be tidy to reset the PageAnon mapping here,
 		 * but that might overwrite a racing page_add_anon_rmap