diff options
Diffstat (limited to 'include/linux/swap.h')
-rw-r--r-- | include/linux/swap.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/swap.h b/include/linux/swap.h index 2343f999e6e1..bfe3e763ccf2 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h | |||
@@ -7,6 +7,7 @@ | |||
7 | #include <linux/mmzone.h> | 7 | #include <linux/mmzone.h> |
8 | #include <linux/list.h> | 8 | #include <linux/list.h> |
9 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
10 | |||
10 | #include <asm/atomic.h> | 11 | #include <asm/atomic.h> |
11 | #include <asm/page.h> | 12 | #include <asm/page.h> |
12 | 13 | ||
@@ -148,7 +149,7 @@ struct swap_list_t { | |||
148 | #define vm_swap_full() (nr_swap_pages*2 < total_swap_pages) | 149 | #define vm_swap_full() (nr_swap_pages*2 < total_swap_pages) |
149 | 150 | ||
150 | /* linux/mm/oom_kill.c */ | 151 | /* linux/mm/oom_kill.c */ |
151 | extern void out_of_memory(unsigned int __nocast gfp_mask); | 152 | extern void out_of_memory(unsigned int __nocast gfp_mask, int order); |
152 | 153 | ||
153 | /* linux/mm/memory.c */ | 154 | /* linux/mm/memory.c */ |
154 | extern void swapin_readahead(swp_entry_t, unsigned long, struct vm_area_struct *); | 155 | extern void swapin_readahead(swp_entry_t, unsigned long, struct vm_area_struct *); |
@@ -253,6 +254,8 @@ static inline void put_swap_token(struct mm_struct *mm) | |||
253 | 254 | ||
254 | #define si_swapinfo(val) \ | 255 | #define si_swapinfo(val) \ |
255 | do { (val)->freeswap = (val)->totalswap = 0; } while (0) | 256 | do { (val)->freeswap = (val)->totalswap = 0; } while (0) |
257 | /* only sparc can not include linux/pagemap.h in this file | ||
258 | * so leave page_cache_release and release_pages undeclared... */ | ||
256 | #define free_page_and_swap_cache(page) \ | 259 | #define free_page_and_swap_cache(page) \ |
257 | page_cache_release(page) | 260 | page_cache_release(page) |
258 | #define free_pages_and_swap_cache(pages, nr) \ | 261 | #define free_pages_and_swap_cache(pages, nr) \ |