2 files changed, 4 insertions, 1 deletions

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 4f3ea0b1e57c..546db81820e4 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -3033,6 +3033,7 @@ unsigned long hugetlb_change_protection(struct vm_area_struct *vma,
                 if (!huge_pte_none(huge_ptep_get(ptep))) {
                         pte = huge_ptep_get_and_clear(mm, address, ptep);
                         pte = pte_mkhuge(pte_modify(pte, newprot));
+                        pte = arch_make_huge_pte(pte, vma, NULL, 0);
                         set_huge_pte_at(mm, address, ptep, pte);
                         pages++;
                 }
diff --git a/mm/migrate.c b/mm/migrate.c
index c38778610aa8..2fd8b4af4744 100644
--- a/mm/migrate.c
+++ b/mm/migrate.c
@@ -160,8 +160,10 @@ static int remove_migration_pte(struct page *new, struct vm_area_struct *vma,
         if (is_write_migration_entry(entry))
                 pte = pte_mkwrite(pte);
 #ifdef CONFIG_HUGETLB_PAGE
-        if (PageHuge(new))
+        if (PageHuge(new)) {
                 pte = pte_mkhuge(pte);
+                pte = arch_make_huge_pte(pte, vma, new, 0);
+        }
 #endif
         flush_cache_page(vma, addr, pte_pfn(pte));
         set_pte_at(mm, addr, ptep, pte);