The patch titled mm: now that all old mmu_gather code is gone, remove the storage has been added to the -mm tree. Its filename is mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: mm: now that all old mmu_gather code is gone, remove the storage From: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> Fold all the mmu_gather rework patches into one for submission Signed-off-by: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> Reported-by: Hugh Dickins <hughd@xxxxxxxxxx> Cc: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx> Cc: David Miller <davem@xxxxxxxxxxxxx> Cc: Martin Schwidefsky <schwidefsky@xxxxxxxxxx> Cc: Russell King <rmk@xxxxxxxxxxxxxxxx> Cc: Paul Mundt <lethal@xxxxxxxxxxxx> Cc: Jeff Dike <jdike@xxxxxxxxxxx> Cc: Richard Weinberger <richard@xxxxxx> Cc: Tony Luck <tony.luck@xxxxxxxxx> Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@xxxxxxxxxxxxxx> Cc: Mel Gorman <mel@xxxxxxxxx> Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx> Cc: Nick Piggin <npiggin@xxxxxxxxx> Cc: Namhyung Kim <namhyung@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/alpha/mm/init.c | 2 -- arch/arm/mm/mmu.c | 2 -- arch/avr32/mm/init.c | 2 -- arch/cris/mm/init.c | 2 -- arch/frv/mm/init.c | 2 -- arch/ia64/mm/init.c | 2 -- arch/m32r/mm/init.c | 2 -- arch/m68k/mm/init_mm.c | 2 -- arch/microblaze/mm/init.c | 2 -- arch/mips/mm/init.c | 2 -- arch/mn10300/mm/init.c | 2 -- arch/parisc/mm/init.c | 2 -- arch/s390/mm/pgtable.c | 1 - arch/score/mm/init.c | 2 -- arch/sh/mm/init.c | 1 - arch/sparc/mm/init_32.c | 2 -- arch/tile/mm/init.c | 2 -- arch/um/kernel/smp.c | 3 --- arch/unicore32/mm/mmu.c | 2 -- arch/x86/mm/init.c | 2 -- arch/xtensa/mm/mmu.c | 2 -- 21 files changed, 41 deletions(-) diff -puN arch/alpha/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage arch/alpha/mm/init.c --- a/arch/alpha/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage +++ a/arch/alpha/mm/init.c @@ -32,8 +32,6 @@ #include <asm/console.h> #include <asm/tlb.h> -DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); - extern void die_if_kernel(char *,struct pt_regs *,long); static struct pcb_struct original_pcb; diff -puN arch/arm/mm/mmu.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage arch/arm/mm/mmu.c --- a/arch/arm/mm/mmu.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage +++ a/arch/arm/mm/mmu.c @@ -31,8 +31,6 @@ #include "mm.h" -DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); - /* * empty_zero_page is a special page that is used for * zero-initialized data and COW. diff -puN arch/avr32/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage arch/avr32/mm/init.c --- a/arch/avr32/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage +++ a/arch/avr32/mm/init.c @@ -25,8 +25,6 @@ #include <asm/setup.h> #include <asm/sections.h> -DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); - pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_data; struct page *empty_zero_page; diff -puN arch/cris/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage arch/cris/mm/init.c --- a/arch/cris/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage +++ a/arch/cris/mm/init.c @@ -13,8 +13,6 @@ #include <linux/bootmem.h> #include <asm/tlb.h> -DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); - unsigned long empty_zero_page; extern char _stext, _edata, _etext; /* From linkerscript */ diff -puN arch/frv/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage arch/frv/mm/init.c --- a/arch/frv/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage +++ a/arch/frv/mm/init.c @@ -41,8 +41,6 @@ #undef DEBUG -DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); - /* * BAD_PAGE is the page that is used for page faults when linux * is out-of-memory. Older versions of linux just did a diff -puN arch/ia64/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage arch/ia64/mm/init.c --- a/arch/ia64/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage +++ a/arch/ia64/mm/init.c @@ -36,8 +36,6 @@ #include <asm/mca.h> #include <asm/paravirt.h> -DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); - extern void ia64_tlb_init (void); unsigned long MAX_DMA_ADDRESS = PAGE_OFFSET + 0x100000000UL; diff -puN arch/m32r/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage arch/m32r/mm/init.c --- a/arch/m32r/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage +++ a/arch/m32r/mm/init.c @@ -35,8 +35,6 @@ extern char __init_begin, __init_end; pgd_t swapper_pg_dir[1024]; -DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); - /* * Cache of MMU context last used. */ diff -puN arch/m68k/mm/init_mm.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage arch/m68k/mm/init_mm.c --- a/arch/m68k/mm/init_mm.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage +++ a/arch/m68k/mm/init_mm.c @@ -32,8 +32,6 @@ #include <asm/sections.h> #include <asm/tlb.h> -DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); - pg_data_t pg_data_map[MAX_NUMNODES]; EXPORT_SYMBOL(pg_data_map); diff -puN arch/microblaze/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage arch/microblaze/mm/init.c --- a/arch/microblaze/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage +++ a/arch/microblaze/mm/init.c @@ -32,8 +32,6 @@ unsigned int __page_offset; EXPORT_SYMBOL(__page_offset); #else -DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); - static int init_bootmem_done; #endif /* CONFIG_MMU */ diff -puN arch/mips/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage arch/mips/mm/init.c --- a/arch/mips/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage +++ a/arch/mips/mm/init.c @@ -64,8 +64,6 @@ #endif /* CONFIG_MIPS_MT_SMTC */ -DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); - /* * We have up to 8 empty zeroed pages so we can map one of the right colour * when needed. This is necessary only on R4000 / R4400 SC and MC versions diff -puN arch/mn10300/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage arch/mn10300/mm/init.c --- a/arch/mn10300/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage +++ a/arch/mn10300/mm/init.c @@ -37,8 +37,6 @@ #include <asm/tlb.h> #include <asm/sections.h> -DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); - unsigned long highstart_pfn, highend_pfn; #ifdef CONFIG_MN10300_HAS_ATOMIC_OPS_UNIT diff -puN arch/parisc/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage arch/parisc/mm/init.c --- a/arch/parisc/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage +++ a/arch/parisc/mm/init.c @@ -31,8 +31,6 @@ #include <asm/mmzone.h> #include <asm/sections.h> -DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); - extern int data_start; #ifdef CONFIG_DISCONTIGMEM diff -puN arch/s390/mm/pgtable.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage arch/s390/mm/pgtable.c --- a/arch/s390/mm/pgtable.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage +++ a/arch/s390/mm/pgtable.c @@ -36,7 +36,6 @@ struct rcu_table_freelist { ((PAGE_SIZE - sizeof(struct rcu_table_freelist)) \ / sizeof(unsigned long)) -DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); static DEFINE_PER_CPU(struct rcu_table_freelist *, rcu_table_freelist); static void __page_table_free(struct mm_struct *mm, unsigned long *table); diff -puN arch/score/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage arch/score/mm/init.c --- a/arch/score/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage +++ a/arch/score/mm/init.c @@ -38,8 +38,6 @@ #include <asm/sections.h> #include <asm/tlb.h> -DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); - unsigned long empty_zero_page; EXPORT_SYMBOL_GPL(empty_zero_page); diff -puN arch/sh/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage arch/sh/mm/init.c --- a/arch/sh/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage +++ a/arch/sh/mm/init.c @@ -28,7 +28,6 @@ #include <asm/cache.h> #include <asm/sizes.h> -DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); pgd_t swapper_pg_dir[PTRS_PER_PGD]; void __init generic_mem_init(void) diff -puN arch/sparc/mm/init_32.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage arch/sparc/mm/init_32.c --- a/arch/sparc/mm/init_32.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage +++ a/arch/sparc/mm/init_32.c @@ -37,8 +37,6 @@ #include <asm/prom.h> #include <asm/leon.h> -DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); - unsigned long *sparc_valid_addr_bitmap; EXPORT_SYMBOL(sparc_valid_addr_bitmap); diff -puN arch/tile/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage arch/tile/mm/init.c --- a/arch/tile/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage +++ a/arch/tile/mm/init.c @@ -60,8 +60,6 @@ unsigned long VMALLOC_RESERVE = CONFIG_V EXPORT_SYMBOL(VMALLOC_RESERVE); #endif -DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); - /* Create an L2 page table */ static pte_t * __init alloc_pte(void) { diff -puN arch/um/kernel/smp.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage arch/um/kernel/smp.c --- a/arch/um/kernel/smp.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage +++ a/arch/um/kernel/smp.c @@ -7,9 +7,6 @@ #include "asm/pgalloc.h" #include "asm/tlb.h" -/* For some reason, mmu_gathers are referenced when CONFIG_SMP is off. */ -DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); - #ifdef CONFIG_SMP #include "linux/sched.h" diff -puN arch/unicore32/mm/mmu.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage arch/unicore32/mm/mmu.c --- a/arch/unicore32/mm/mmu.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage +++ a/arch/unicore32/mm/mmu.c @@ -30,8 +30,6 @@ #include "mm.h" -DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); - /* * empty_zero_page is a special page that is used for * zero-initialized data and COW. diff -puN arch/x86/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage arch/x86/mm/init.c --- a/arch/x86/mm/init.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage +++ a/arch/x86/mm/init.c @@ -16,8 +16,6 @@ #include <asm/tlb.h> #include <asm/proto.h> -DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); - unsigned long __initdata pgt_buf_start; unsigned long __meminitdata pgt_buf_end; unsigned long __meminitdata pgt_buf_top; diff -puN arch/xtensa/mm/mmu.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage arch/xtensa/mm/mmu.c --- a/arch/xtensa/mm/mmu.c~mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage +++ a/arch/xtensa/mm/mmu.c @@ -14,8 +14,6 @@ #include <asm/mmu_context.h> #include <asm/page.h> -DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); - void __init paging_init(void) { memset(swapper_pg_dir, 0, PAGE_SIZE); _ Patches currently in -mm which might be from a.p.zijlstra@xxxxxxxxx are linux-next.patch net-convert-%p-usage-to-%pk.patch mm-mmu_gather-rework.patch mm-mmu_gather-rework-fix.patch powerpc-mmu_gather-rework.patch sparc-mmu_gather-rework.patch s390-mmu_gather-rework.patch arm-mmu_gather-rework.patch sh-mmu_gather-rework.patch ia64-mmu_gather-rework.patch um-mmu_gather-rework.patch mm-now-that-all-old-mmu_gather-code-is-gone-remove-the-storage.patch mm-powerpc-move-the-rcu-page-table-freeing-into-generic-code.patch mm-extended-batches-for-generic-mmu_gather.patch lockdep-mutex-provide-mutex_lock_nest_lock.patch mm-remove-i_mmap_lock-lockbreak.patch mm-convert-i_mmap_lock-to-a-mutex.patch mm-revert-page_lock_anon_vma-lock-annotation.patch mm-improve-page_lock_anon_vma-comment.patch mm-use-refcounts-for-page_lock_anon_vma.patch mm-convert-anon_vma-lock-to-a-mutex.patch mm-optimize-page_lock_anon_vma-fast-path.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html