Merge branch 'v3.10/topic/arm64-dma' of git://git.linaro.org/kernel/linux-linaro...

[firefly-linux-kernel-4.4.55.git] / mm / migrate.c

diff --git a/mm/migrate.c b/mm/migrate.c
index bf436c15f055ea7608fde0a0a65ca029295945f3..a88c12f2235de8768bdd29063d7175510f03b45f 100644 (file)
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -1715,7 +1715,8 @@ int migrate_misplaced_transhuge_page(struct mm_struct *mm,
                putback_lru_page(page);
                mod_zone_page_state(page_zone(page),
                         NR_ISOLATED_ANON + page_lru, -HPAGE_PMD_NR);
-               goto out_fail;
+
+               goto out_unlock;
        }
 
        /*
@@ -1765,6 +1766,7 @@ out_dropref:
        set_pmd_at(mm, haddr, pmd, entry);
        update_mmu_cache_pmd(vma, address, &entry);
 
+out_unlock:
        unlock_page(page);
        put_page(page);
        return 0;