From e58c7286da2904b409c217a28bd44a6a1f11ac6f Mon Sep 17 00:00:00 2001
From: Matt Mackall <mpm@selenic.com>
Date: Mon, 4 Feb 2008 22:29:00 -0800
Subject: [PATCH] --- yaml --- r: 83069 b: refs/heads/master c:
 698dd4ba6b12e34e1e432c944c01478c0b2cd773 h: refs/heads/master i:   83067:
 8b2e7841b1b44045f4d871b88677c65c190e5f18 v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/swapops.h | 6 ++++++
 trunk/mm/migrate.c            | 5 -----
 3 files changed, 7 insertions(+), 6 deletions(-)

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
  */