--- v2
+++ v3
@@ -2,7 +2,7 @@
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>
@@ -11,7 +11,7 @@
1 file changed, 27 insertions(+), 19 deletions(-)
diff --git a/arch/x86/mm/pgtable.c b/arch/x86/mm/pgtable.c
-index afab0bc7862b..9b6f81c8eb32 100644
+index e4f499eb0f29..79681557fce6 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,8 +91,8 @@
- 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);
}
}
@@ -103,15 +103,15 @@
- 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;
}
@@ -129,10 +129,10 @@
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