2 files changed, 4 insertions, 3 deletions

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 5b2c6875fc38..46f96c23cc27 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -804,7 +804,7 @@ int do_huge_pmd_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
                 return VM_FAULT_OOM;
         if (unlikely(khugepaged_enter(vma, vma->vm_flags)))
                 return VM_FAULT_OOM;
-        if (!(flags & FAULT_FLAG_WRITE) &&
+        if (!(flags & FAULT_FLAG_WRITE) && !mm_forbids_zeropage(mm) &&
                         transparent_hugepage_use_zero_page()) {
                 spinlock_t *ptl;
                 pgtable_t pgtable;
@@ -1399,7 +1399,8 @@ int zap_huge_pmd(struct mmu_gather *tlb, struct vm_area_struct *vma,
                  * pgtable_trans_huge_withdraw after finishing pmdp related
                  * operations.
                  */
-                orig_pmd = pmdp_get_and_clear(tlb->mm, addr, pmd);
+                orig_pmd = pmdp_get_and_clear_full(tlb->mm, addr, pmd,
+                                                   tlb->fullmm);
                 tlb_remove_pmd_tlb_entry(tlb, pmd, addr);
                 pgtable = pgtable_trans_huge_withdraw(tlb->mm, pmd);
                 if (is_huge_zero_pmd(orig_pmd)) {
diff --git a/mm/memory.c b/mm/memory.c
index 0b3f6c71620d..4b5a282e1107 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -2627,7 +2627,7 @@ static int do_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,
                 return VM_FAULT_SIGBUS;
 
         /* Use the zero-page for reads */
-        if (!(flags & FAULT_FLAG_WRITE)) {
+        if (!(flags & FAULT_FLAG_WRITE) && !mm_forbids_zeropage(mm)) {
                 entry = pte_mkspecial(pfn_pte(my_zero_pfn(address),
                                                 vma->vm_page_prot));
                 page_table = pte_offset_map_lock(mm, pmd, address, &ptl);