diff --git a/[refs] b/[refs]
index 912e028e7668..5e2793d03394 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c9d0bf241451a3ab7d02e1652c22b80cd7d93e8f
+refs/heads/master: f096e59e844ba3c5d5a7b54b3deafd2aeeebf921
diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h
index 1202cd3121e1..52b264563cd9 100644
--- a/trunk/include/linux/mm.h
+++ b/trunk/include/linux/mm.h
@@ -643,12 +643,9 @@ 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
-#endif
-	if (unlikely((unsigned long)mapping & PAGE_MAPPING_ANON))
+	else if (unlikely((unsigned long)mapping & PAGE_MAPPING_ANON))
 		mapping = NULL;
 	return mapping;
 }