---

yaml --- r: 83069 b: refs/heads/master c: 698dd4b h: refs/heads/master i: 83067: 8b2e784 v: v3
git-mirror · Feb 5, 2008 · e58c728 · e58c728
1 parent a3e8b5d
commit e58c728
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
  */