diff --git a/[refs] b/[refs] index a3a5af375a7b..a0360f251953 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 824552574162ac00ae636fa41386b1072379ea4a +refs/heads/master: 698dd4ba6b12e34e1e432c944c01478c0b2cd773 diff --git a/trunk/include/linux/swapops.h b/trunk/include/linux/swapops.h index ceb6cc5ceebb..7bf2d149d209 100644 --- a/trunk/include/linux/swapops.h +++ b/trunk/include/linux/swapops.h @@ -42,6 +42,12 @@ static inline pgoff_t swp_offset(swp_entry_t entry) 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 --git a/trunk/mm/migrate.c b/trunk/mm/migrate.c index 6a207e8d17ea..4ee4ccacf986 100644 --- a/trunk/mm/migrate.c +++ b/trunk/mm/migrate.c @@ -115,11 +115,6 @@ int putback_lru_pages(struct list_head *l) 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 */