--- v6
+++ v3
@@ -1,73 +1,30 @@
-As part of the conversions to replace pgtable constructor/destructors with
-ptdesc equivalents, convert various page table functions to use ptdescs.
-
-Some of the functions use the *get*page*() helper functions. Convert
-these to use pagetable_alloc() and ptdesc_address() instead to help
-standardize page tables further.
+Part of the conversions to replace pgtable constructor/destructors with
+ptdesc equivalents.
Signed-off-by: Vishal Moola (Oracle) <vishal.moola@gmail.com>
-Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
-Acked-by: Mike Rapoport (IBM) <rppt@kernel.org>
---
- arch/riscv/include/asm/pgalloc.h | 8 ++++----
- arch/riscv/mm/init.c | 16 ++++++----------
- 2 files changed, 10 insertions(+), 14 deletions(-)
+ arch/openrisc/include/asm/pgalloc.h | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
-diff --git a/arch/riscv/include/asm/pgalloc.h b/arch/riscv/include/asm/pgalloc.h
-index 59dc12b5b7e8..d169a4f41a2e 100644
---- a/arch/riscv/include/asm/pgalloc.h
-+++ b/arch/riscv/include/asm/pgalloc.h
-@@ -153,10 +153,10 @@ static inline pgd_t *pgd_alloc(struct mm_struct *mm)
+diff --git a/arch/openrisc/include/asm/pgalloc.h b/arch/openrisc/include/asm/pgalloc.h
+index b7b2b8d16fad..c6a73772a546 100644
+--- a/arch/openrisc/include/asm/pgalloc.h
++++ b/arch/openrisc/include/asm/pgalloc.h
+@@ -66,10 +66,10 @@ extern inline pgd_t *pgd_alloc(struct mm_struct *mm)
- #endif /* __PAGETABLE_PMD_FOLDED */
+ extern pte_t *pte_alloc_one_kernel(struct mm_struct *mm);
--#define __pte_free_tlb(tlb, pte, buf) \
--do { \
-- pgtable_pte_page_dtor(pte); \
-- tlb_remove_page((tlb), pte); \
-+#define __pte_free_tlb(tlb, pte, buf) \
-+do { \
-+ pagetable_pte_dtor(page_ptdesc(pte)); \
-+ tlb_remove_page_ptdesc((tlb), page_ptdesc(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)
- #endif /* CONFIG_MMU */
-diff --git a/arch/riscv/mm/init.c b/arch/riscv/mm/init.c
-index 4b95d8999120..efff9c752fcf 100644
---- a/arch/riscv/mm/init.c
-+++ b/arch/riscv/mm/init.c
-@@ -354,12 +354,10 @@ static inline phys_addr_t __init alloc_pte_fixmap(uintptr_t va)
-
- static phys_addr_t __init alloc_pte_late(uintptr_t va)
- {
-- unsigned long vaddr;
--
-- vaddr = __get_free_page(GFP_KERNEL);
-- BUG_ON(!vaddr || !pgtable_pte_page_ctor(virt_to_page((void *)vaddr)));
-+ struct ptdesc *ptdesc = pagetable_alloc(GFP_KERNEL & ~__GFP_HIGHMEM, 0);
-
-- return __pa(vaddr);
-+ BUG_ON(!ptdesc || !pagetable_pte_ctor(ptdesc));
-+ return __pa((pte_t *)ptdesc_address(ptdesc));
- }
-
- static void __init create_pte_mapping(pte_t *ptep,
-@@ -437,12 +435,10 @@ static phys_addr_t __init alloc_pmd_fixmap(uintptr_t va)
-
- static phys_addr_t __init alloc_pmd_late(uintptr_t va)
- {
-- unsigned long vaddr;
--
-- vaddr = __get_free_page(GFP_KERNEL);
-- BUG_ON(!vaddr || !pgtable_pmd_page_ctor(virt_to_page((void *)vaddr)));
-+ struct ptdesc *ptdesc = pagetable_alloc(GFP_KERNEL & ~__GFP_HIGHMEM, 0);
-
-- return __pa(vaddr);
-+ BUG_ON(!ptdesc || !pagetable_pmd_ctor(ptdesc));
-+ return __pa((pmd_t *)ptdesc_address(ptdesc));
- }
-
- static void __init create_pmd_mapping(pmd_t *pmdp,
+ #endif
--
2.40.1