From ed9113a5ab69d817fc1386ac5eaff5f4d710c96a Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh@veritas.com>
Date: Thu, 21 Jun 2007 23:27:45 +0100
Subject: [PATCH] --- yaml --- r: 57937 b: refs/heads/master c:
 b9bae3402572dc50a1e084c5b1ae5117918ef0f0 h: refs/heads/master i:   57935:
 1f7bc3a109be6fb5c86a46abb073035dc3435c77 v: v3

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

diff --git a/[refs] b/[refs]
index c2cc12e3e36a..db753f0a65a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1518a088bde6aea49e7c472ed6ab96178fcba3e
+refs/heads/master: b9bae3402572dc50a1e084c5b1ae5117918ef0f0
diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h
index e4183c6c7de3..1c1207472bb4 100644
--- a/trunk/include/linux/mm.h
+++ b/trunk/include/linux/mm.h
@@ -603,6 +603,10 @@ static inline struct address_space *page_mapping(struct page *page)
 
 	if (unlikely(PageSwapCache(page)))
 		mapping = &swapper_space;
+#ifdef CONFIG_SLUB
+	else if (unlikely(PageSlab(page)))
+		mapping = NULL;
+#endif
 	else if (unlikely((unsigned long)mapping & PAGE_MAPPING_ANON))
 		mapping = NULL;
 	return mapping;