[PATCH] remove linux/pagemap.h from linux/swap.h

sparc can not include linux/pagemap.h because of the following circular
dependency:

asm-sparc/pgtable include linux/swap.h
linux/swap.h include now linux/pagemap.h
linux/pagemap.h include linux/mm.h
linux/mm.h include asm/pgtable.h

It needs to have the swp_entry_t type fully visible in pgtable.h,
we can't work around this using macros.

Signed-off-by: Olaf Hering <olh@suse.de>
Cc: William Lee Irwin III <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Olaf Hering and committed by Linus Torvalds 9ae5b3c7 46bdac99

+2 -1
+2 -1
include/linux/swap.h
··· 7 #include <linux/mmzone.h> 8 #include <linux/list.h> 9 #include <linux/sched.h> 10 - #include <linux/pagemap.h> 11 12 #include <asm/atomic.h> 13 #include <asm/page.h> ··· 254 255 #define si_swapinfo(val) \ 256 do { (val)->freeswap = (val)->totalswap = 0; } while (0) 257 #define free_page_and_swap_cache(page) \ 258 page_cache_release(page) 259 #define free_pages_and_swap_cache(pages, nr) \
··· 7 #include <linux/mmzone.h> 8 #include <linux/list.h> 9 #include <linux/sched.h> 10 11 #include <asm/atomic.h> 12 #include <asm/page.h> ··· 255 256 #define si_swapinfo(val) \ 257 do { (val)->freeswap = (val)->totalswap = 0; } while (0) 258 + /* only sparc can not include linux/pagemap.h in this file 259 + * so leave page_cache_release and release_pages undeclared... */ 260 #define free_page_and_swap_cache(page) \ 261 page_cache_release(page) 262 #define free_pages_and_swap_cache(pages, nr) \