mm: balloon: use general non-lru movable page feature

[mirror_ubuntu-zesty-kernel.git] / mm / migrate.c

diff --git a/mm/migrate.c b/mm/migrate.c
index 8119fdc563f8fa5303706db09bbef48b3b0c4856..f278005f609c520ef617e047580b19a6002a10c1 100644 (file)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -170,14 +170,12 @@ void putback_movable_pages(struct list_head *l)
                list_del(&page->lru);
                dec_zone_page_state(page, NR_ISOLATED_ANON +
                                page_is_file_cache(page));
-               if (unlikely(isolated_balloon_page(page))) {
-                       balloon_page_putback(page);
                /*
                 * We isolated non-lru movable page so here we can use
                 * __PageMovable because LRU page's mapping cannot have
                 * PAGE_MAPPING_MOVABLE.
                 */
-               } else if (unlikely(__PageMovable(page))) {
+               if (unlikely(__PageMovable(page))) {
                        VM_BUG_ON_PAGE(!PageIsolated(page), page);
                        lock_page(page);
                        if (PageMovable(page))
@@ -992,18 +990,6 @@ static int __unmap_and_move(struct page *page, struct page *newpage,
        if (unlikely(!trylock_page(newpage)))
                goto out_unlock;
 
-       if (unlikely(isolated_balloon_page(page))) {
-               /*
-                * A ballooned page does not need any special attention from
-                * physical to virtual reverse mapping procedures.
-                * Skip any attempt to unmap PTEs or to remap swap cache,
-                * in order to avoid burning cycles at rmap level, and perform
-                * the page migration right away (proteced by page lock).
-                */
-               rc = balloon_page_migrate(newpage, page, mode);
-               goto out_unlock_both;
-       }
-
        if (unlikely(!is_lru)) {
                rc = move_to_new_page(newpage, page, mode);
                goto out_unlock_both;
@@ -1058,8 +1044,7 @@ out:
         * list in here.
         */
        if (rc == MIGRATEPAGE_SUCCESS) {
-               if (unlikely(__is_movable_balloon_page(newpage) ||
-                               __PageMovable(newpage)))
+               if (unlikely(__PageMovable(newpage)))
                        put_page(newpage);
                else
                        putback_lru_page(newpage);