From: Matt Mackall Move is_swap_pte helper function to swapops.h for use by pagemap code Signed-off-by: Matt Mackall Cc: Dave Hansen Signed-off-by: Andrew Morton --- include/linux/swapops.h | 6 ++++++ mm/migrate.c | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff -puN include/linux/swapops.h~maps4-move-is_swap_pte include/linux/swapops.h --- a/include/linux/swapops.h~maps4-move-is_swap_pte +++ a/include/linux/swapops.h @@ -42,6 +42,12 @@ static inline pgoff_t swp_offset(swp_ent return entry.val & SWP_OFFSET_MASK(entry); } +/* check whether a pte points to a swap entry */ +static inline int is_swap_pte(pte_t pte) +{ + return !pte_none(pte) && !pte_present(pte) && !pte_file(pte); +} + /* * Convert the arch-dependent pte representation of a swp_entry_t into an * arch-independent swp_entry_t. diff -puN mm/migrate.c~maps4-move-is_swap_pte mm/migrate.c --- a/mm/migrate.c~maps4-move-is_swap_pte +++ a/mm/migrate.c @@ -115,11 +115,6 @@ int putback_lru_pages(struct list_head * return count; } -static inline int is_swap_pte(pte_t pte) -{ - return !pte_none(pte) && !pte_present(pte) && !pte_file(pte); -} - /* * Restore a potential migration pte to a working pte entry */ _