--- v6
+++ v4
@@ -1,51 +1,40 @@
-As part of the conversions to replace pgtable constructor/destructors with
-ptdesc equivalents, convert various page table functions to use ptdescs.
+Part of the conversions to replace pgtable constructor/destructors with
+ptdesc equivalents. Also cleans up some spacing issues.
Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
-Acked-by: Mike Rapoport (IBM) <rppt@kernel.org>
+Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
+Acked-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
---
- arch/sparc/mm/init_64.c | 17 +++++++++--------
- 1 file changed, 9 insertions(+), 8 deletions(-)
+ arch/sh/include/asm/pgalloc.h | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
-diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
-index 04f9db0c3111..105915cd2eee 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)
+diff --git a/arch/sh/include/asm/pgalloc.h b/arch/sh/include/asm/pgalloc.h
+index a9e98233c4d4..5d8577ab1591 100644
+--- a/arch/sh/include/asm/pgalloc.h
++++ b/arch/sh/include/asm/pgalloc.h
+@@ -2,6 +2,7 @@
+ #ifndef __ASM_SH_PGALLOC_H
+ #define __ASM_SH_PGALLOC_H
- pgtable_t pte_alloc_one(struct mm_struct *mm)
- {
-- struct page *page = alloc_page(GFP_KERNEL | __GFP_ZERO);
-- if (!page)
-+ struct ptdesc *ptdesc = pagetable_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);
- return NULL;
- }
-- return (pte_t *) page_address(page);
-+ return ptdesc_address(ptdesc);
++#include <linux/mm.h>
+ #include <asm/page.h>
+
+ #define __HAVE_ARCH_PMD_ALLOC_ONE
+@@ -31,10 +32,10 @@ static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd,
+ set_pmd(pmd, __pmd((unsigned long)page_address(pte)));
}
- 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)
+-#define __pte_free_tlb(tlb,pte,addr) \
+-do { \
+- pgtable_pte_page_dtor(pte); \
+- tlb_remove_page((tlb), (pte)); \
++#define __pte_free_tlb(tlb, pte, addr) \
++do { \
++ pagetable_pte_dtor(page_ptdesc(pte)); \
++ tlb_remove_page_ptdesc((tlb), (page_ptdesc(pte))); \
+ } while (0)
- 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);
-+ pagetable_pte_dtor(ptdesc);
-+ pagetable_free(ptdesc);
- }
-
- void pte_free(struct mm_struct *mm, pgtable_t pte)
+ #endif /* __ASM_SH_PGALLOC_H */
--
2.40.1