mm, compaction: add per-zone migration pfn cache for async compaction

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

diff --git a/mm/fremap.c b/mm/fremap.c
index 34feba60a17e6dce30b2cdfa929926ad5a450bee..2c5646f11f41a87d11d5970bfe1c433535fd4ebb 100644 (file)
--- a/mm/fremap.c
+++ b/mm/fremap.c
@@ -82,13 +82,10 @@ static int install_file_pte(struct mm_struct *mm, struct vm_area_struct *vma,
 
        ptfile = pgoff_to_pte(pgoff);
 
-       if (!pte_none(*pte)) {
-               if (pte_present(*pte) && pte_soft_dirty(*pte))
-                       pte_file_mksoft_dirty(ptfile);
+       if (!pte_none(*pte))
                zap_pte(mm, vma, addr, pte);
-       }
 
-       set_pte_at(mm, addr, pte, ptfile);
+       set_pte_at(mm, addr, pte, pte_file_mksoft_dirty(ptfile));
        /*
         * We don't need to run update_mmu_cache() here because the "file pte"
         * being installed by install_file_pte() is not a real pte - it's a