2 files changed, 17 insertions, 7 deletions

diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
index dc98e3844a0a..23d3291a3e81 100644
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -489,14 +489,17 @@ srmmu_pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address)
         return (pte_t *)srmmu_get_nocache(PTE_SIZE, PTE_SIZE);
 }
 
-static struct page *
+static pgtable_t
 srmmu_pte_alloc_one(struct mm_struct *mm, unsigned long address)
 {
         unsigned long pte;
+        struct page *page;
 
         if ((pte = (unsigned long)srmmu_pte_alloc_one_kernel(mm, address)) == 0)
                 return NULL;
-        return pfn_to_page( __nocache_pa(pte) >> PAGE_SHIFT );
+        page = pfn_to_page( __nocache_pa(pte) >> PAGE_SHIFT );
+        pgtable_page_ctor(page);
+        return page;
 }
 
 static void srmmu_free_pte_fast(pte_t *pte)
@@ -504,10 +507,11 @@ static void srmmu_free_pte_fast(pte_t *pte)
         srmmu_free_nocache((unsigned long)pte, PTE_SIZE);
 }
 
-static void srmmu_pte_free(struct page *pte)
+static void srmmu_pte_free(pgtable_t pte)
 {
         unsigned long p;
 
+        pgtable_page_dtor(pte);
         p = (unsigned long)page_address(pte);   /* Cached address (for test) */
         if (p == 0)
                 BUG();
diff --git a/arch/sparc/mm/sun4c.c b/arch/sparc/mm/sun4c.c
index 0729305f2f59..c0442e8c4b15 100644
--- a/arch/sparc/mm/sun4c.c
+++ b/arch/sparc/mm/sun4c.c
@@ -1947,12 +1947,17 @@ static pte_t *sun4c_pte_alloc_one_kernel(struct mm_struct *mm, unsigned long add
         return pte;
 }
 
-static struct page *sun4c_pte_alloc_one(struct mm_struct *mm, unsigned long address)
+static pgtable_t sun4c_pte_alloc_one(struct mm_struct *mm, unsigned long address)
 {
-        pte_t *pte = sun4c_pte_alloc_one_kernel(mm, address);
+        pte_t *pte;
+        struct page *page;
+
+        pte = sun4c_pte_alloc_one_kernel(mm, address);
         if (pte == NULL)
                 return NULL;
-        return virt_to_page(pte);
+        page = virt_to_page(pte);
+        pgtable_page_ctor(page);
+        return page;
 }
 
 static inline void sun4c_free_pte_fast(pte_t *pte)
@@ -1962,8 +1967,9 @@ static inline void sun4c_free_pte_fast(pte_t *pte)
         pgtable_cache_size++;
 }
 
-static void sun4c_pte_free(struct page *pte)
+static void sun4c_pte_free(pgtable_t pte)
 {
+        pgtable_page_dtor(pte);
         sun4c_free_pte_fast(page_address(pte));
 }