--- v9
+++ v4
@@ -1,45 +1,40 @@
Part of the conversions to replace pgtable constructor/destructors with
ptdesc equivalents. Also cleans up some spacing issues.
-Acked-by: Mike Rapoport (IBM) <rppt@kernel.org>
Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
+Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
+Acked-by: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
---
- arch/um/include/asm/pgalloc.h | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
+ arch/sh/include/asm/pgalloc.h | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
-diff --git a/arch/um/include/asm/pgalloc.h b/arch/um/include/asm/pgalloc.h
-index 8ec7cd46dd96..de5e31c64793 100644
---- a/arch/um/include/asm/pgalloc.h
-+++ b/arch/um/include/asm/pgalloc.h
-@@ -25,19 +25,19 @@
- */
- extern pgd_t *pgd_alloc(struct mm_struct *);
+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
--#define __pte_free_tlb(tlb,pte, address) \
++#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)));
+ }
+
+-#define __pte_free_tlb(tlb,pte,addr) \
-do { \
- pgtable_pte_page_dtor(pte); \
-- tlb_remove_page((tlb),(pte)); \
-+#define __pte_free_tlb(tlb, pte, address) \
+- 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)
- #ifdef CONFIG_3_LEVEL_PGTABLES
-
--#define __pmd_free_tlb(tlb, pmd, address) \
--do { \
-- pgtable_pmd_page_dtor(virt_to_page(pmd)); \
-- tlb_remove_page((tlb),virt_to_page(pmd)); \
--} while (0) \
-+#define __pmd_free_tlb(tlb, pmd, address) \
-+do { \
-+ pagetable_pmd_dtor(virt_to_ptdesc(pmd)); \
-+ tlb_remove_page_ptdesc((tlb), virt_to_ptdesc(pmd)); \
-+} while (0)
-
- #endif
-
+ #endif /* __ASM_SH_PGALLOC_H */
--
2.40.1