diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-24 04:22:21 -0400 |
| commit | 66643de455c27973ac31ad6de9f859d399916842 (patch) | |
| tree | 7ebed7f051879007d4b11d6aaa9e65a1bcb0b08f /include/linux/swap.h | |
| parent | 2c23d62abb820e19c54012520f08a198c2233a85 (diff) | |
| parent | 387e2b0439026aa738a9edca15a57e5c0bcb4dfc (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-powerpc/unistd.h
include/asm-sparc/unistd.h
include/asm-sparc64/unistd.h
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'include/linux/swap.h')
| -rw-r--r-- | include/linux/swap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/swap.h b/include/linux/swap.h index e24fa9b69cbf..aca9bfae208f 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h | |||
| @@ -295,7 +295,7 @@ static inline void disable_swap_token(void) | |||
| 295 | #define read_swap_cache_async(swp,vma,addr) NULL | 295 | #define read_swap_cache_async(swp,vma,addr) NULL |
| 296 | #define lookup_swap_cache(swp) NULL | 296 | #define lookup_swap_cache(swp) NULL |
| 297 | #define valid_swaphandles(swp, off) 0 | 297 | #define valid_swaphandles(swp, off) 0 |
| 298 | #define can_share_swap_page(p) 0 | 298 | #define can_share_swap_page(p) (page_mapcount(p) == 1) |
| 299 | #define move_to_swap_cache(p, swp) 1 | 299 | #define move_to_swap_cache(p, swp) 1 |
| 300 | #define move_from_swap_cache(p, i, m) 1 | 300 | #define move_from_swap_cache(p, i, m) 1 |
| 301 | #define __delete_from_swap_cache(p) /*NOTHING*/ | 301 | #define __delete_from_swap_cache(p) /*NOTHING*/ |