--- v4
+++ v2
@@ -7,7 +7,7 @@
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..105915cd2eee 100644
+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)
@@ -16,18 +16,18 @@
{
- struct page *page = alloc_page(GFP_KERNEL | __GFP_ZERO);
- if (!page)
-+ struct ptdesc *ptdesc = pagetable_alloc(GFP_KERNEL | __GFP_ZERO, 0);
++ struct ptdesc *ptdesc = ptdesc_alloc(GFP_KERNEL | __GFP_ZERO, 0);
+
+ if (!ptdesc)
return NULL;
- if (!pgtable_pte_page_ctor(page)) {
- __free_page(page);
-+ if (!pagetable_pte_ctor(ptdesc)) {
-+ pagetable_free(ptdesc);
++ if (!ptdesc_pte_ctor(ptdesc)) {
++ ptdesc_free(ptdesc);
return NULL;
}
- return (pte_t *) page_address(page);
-+ return ptdesc_address(ptdesc);
++ return (pte_t *) ptdesc_address(ptdesc);
}
void pte_free_kernel(struct mm_struct *mm, pte_t *pte)
@@ -40,11 +40,11 @@
- pgtable_pte_page_dtor(page);
- __free_page(page);
-+ pagetable_pte_dtor(ptdesc);
-+ pagetable_free(ptdesc);
++ ptdesc_pte_dtor(ptdesc);
++ ptdesc_free(ptdesc);
}
void pte_free(struct mm_struct *mm, pgtable_t pte)
--
-2.40.1
+2.39.2