Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7c414164 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds
Browse files

dax: revert userfaultfd change 



Undo the change which "userfaultfd: call handle_userfault() for
userfaultfd_missing() faults" made to set_huge_zero_page().  DAX will
need that return value.

Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Matthew Wilcox <willy@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c94c2acf

mm/huge_memory.c

+4 −1
Original line number Diff line number Diff line
@@ -794,16 +794,19 @@ static inline gfp_t alloc_hugepage_gfpmask(int defrag, gfp_t extra_gfp) 
}



/* Caller must hold page table lock. */

static void set_huge_zero_page(pgtable_t pgtable, struct mm_struct *mm,

static bool set_huge_zero_page(pgtable_t pgtable, struct mm_struct *mm,

		struct vm_area_struct *vma, unsigned long haddr, pmd_t *pmd,

		struct page *zero_page)

{

	pmd_t entry;

	if (!pmd_none(*pmd))

		return false;

	entry = mk_pmd(zero_page, vma->vm_page_prot);

	entry = pmd_mkhuge(entry);

	pgtable_trans_huge_deposit(mm, pmd, pgtable);

	set_pmd_at(mm, haddr, pmd, entry);

	atomic_long_inc(&mm->nr_ptes);

	return true;

}



int do_huge_pmd_anonymous_page(struct mm_struct *mm, struct vm_area_struct *vma,