|
@@ -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,
|