asm-generic-tlb-rename-have_mmu_gather_no_gather.patch removed from -mm tree
The patch titled
Subject: asm-generic/tlb: rename HAVE_MMU_GATHER_NO_GATHER
has been removed from the -mm tree. Its filename was
asm-generic-tlb-rename-have_mmu_gather_no_gather.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Peter Zijlstra <[email protected]>
Subject: asm-generic/tlb: rename HAVE_MMU_GATHER_NO_GATHER
Towards a more consistent naming scheme.
Signed-off-by Peter Zijlstra (Intel) <[email protected]>
Signed-off-by Aneesh Kumar K.V <[email protected]>
Cc Michael Ellerman <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/Kconfig | 2 +- arch/s390/Kconfig | 2 +- include/asm-generic/tlb.h | 14 ++++++++++++-- mm/mmu_gather.c | 10 +++++----- 4 files changed, 19 insertions(+), 9 deletions(-)
arch/Kconfig renamed from arch/Kconfig~asm-generic-tlb-rename-have_mmu_gather_no_gather +1 -1
@@ -402,7 +402,7 @@ config MMU_GATHER_PAGE_SIZE config MMU_GATHER_NO_RANGE bool -config HAVE_MMU_GATHER_NO_GATHER +config MMU_GATHER_NO_GATHER bool config ARCH_HAVE_NMI_SAFE_CMPXCHG
arch/s390/Kconfig renamed from arch/s390/Kconfig~asm-generic-tlb-rename-have_mmu_gather_no_gather +1 -1
@@ -163,7 +163,7 @@ config S390 select HAVE_PERF_USER_STACK_DUMP select HAVE_MEMBLOCK_NODE_MAP select HAVE_MEMBLOCK_PHYS_MAP - select HAVE_MMU_GATHER_NO_GATHER + select MMU_GATHER_NO_GATHER select HAVE_MOD_ARCH_SPECIFIC select HAVE_NOP_MCOUNT select HAVE_OPROFILE
include/asm-generic/tlb.h renamed from include/asm-generic/tlb.h~asm-generic-tlb-rename-have_mmu_gather_no_gather +12 -2
@@ -143,6 +143,16 @@* MMU_GATHER_NO_RANGE * * Use this if your architecture lacks an efficient flush_tlb_range(). +* +* MMU_GATHER_NO_GATHER +* +* If the option is set the mmu_gather will not track individual pages for +* delayed page free anymore. A platform that enables the option needs to +* provide its own implementation of the __tlb_remove_page_size() function to +* free pages. +* +* This is useful if your architecture already flushes TLB entries in the +* various ptep_get_and_clear() functions. */ #ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE
@@ -202,7 +212,7 @@ extern void tlb_remove_table(struct mmu_#endif /* CONFIG_MMU_GATHER_RCU_TABLE_FREE */ -#ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER +#ifndef CONFIG_MMU_GATHER_NO_GATHER /* * If we can't allocate a page to make a big batch of page pointers * to work on, then just handle a few from the on-stack structure.
@@ -277,7 +287,7 @@ struct mmu_gather {unsigned int batch_count; -#ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER +#ifndef CONFIG_MMU_GATHER_NO_GATHER struct mmu_gather_batch *active;struct mmu_gather_batch local;struct page *__pages[MMU_GATHER_BUNDLE ];
mm/mmu_gather.c renamed from mm/mmu_gather.c~asm-generic-tlb-rename-have_mmu_gather_no_gather +5 -5
@@ -11,7 +11,7 @@#include <asm/pgalloc.h> #include <asm/tlb.h> -#ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER +#ifndef CONFIG_MMU_GATHER_NO_GATHER static bool tlb_next_batch (struct mmu_gather *tlb) {
@@ -89,7 +89,7 @@ bool __tlb_remove_page_size(struct mmu_g return false; } -#endif /* HAVE_MMU_GATHER_NO_GATHER */ +#endif /* MMU_GATHER_NO_GATHER */ #ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE
@@ -180,7 +180,7 @@ static void tlb_flush_mmu_free(struct mm#ifdef CONFIG_MMU_GATHER_RCU_TABLE_FREE tlb_table_flush (tlb);#endif -#ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER +#ifndef CONFIG_MMU_GATHER_NO_GATHER tlb_batch_pages_flush (tlb);#endif }
@@ -211,7 +211,7 @@ void tlb_gather_mmu(struct mmu_gather *t/* Is it from 0 to ~0? */ tlb->fullmm = !(start | (end+1 )); -#ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER +#ifndef CONFIG_MMU_GATHER_NO_GATHER tlb->need_flush_all =0 ; tlb->local.next =NULL ; tlb->local.nr =0 ;
@@ -271,7 +271,7 @@ void tlb_finish_mmu(struct mmu_gather *ttlb_flush_mmu (tlb); -#ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER +#ifndef CONFIG_MMU_GATHER_NO_GATHER tlb_batch_list_free (tlb);#endif dec_tlb_flush_pending (tlb->mm);
_
Patches currently in -mm which might be from [email protected] are