Commit 3af4bd03 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Linus Torvalds
Browse files

asm-generic/tlb: rename HAVE_MMU_GATHER_PAGE_SIZE 

Towards a more consistent naming scheme.

Link: http://lkml.kernel.org/r/20200116064531.483522-8-aneesh.kumar@linux.ibm.com


Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: default avatarAneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ff2e6d72

arch/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ config HAVE_ARCH_JUMP_LABEL_RELATIVE 
config MMU_GATHER_RCU_TABLE_FREE

	bool



config HAVE_MMU_GATHER_PAGE_SIZE

config MMU_GATHER_PAGE_SIZE

	bool



config MMU_GATHER_NO_RANGE

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ config PPC 
	select HAVE_PERF_REGS

	select HAVE_PERF_USER_STACK_DUMP

	select MMU_GATHER_RCU_TABLE_FREE

	select HAVE_MMU_GATHER_PAGE_SIZE

	select MMU_GATHER_PAGE_SIZE

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_RELIABLE_STACKTRACE		if PPC_BOOK3S_64 && CPU_LITTLE_ENDIAN

	select HAVE_SYSCALL_TRACEPOINTS

include/asm-generic/tlb.h

+6 −3
Original line number Diff line number Diff line
@@ -121,11 +121,14 @@ 
 *

 * Additionally there are a few opt-in features:

 *

 *  HAVE_MMU_GATHER_PAGE_SIZE

 *  MMU_GATHER_PAGE_SIZE

 *

 *  This ensures we call tlb_flush() every time tlb_change_page_size() actually

 *  changes the size and provides mmu_gather::page_size to tlb_flush().

 *

 *  This might be useful if your architecture has size specific TLB

 *  invalidation instructions.

 *

 *  MMU_GATHER_RCU_TABLE_FREE

 *

 *  This provides tlb_remove_table(), to be used instead of tlb_remove_page()
@@ -279,7 +282,7 @@ struct mmu_gather { 
	struct mmu_gather_batch	local;

	struct page		*__pages[MMU_GATHER_BUNDLE];



#ifdef CONFIG_HAVE_MMU_GATHER_PAGE_SIZE

#ifdef CONFIG_MMU_GATHER_PAGE_SIZE

	unsigned int page_size;

#endif

#endif
@@ -435,7 +438,7 @@ static inline void tlb_remove_page(struct mmu_gather *tlb, struct page *page) 
static inline void tlb_change_page_size(struct mmu_gather *tlb,

						     unsigned int page_size)

{

#ifdef CONFIG_HAVE_MMU_GATHER_PAGE_SIZE

#ifdef CONFIG_MMU_GATHER_PAGE_SIZE

	if (tlb->page_size && tlb->page_size != page_size) {

		if (!tlb->fullmm && !tlb->need_flush_all)

			tlb_flush_mmu(tlb);

mm/mmu_gather.c

+2 −2
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ bool __tlb_remove_page_size(struct mmu_gather *tlb, struct page *page, int page_ 


	VM_BUG_ON(!tlb->end);



#ifdef CONFIG_HAVE_MMU_GATHER_PAGE_SIZE

#ifdef CONFIG_MMU_GATHER_PAGE_SIZE

	VM_WARN_ON(tlb->page_size != page_size);

#endif
@@ -223,7 +223,7 @@ void tlb_gather_mmu(struct mmu_gather *tlb, struct mm_struct *mm, 
#ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE

	tlb->batch = NULL;

#endif

#ifdef CONFIG_HAVE_MMU_GATHER_PAGE_SIZE

#ifdef CONFIG_MMU_GATHER_PAGE_SIZE

	tlb->page_size = 0;

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE