Merge Linus' tree.

1 files changed, 22 insertions, 0 deletions

diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h
index 47762ca695a5..49cc68af01f8 100644
--- a/include/linux/mm_inline.h
+++ b/include/linux/mm_inline.h
@@ -38,3 +38,25 @@ del_page_from_lru(struct zone *zone, struct page *page)
                 zone->nr_inactive--;
         }
 }
+
+/*
+ * Isolate one page from the LRU lists.
+ *
+ * - zone->lru_lock must be held
+ */
+static inline int __isolate_lru_page(struct page *page)
+{
+        if (unlikely(!TestClearPageLRU(page)))
+                return 0;
+
+        if (get_page_testone(page)) {
+                /*
+                 * It is being freed elsewhere
+                 */
+                __put_page(page);
+                SetPageLRU(page);
+                return -ENOENT;
+        }
+
+        return 1;
+}