Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...

[cascardo/linux.git] / include / linux / mm_inline.h

diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h
index 49cc68a..3b6723d 100644 (file)
--- a/include/linux/mm_inline.h
+++ b/include/linux/mm_inline.h
@@ -32,31 +32,10 @@ del_page_from_lru(struct zone *zone, struct page *page)
 {
        list_del(&page->lru);
        if (PageActive(page)) {
-               ClearPageActive(page);
+               __ClearPageActive(page);
                zone->nr_active--;
        } else {
                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;
-}