Commit 1c2f7d14 authored by Anshuman Khandual's avatar Anshuman Khandual Committed by Linus Torvalds
Browse files

mm/thp: define default pmd_pgtable() 

Currently most platforms define pmd_pgtable() as pmd_page() duplicating
the same code all over.  Instead just define a default value i.e
pmd_page() for pmd_pgtable() and let platforms override when required via
<asm/pgtable.h>.  All the existing platform that override pmd_pgtable()
have been moved into their respective <asm/pgtable.h> header in order to
precede before the new generic definition.  This makes it much cleaner
with reduced code.

Link: https://lkml.kernel.org/r/1623646133-20306-1-git-send-email-anshuman.khandual@arm.com


Signed-off-by: default avatarAnshuman Khandual <anshuman.khandual@arm.com>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Acked-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Cc: Nick Hu <nickhu@andestech.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Guo Ren <guoren@kernel.org>
Cc: Brian Cain <bcain@codeaurora.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michal Simek <monstr@monstr.eu>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Ley Foon Tan <ley.foon.tan@intel.com>
Cc: Jonas Bonn <jonas@southpole.se>
Cc: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Cc: Stafford Horne <shorne@gmail.com>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Heiko Carstens <hca@linux.ibm.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Chris Zankel <chris@zankel.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 351de44f

arch/alpha/include/asm/pgalloc.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ pmd_populate(struct mm_struct *mm, pmd_t *pmd, pgtable_t pte) 
{

	pmd_set(pmd, (pte_t *)(page_to_pa(pte) + PAGE_OFFSET));

}

#define pmd_pgtable(pmd) pmd_page(pmd)



static inline void

pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd, pte_t *pte)

arch/arc/include/asm/pgalloc.h

+0 −2
Original line number Diff line number Diff line
@@ -129,6 +129,4 @@ static inline void pte_free(struct mm_struct *mm, pgtable_t ptep) 


#define __pte_free_tlb(tlb, pte, addr)  pte_free((tlb)->mm, pte)



#define pmd_pgtable(pmd)	((pgtable_t) pmd_page_vaddr(pmd))



#endif /* _ASM_ARC_PGALLOC_H */

arch/arc/include/asm/pgtable.h

+2 −0
Original line number Diff line number Diff line
@@ -350,6 +350,8 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, 


#define kern_addr_valid(addr)	(1)



#define pmd_pgtable(pmd)       ((pgtable_t) pmd_page_vaddr(pmd))



/*

 * remap a physical page `pfn' of size `size' with page protection `prot'

 * into virtual address `from'

arch/arm/include/asm/pgalloc.h

+0 −1
Original line number Diff line number Diff line
@@ -143,7 +143,6 @@ pmd_populate(struct mm_struct *mm, pmd_t *pmdp, pgtable_t ptep) 


	__pmd_populate(pmdp, page_to_phys(ptep), prot);

}

#define pmd_pgtable(pmd) pmd_page(pmd)



#endif /* CONFIG_MMU */

arch/arm64/include/asm/pgalloc.h

+0 −1
Original line number Diff line number Diff line
@@ -86,6 +86,5 @@ pmd_populate(struct mm_struct *mm, pmd_t *pmdp, pgtable_t ptep) 
	VM_BUG_ON(mm == &init_mm);

	__pmd_populate(pmdp, page_to_phys(ptep), PMD_TYPE_TABLE | PMD_TABLE_PXN);

}

#define pmd_pgtable(pmd) pmd_page(pmd)



#endif