Commit ed6a7935 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

asm-generic/tlb, arch: Provide CONFIG_HAVE_MMU_GATHER_PAGE_SIZE 



Move the mmu_gather::page_size things into the generic code instead of
PowerPC specific bits.

No change in behavior intended.

Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarWill Deacon <will.deacon@arm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Nick Piggin <npiggin@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@surriel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent dea2434c

arch/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -386,6 +386,9 @@ config HAVE_RCU_TABLE_FREE 
config HAVE_RCU_TABLE_INVALIDATE

	bool



config HAVE_MMU_GATHER_PAGE_SIZE

	bool



config ARCH_HAVE_NMI_SAFE_CMPXCHG

	bool

arch/arm/include/asm/tlb.h

+1 −2
Original line number Diff line number Diff line
@@ -286,8 +286,7 @@ tlb_remove_pmd_tlb_entry(struct mmu_gather *tlb, pmd_t *pmdp, unsigned long addr 


#define tlb_migrate_finish(mm)		do { } while (0)



#define tlb_remove_check_page_size_change tlb_remove_check_page_size_change

static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb,

static inline void tlb_change_page_size(struct mmu_gather *tlb,

						     unsigned int page_size)

{

}

arch/ia64/include/asm/tlb.h

+1 −2
Original line number Diff line number Diff line
@@ -282,8 +282,7 @@ do { \ 
#define tlb_remove_huge_tlb_entry(h, tlb, ptep, address)	\

	tlb_remove_tlb_entry(tlb, ptep, address)



#define tlb_remove_check_page_size_change tlb_remove_check_page_size_change

static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb,

static inline void tlb_change_page_size(struct mmu_gather *tlb,

						     unsigned int page_size)

{

}

arch/powerpc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ config PPC 
	select HAVE_PERF_REGS

	select HAVE_PERF_USER_STACK_DUMP

	select HAVE_RCU_TABLE_FREE		if SMP

	select HAVE_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

arch/powerpc/include/asm/tlb.h

+0 −17
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#define tlb_start_vma(tlb, vma)	do { } while (0)

#define tlb_end_vma(tlb, vma)	do { } while (0)

#define __tlb_remove_tlb_entry	__tlb_remove_tlb_entry

#define tlb_remove_check_page_size_change tlb_remove_check_page_size_change



extern void tlb_flush(struct mmu_gather *tlb);
@@ -46,22 +45,6 @@ static inline void __tlb_remove_tlb_entry(struct mmu_gather *tlb, pte_t *ptep, 
#endif

}



static inline void tlb_remove_check_page_size_change(struct mmu_gather *tlb,

						     unsigned int page_size)

{

	if (!tlb->page_size)

		tlb->page_size = page_size;

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

		if (!tlb->fullmm)

			tlb_flush_mmu(tlb);

		/*

		 * update the page size after flush for the new

		 * mmu_gather.

		 */

		tlb->page_size = page_size;

	}

}



#ifdef CONFIG_SMP

static inline int mm_is_core_local(struct mm_struct *mm)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE