Commit d2cf5ad6 authored by Joonsoo Kim's avatar Joonsoo Kim Committed by Linus Torvalds

swap: clean-up #ifdef in page_mapping()

PageSwapCache() is always false when !CONFIG_SWAP, so compiler
properly discard related code. Therefore, we don't need #ifdef explicitly.
Signed-off-by: default avatarJoonsoo Kim <iamjoonsoo.kim@lge.com>
Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Rik van Riel <riel@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent bc4b4448
...@@ -447,6 +447,7 @@ mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, bool swapout) ...@@ -447,6 +447,7 @@ mem_cgroup_uncharge_swapcache(struct page *page, swp_entry_t ent, bool swapout)
#else /* CONFIG_SWAP */ #else /* CONFIG_SWAP */
#define swap_address_space(entry) (NULL)
#define get_nr_swap_pages() 0L #define get_nr_swap_pages() 0L
#define total_swap_pages 0L #define total_swap_pages 0L
#define total_swapcache_pages() 0UL #define total_swapcache_pages() 0UL
......
...@@ -388,15 +388,12 @@ struct address_space *page_mapping(struct page *page) ...@@ -388,15 +388,12 @@ struct address_space *page_mapping(struct page *page)
struct address_space *mapping = page->mapping; struct address_space *mapping = page->mapping;
VM_BUG_ON(PageSlab(page)); VM_BUG_ON(PageSlab(page));
#ifdef CONFIG_SWAP
if (unlikely(PageSwapCache(page))) { if (unlikely(PageSwapCache(page))) {
swp_entry_t entry; swp_entry_t entry;
entry.val = page_private(page); entry.val = page_private(page);
mapping = swap_address_space(entry); mapping = swap_address_space(entry);
} else } else if ((unsigned long)mapping & PAGE_MAPPING_ANON)
#endif
if ((unsigned long)mapping & PAGE_MAPPING_ANON)
mapping = NULL; mapping = NULL;
return mapping; return mapping;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment