Commit 782de70c authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

mm: consolidate pgtable_cache_init() and pgd_cache_init() 

Both pgtable_cache_init() and pgd_cache_init() are used to initialize kmem
cache for page table allocations on several architectures that do not use
PAGE_SIZE tables for one or more levels of the page table hierarchy.

Most architectures do not implement these functions and use __weak default
NOP implementation of pgd_cache_init().  Since there is no such default
for pgtable_cache_init(), its empty stub is duplicated among most
architectures.

Rename the definitions of pgd_cache_init() to pgtable_cache_init() and
drop empty stubs of pgtable_cache_init().

Link: http://lkml.kernel.org/r/1566457046-22637-1-git-send-email-rppt@linux.ibm.com


Signed-off-by: default avatarMike Rapoport <rppt@linux.ibm.com>
Acked-by: Will Deacon <will@kernel.org>		[arm64]
Acked-by: Thomas Gleixner <tglx@linutronix.de>	[x86]
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1b9a9d85

arch/alpha/include/asm/pgtable.h

+0 −5
Original line number Diff line number Diff line
@@ -359,11 +359,6 @@ extern void paging_init(void); 


#include <asm-generic/pgtable.h>



/*

 * No page table caches to initialise

 */

#define pgtable_cache_init()	do { } while (0)



/* We have our own get_unmapped_area to cope with ADDR_LIMIT_32BIT.  */

#define HAVE_ARCH_UNMAPPED_AREA

arch/arc/include/asm/pgtable.h

+0 −5
Original line number Diff line number Diff line
@@ -395,11 +395,6 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, 
/* to cope with aliasing VIPT cache */

#define HAVE_ARCH_UNMAPPED_AREA



/*

 * No page table caches to initialise

 */

#define pgtable_cache_init()   do { } while (0)



#endif /* __ASSEMBLY__ */



#endif

arch/arm/include/asm/pgtable-nommu.h

+0 −5
Original line number Diff line number Diff line
@@ -70,11 +70,6 @@ typedef pte_t *pte_addr_t; 
 */

extern unsigned int kobjsize(const void *objp);



/*

 * No page table caches to initialise.

 */

#define pgtable_cache_init()	do { } while (0)



/*

 * All 32bit addresses are effectively valid for vmalloc...

 * Sort of meaningless for non-VM targets.

arch/arm/include/asm/pgtable.h

+0 −2
Original line number Diff line number Diff line
@@ -368,8 +368,6 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 
#define HAVE_ARCH_UNMAPPED_AREA

#define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN



#define pgtable_cache_init() do { } while (0)



#endif /* !__ASSEMBLY__ */



#endif /* CONFIG_MMU */

arch/arm64/include/asm/pgtable.h

+0 −2
Original line number Diff line number Diff line
@@ -861,8 +861,6 @@ extern int kern_addr_valid(unsigned long addr); 


#include <asm-generic/pgtable.h>



static inline void pgtable_cache_init(void) { }



/*

 * On AArch64, the cache coherency is handled via the set_pte_at() function.

 */