As part of the conversions to replace pgtable constructor/destructors with
ptdesc equivalents, convert various page table functions to use ptdescs.

Signed-off-by: Vishal Moola (Oracle) <vishal.mo...@gmail.com>
---
 arch/sparc/mm/init_64.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
index 04f9db0c3111..eedb3e03b1fe 100644
--- a/arch/sparc/mm/init_64.c
+++ b/arch/sparc/mm/init_64.c
@@ -2893,14 +2893,15 @@ pte_t *pte_alloc_one_kernel(struct mm_struct *mm)
 
 pgtable_t pte_alloc_one(struct mm_struct *mm)
 {
-       struct page *page = alloc_page(GFP_KERNEL | __GFP_ZERO);
-       if (!page)
+       struct ptdesc *ptdesc = ptdesc_alloc(GFP_KERNEL | __GFP_ZERO, 0);
+
+       if (!ptdesc)
                return NULL;
-       if (!pgtable_pte_page_ctor(page)) {
-               __free_page(page);
+       if (!ptdesc_pte_ctor(ptdesc)) {
+               ptdesc_free(ptdesc);
                return NULL;
        }
-       return (pte_t *) page_address(page);
+       return (pte_t *) ptdesc_address(ptdesc);
 }
 
 void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
@@ -2910,10 +2911,10 @@ void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
 
 static void __pte_free(pgtable_t pte)
 {
-       struct page *page = virt_to_page(pte);
+       struct ptdesc *ptdesc = virt_to_ptdesc(pte);
 
-       pgtable_pte_page_dtor(page);
-       __free_page(page);
+       ptdesc_pte_dtor(ptdesc);
+       ptdesc_free(ptdesc);
 }
 
 void pte_free(struct mm_struct *mm, pgtable_t pte)
-- 
2.39.2

Reply via email to