ARM: dts: add support for TX6S with LVDS output

[karo-tx-linux.git] / mm / migrate.c

diff --git a/mm/migrate.c b/mm/migrate.c
index 63f0cd5599997ef8d1a42110c1fc9ccd6d920ac1..be6dbf995c0cea7128fa58124057d8891cfa7933 100644 (file)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -120,8 +120,6 @@ static int remove_migration_pte(struct page *new, struct vm_area_struct *vma,
                pmd = mm_find_pmd(mm, addr);
                if (!pmd)
                        goto out;
-               if (pmd_trans_huge(*pmd))
-                       goto out;
 
                ptep = pte_offset_map(pmd, addr);
 
@@ -990,9 +988,10 @@ out:
         * it.  Otherwise, putback_lru_page() will drop the reference grabbed
         * during isolation.
         */
-       if (rc != MIGRATEPAGE_SUCCESS && put_new_page)
+       if (rc != MIGRATEPAGE_SUCCESS && put_new_page) {
+               ClearPageSwapBacked(newpage);
                put_new_page(newpage, private);
-       else
+       } else
                putback_lru_page(newpage);
 
        if (result) {