--- v1
+++ v6
@@ -2,16 +2,16 @@
 functions to use ptdescs.
 
 Some of the functions use the *get*page*() helper functions. Convert
-these to use ptdesc_alloc() and ptdesc_address() instead to help
+these to use pagetable_alloc() and ptdesc_address() instead to help
 standardize page tables further.
 
 Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
 ---
- arch/x86/mm/pgtable.c | 46 +++++++++++++++++++++++++------------------
- 1 file changed, 27 insertions(+), 19 deletions(-)
+ arch/x86/mm/pgtable.c | 47 ++++++++++++++++++++++++++-----------------
+ 1 file changed, 28 insertions(+), 19 deletions(-)
 
 diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
-index afab0bc7862b..9b6f81c8eb32 100644
+index 15a8009a4480..d3a93e8766ee 100644
 --- a/arch/x86/mm/pgtable.c
 +++ b/arch/x86/mm/pgtable.c
 @@ -52,7 +52,7 @@ early_param("userpte", setup_userpte);
@@ -19,7 +19,7 @@
  void ___pte_free_tlb(struct mmu_gather *tlb, struct page *pte)
  {
 -	pgtable_pte_page_dtor(pte);
-+	ptdesc_pte_dtor(page_ptdesc(pte));
++	pagetable_pte_dtor(page_ptdesc(pte));
  	paravirt_release_pte(page_to_pfn(pte));
  	paravirt_tlb_remove_table(tlb, pte);
  }
@@ -38,7 +38,7 @@
  #endif
 -	pgtable_pmd_page_dtor(page);
 -	paravirt_tlb_remove_table(tlb, page);
-+	ptdesc_pmd_dtor(ptdesc);
++	pagetable_pmd_dtor(ptdesc);
 +	paravirt_tlb_remove_table(tlb, ptdesc_page(ptdesc));
  }
  
@@ -91,50 +91,53 @@
 -			free_page((unsigned long)pmds[i]);
 +			ptdesc = virt_to_ptdesc(pmds[i]);
 +
-+			ptdesc_pmd_dtor(ptdesc);
-+			ptdesc_free(ptdesc);
++			pagetable_pmd_dtor(ptdesc);
++			pagetable_free(ptdesc);
  			mm_dec_nr_pmds(mm);
  		}
  }
-@@ -232,16 +235,21 @@ static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[], int count)
+@@ -230,18 +233,24 @@ static int preallocate_pmds(struct mm_struct *mm, pmd_t *pmds[], int count)
+ 
+ 	if (mm == &init_mm)
  		gfp &= ~__GFP_ACCOUNT;
++	gfp &= ~__GFP_HIGHMEM;
  
  	for (i = 0; i < count; i++) {
 -		pmd_t *pmd = (pmd_t *)__get_free_page(gfp);
 -		if (!pmd)
 +		pmd_t *pmd = NULL;
-+		struct ptdesc *ptdesc = ptdesc_alloc(gfp, 0);
++		struct ptdesc *ptdesc = pagetable_alloc(gfp, 0);
 +
 +		if (!ptdesc)
  			failed = true;
 -		if (pmd && !pgtable_pmd_page_ctor(virt_to_page(pmd))) {
 -			free_page((unsigned long)pmd);
 -			pmd = NULL;
-+		if (ptdesc && !ptdesc_pmd_ctor(ptdesc)) {
-+			ptdesc_free(ptdesc);
++		if (ptdesc && !pagetable_pmd_ctor(ptdesc)) {
++			pagetable_free(ptdesc);
 +			ptdesc = NULL;
  			failed = true;
  		}
 -		if (pmd)
 +		if (ptdesc) {
  			mm_inc_nr_pmds(mm);
-+			pmd = (pmd_t *)ptdesc_address(ptdesc);
++			pmd = ptdesc_address(ptdesc);
 +		}
 +
  		pmds[i] = pmd;
  	}
  
-@@ -838,7 +846,7 @@ int pud_free_pmd_page(pud_t *pud, unsigned long addr)
+@@ -830,7 +839,7 @@ int pud_free_pmd_page(pud_t *pud, unsigned long addr)
  
  	free_page((unsigned long)pmd_sv);
  
 -	pgtable_pmd_page_dtor(virt_to_page(pmd));
-+	ptdesc_pmd_dtor(virt_to_ptdesc(pmd));
++	pagetable_pmd_dtor(virt_to_ptdesc(pmd));
  	free_page((unsigned long)pmd);
  
  	return 1;
 -- 
-2.39.2
+2.40.1
 
 
 _______________________________________________