From 29e68c0700571de3f859527eb2145497402ffb87 Mon Sep 17 00:00:00 2001
From: Christoph Lameter <clameter@sgi.com>
Date: Tue, 17 Jul 2007 04:03:33 -0700
Subject: [PATCH] --- yaml --- r: 60751 b: refs/heads/master c:
 b5fab14e5d87df4d94161ae5f5e0c8625f9ffda2 h: refs/heads/master i:   60749:
 b3052d6da5568fa6aca43064fda2267997d78ea2   60747:
 e65438b842a41b011b7dfd6f314b66693f9f7a38   60743:
 42d9557dbf533d5a9514d5ccaecfbb55358a7271   60735:
 ed90eb4721428149b1d564d58b39c8c25ec88211 v: v3

---
 [refs]                   | 2 +-
 trunk/include/linux/mm.h | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 96b19677e07f..5a7b868b4487 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a0acd820807680d2ccc4ef3448387fcdbf152c73
+refs/heads/master: b5fab14e5d87df4d94161ae5f5e0c8625f9ffda2
diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h
index 4c482a3ee870..a5c451816fdc 100644
--- a/trunk/include/linux/mm.h
+++ b/trunk/include/linux/mm.h
@@ -599,6 +599,7 @@ static inline struct address_space *page_mapping(struct page *page)
 {
 	struct address_space *mapping = page->mapping;
 
+	VM_BUG_ON(PageSlab(page));
 	if (unlikely(PageSwapCache(page)))
 		mapping = &swapper_space;
 #ifdef CONFIG_SLUB