diff --git a/[refs] b/[refs] index 7a5888fcc7b9..249e93ef14d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41e5a6ac80c600e1f8bda0a4871f0b797e097d78 +refs/heads/master: e6333fd4ddf7a583480017f535b9ea53c116ab81 diff --git a/trunk/include/linux/swap.h b/trunk/include/linux/swap.h index 5b1fdf1cff4f..f03c24719302 100644 --- a/trunk/include/linux/swap.h +++ b/trunk/include/linux/swap.h @@ -296,7 +296,7 @@ static inline void disable_swap_token(void) #define read_swap_cache_async(swp,vma,addr) NULL #define lookup_swap_cache(swp) NULL #define valid_swaphandles(swp, off) 0 -#define can_share_swap_page(p) 0 +#define can_share_swap_page(p) (page_mapcount(p) == 1) #define move_to_swap_cache(p, swp) 1 #define move_from_swap_cache(p, i, m) 1 #define __delete_from_swap_cache(p) /*NOTHING*/