aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/mm.h
diff options
context:
space:
mode:
authorHuang Shijie <shijie8@gmail.com>2009-12-14 20:59:51 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-15 11:53:22 -0500
commitf096e59e844ba3c5d5a7b54b3deafd2aeeebf921 (patch)
tree8d48bf8456ba98a1f9fe372b7550b2996162da3b /include/linux/mm.h
parentc9d0bf241451a3ab7d02e1652c22b80cd7d93e8f (diff)
include/linux/mm.h: remove unneeded ifdef
The check code for CONFIG_SWAP is redundant, because there is a non-CONFIG_SWAP version for PageSwapCache() which just returns 0. Signed-off-by: Huang Shijie <shijie8@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/mm.h')
-rw-r--r--include/linux/mm.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 1202cd3121e1..52b264563cd9 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -643,12 +643,9 @@ static inline struct address_space *page_mapping(struct page *page)
643 struct address_space *mapping = page->mapping; 643 struct address_space *mapping = page->mapping;
644 644
645 VM_BUG_ON(PageSlab(page)); 645 VM_BUG_ON(PageSlab(page));
646#ifdef CONFIG_SWAP
647 if (unlikely(PageSwapCache(page))) 646 if (unlikely(PageSwapCache(page)))
648 mapping = &swapper_space; 647 mapping = &swapper_space;
649 else 648 else if (unlikely((unsigned long)mapping & PAGE_MAPPING_ANON))
650#endif
651 if (unlikely((unsigned long)mapping & PAGE_MAPPING_ANON))
652 mapping = NULL; 649 mapping = NULL;
653 return mapping; 650 return mapping;
654} 651}