diff --git a/[refs] b/[refs]
index f87adee63bd8..52163f3a8e36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1cdf25d704f7951d02a04064c97db547d6021872
+refs/heads/master: 726b80127239aeea9c8d8aad5b4e2c80313e3ce8
diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h
index 24659ed06bae..4f3c1b2f44de 100644
--- a/trunk/include/linux/mm.h
+++ b/trunk/include/linux/mm.h
@@ -605,9 +605,12 @@ static inline struct address_space *page_mapping(struct page *page)
 	struct address_space *mapping = page->mapping;
 
 	VM_BUG_ON(PageSlab(page));
+#ifdef CONFIG_SWAP
 	if (unlikely(PageSwapCache(page)))
 		mapping = &swapper_space;
-	else if (unlikely((unsigned long)mapping & PAGE_MAPPING_ANON))
+	else
+#endif
+	if (unlikely((unsigned long)mapping & PAGE_MAPPING_ANON))
 		mapping = NULL;
 	return mapping;
 }