1 files changed, 3 insertions, 2 deletions

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 68a3c93036f6..a863af26c79c 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -1024,9 +1024,10 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,
         if (__pmd_trans_huge_lock(pmd, vma) == 1) {
                 struct page *page;
                 pgtable_t pgtable;
+                pmd_t orig_pmd;
                 pgtable = pgtable_trans_huge_withdraw(tlb->mm);
-                page = pmd_page(*pmd);
-                pmd_clear(pmd);
+                orig_pmd = pmdp_get_and_clear(tlb->mm, addr, pmd);
+                page = pmd_page(orig_pmd);
                 tlb_remove_pmd_tlb_entry(tlb, pmd, addr);
                 page_remove_rmap(page);
                 VM_BUG_ON(page_mapcount(page) < 0);