---

yaml --- r: 94009 b: refs/heads/master c: 726b801 h: refs/heads/master i: 94007: 13c7b55 v: v3
git-mirror · Apr 28, 2008 · 0af75f4 · 0af75f4
1 parent 2f3938a
commit 0af75f4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git 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
@@ -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;
 }