diff options
author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2011-05-24 20:11:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 11:39:16 -0400 |
commit | 1c395176962176660bb108f90e97e1686cfe0d85 (patch) | |
tree | dc3b91d8d0d9b00a59f26677cce0f9eb90b1772f | |
parent | ff075d605511784c79cbf0ae73d90e07238267b3 (diff) |
mm: now that all old mmu_gather code is gone, remove the storage
Fold all the mmu_gather rework patches into one for submission
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Reported-by: Hugh Dickins <hughd@google.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: David Miller <davem@davemloft.net>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: Tony Luck <tony.luck@intel.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Nick Piggin <npiggin@kernel.dk>
Cc: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/alpha/mm/init.c | 2 | ||||
-rw-r--r-- | arch/arm/mm/mmu.c | 2 | ||||
-rw-r--r-- | arch/avr32/mm/init.c | 2 | ||||
-rw-r--r-- | arch/cris/mm/init.c | 2 | ||||
-rw-r--r-- | arch/frv/mm/init.c | 2 | ||||
-rw-r--r-- | arch/ia64/mm/init.c | 2 | ||||
-rw-r--r-- | arch/m32r/mm/init.c | 2 | ||||
-rw-r--r-- | arch/m68k/mm/init_mm.c | 2 | ||||
-rw-r--r-- | arch/microblaze/mm/init.c | 2 | ||||
-rw-r--r-- | arch/mips/mm/init.c | 2 | ||||
-rw-r--r-- | arch/mn10300/mm/init.c | 2 | ||||
-rw-r--r-- | arch/parisc/mm/init.c | 2 | ||||
-rw-r--r-- | arch/s390/mm/pgtable.c | 1 | ||||
-rw-r--r-- | arch/score/mm/init.c | 2 | ||||
-rw-r--r-- | arch/sh/mm/init.c | 1 | ||||
-rw-r--r-- | arch/sparc/mm/init_32.c | 2 | ||||
-rw-r--r-- | arch/tile/mm/init.c | 2 | ||||
-rw-r--r-- | arch/um/kernel/smp.c | 3 | ||||
-rw-r--r-- | arch/unicore32/mm/mmu.c | 2 | ||||
-rw-r--r-- | arch/x86/mm/init.c | 2 | ||||
-rw-r--r-- | arch/xtensa/mm/mmu.c | 2 |
21 files changed, 0 insertions, 41 deletions
diff --git a/arch/alpha/mm/init.c b/arch/alpha/mm/init.c index 86425ab53bf5..69d0c5761e2f 100644 --- a/arch/alpha/mm/init.c +++ b/arch/alpha/mm/init.c | |||
@@ -32,8 +32,6 @@ | |||
32 | #include <asm/console.h> | 32 | #include <asm/console.h> |
33 | #include <asm/tlb.h> | 33 | #include <asm/tlb.h> |
34 | 34 | ||
35 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
36 | |||
37 | extern void die_if_kernel(char *,struct pt_regs *,long); | 35 | extern void die_if_kernel(char *,struct pt_regs *,long); |
38 | 36 | ||
39 | static struct pcb_struct original_pcb; | 37 | static struct pcb_struct original_pcb; |
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 6cf76b3b68d1..08a92368d9d3 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c | |||
@@ -31,8 +31,6 @@ | |||
31 | 31 | ||
32 | #include "mm.h" | 32 | #include "mm.h" |
33 | 33 | ||
34 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
35 | |||
36 | /* | 34 | /* |
37 | * empty_zero_page is a special page that is used for | 35 | * empty_zero_page is a special page that is used for |
38 | * zero-initialized data and COW. | 36 | * zero-initialized data and COW. |
diff --git a/arch/avr32/mm/init.c b/arch/avr32/mm/init.c index a7314d44b17b..2798c2d4a1cf 100644 --- a/arch/avr32/mm/init.c +++ b/arch/avr32/mm/init.c | |||
@@ -25,8 +25,6 @@ | |||
25 | #include <asm/setup.h> | 25 | #include <asm/setup.h> |
26 | #include <asm/sections.h> | 26 | #include <asm/sections.h> |
27 | 27 | ||
28 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
29 | |||
30 | pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_data; | 28 | pgd_t swapper_pg_dir[PTRS_PER_PGD] __page_aligned_data; |
31 | 29 | ||
32 | struct page *empty_zero_page; | 30 | struct page *empty_zero_page; |
diff --git a/arch/cris/mm/init.c b/arch/cris/mm/init.c index df33ab89d70f..d72ab58fd83e 100644 --- a/arch/cris/mm/init.c +++ b/arch/cris/mm/init.c | |||
@@ -13,8 +13,6 @@ | |||
13 | #include <linux/bootmem.h> | 13 | #include <linux/bootmem.h> |
14 | #include <asm/tlb.h> | 14 | #include <asm/tlb.h> |
15 | 15 | ||
16 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
17 | |||
18 | unsigned long empty_zero_page; | 16 | unsigned long empty_zero_page; |
19 | 17 | ||
20 | extern char _stext, _edata, _etext; /* From linkerscript */ | 18 | extern char _stext, _edata, _etext; /* From linkerscript */ |
diff --git a/arch/frv/mm/init.c b/arch/frv/mm/init.c index ed64588ac3a7..fbe5f0dbae06 100644 --- a/arch/frv/mm/init.c +++ b/arch/frv/mm/init.c | |||
@@ -41,8 +41,6 @@ | |||
41 | 41 | ||
42 | #undef DEBUG | 42 | #undef DEBUG |
43 | 43 | ||
44 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
45 | |||
46 | /* | 44 | /* |
47 | * BAD_PAGE is the page that is used for page faults when linux | 45 | * BAD_PAGE is the page that is used for page faults when linux |
48 | * is out-of-memory. Older versions of linux just did a | 46 | * is out-of-memory. Older versions of linux just did a |
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index ed41759efcac..00cb0e26c64e 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c | |||
@@ -36,8 +36,6 @@ | |||
36 | #include <asm/mca.h> | 36 | #include <asm/mca.h> |
37 | #include <asm/paravirt.h> | 37 | #include <asm/paravirt.h> |
38 | 38 | ||
39 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
40 | |||
41 | extern void ia64_tlb_init (void); | 39 | extern void ia64_tlb_init (void); |
42 | 40 | ||
43 | unsigned long MAX_DMA_ADDRESS = PAGE_OFFSET + 0x100000000UL; | 41 | unsigned long MAX_DMA_ADDRESS = PAGE_OFFSET + 0x100000000UL; |
diff --git a/arch/m32r/mm/init.c b/arch/m32r/mm/init.c index 73e2205ebf5a..78b660e903da 100644 --- a/arch/m32r/mm/init.c +++ b/arch/m32r/mm/init.c | |||
@@ -35,8 +35,6 @@ extern char __init_begin, __init_end; | |||
35 | 35 | ||
36 | pgd_t swapper_pg_dir[1024]; | 36 | pgd_t swapper_pg_dir[1024]; |
37 | 37 | ||
38 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
39 | |||
40 | /* | 38 | /* |
41 | * Cache of MMU context last used. | 39 | * Cache of MMU context last used. |
42 | */ | 40 | */ |
diff --git a/arch/m68k/mm/init_mm.c b/arch/m68k/mm/init_mm.c index 8bc842554e5b..9113c2f17607 100644 --- a/arch/m68k/mm/init_mm.c +++ b/arch/m68k/mm/init_mm.c | |||
@@ -32,8 +32,6 @@ | |||
32 | #include <asm/sections.h> | 32 | #include <asm/sections.h> |
33 | #include <asm/tlb.h> | 33 | #include <asm/tlb.h> |
34 | 34 | ||
35 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
36 | |||
37 | pg_data_t pg_data_map[MAX_NUMNODES]; | 35 | pg_data_t pg_data_map[MAX_NUMNODES]; |
38 | EXPORT_SYMBOL(pg_data_map); | 36 | EXPORT_SYMBOL(pg_data_map); |
39 | 37 | ||
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c index c8437866d3b7..213f2d671669 100644 --- a/arch/microblaze/mm/init.c +++ b/arch/microblaze/mm/init.c | |||
@@ -32,8 +32,6 @@ unsigned int __page_offset; | |||
32 | EXPORT_SYMBOL(__page_offset); | 32 | EXPORT_SYMBOL(__page_offset); |
33 | 33 | ||
34 | #else | 34 | #else |
35 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
36 | |||
37 | static int init_bootmem_done; | 35 | static int init_bootmem_done; |
38 | #endif /* CONFIG_MMU */ | 36 | #endif /* CONFIG_MMU */ |
39 | 37 | ||
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index 279599e9a779..1aadeb42c5a5 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c | |||
@@ -64,8 +64,6 @@ | |||
64 | 64 | ||
65 | #endif /* CONFIG_MIPS_MT_SMTC */ | 65 | #endif /* CONFIG_MIPS_MT_SMTC */ |
66 | 66 | ||
67 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
68 | |||
69 | /* | 67 | /* |
70 | * We have up to 8 empty zeroed pages so we can map one of the right colour | 68 | * We have up to 8 empty zeroed pages so we can map one of the right colour |
71 | * when needed. This is necessary only on R4000 / R4400 SC and MC versions | 69 | * when needed. This is necessary only on R4000 / R4400 SC and MC versions |
diff --git a/arch/mn10300/mm/init.c b/arch/mn10300/mm/init.c index 48907cc3bdb7..13801824e3ee 100644 --- a/arch/mn10300/mm/init.c +++ b/arch/mn10300/mm/init.c | |||
@@ -37,8 +37,6 @@ | |||
37 | #include <asm/tlb.h> | 37 | #include <asm/tlb.h> |
38 | #include <asm/sections.h> | 38 | #include <asm/sections.h> |
39 | 39 | ||
40 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
41 | |||
42 | unsigned long highstart_pfn, highend_pfn; | 40 | unsigned long highstart_pfn, highend_pfn; |
43 | 41 | ||
44 | #ifdef CONFIG_MN10300_HAS_ATOMIC_OPS_UNIT | 42 | #ifdef CONFIG_MN10300_HAS_ATOMIC_OPS_UNIT |
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index c5c9c65e502d..82f364e209fc 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c | |||
@@ -31,8 +31,6 @@ | |||
31 | #include <asm/mmzone.h> | 31 | #include <asm/mmzone.h> |
32 | #include <asm/sections.h> | 32 | #include <asm/sections.h> |
33 | 33 | ||
34 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
35 | |||
36 | extern int data_start; | 34 | extern int data_start; |
37 | 35 | ||
38 | #ifdef CONFIG_DISCONTIGMEM | 36 | #ifdef CONFIG_DISCONTIGMEM |
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c index 8d4330642512..14c6fae6fe6b 100644 --- a/arch/s390/mm/pgtable.c +++ b/arch/s390/mm/pgtable.c | |||
@@ -36,7 +36,6 @@ struct rcu_table_freelist { | |||
36 | ((PAGE_SIZE - sizeof(struct rcu_table_freelist)) \ | 36 | ((PAGE_SIZE - sizeof(struct rcu_table_freelist)) \ |
37 | / sizeof(unsigned long)) | 37 | / sizeof(unsigned long)) |
38 | 38 | ||
39 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
40 | static DEFINE_PER_CPU(struct rcu_table_freelist *, rcu_table_freelist); | 39 | static DEFINE_PER_CPU(struct rcu_table_freelist *, rcu_table_freelist); |
41 | 40 | ||
42 | static void __page_table_free(struct mm_struct *mm, unsigned long *table); | 41 | static void __page_table_free(struct mm_struct *mm, unsigned long *table); |
diff --git a/arch/score/mm/init.c b/arch/score/mm/init.c index 50fdec54c70a..cee6bce1e30c 100644 --- a/arch/score/mm/init.c +++ b/arch/score/mm/init.c | |||
@@ -38,8 +38,6 @@ | |||
38 | #include <asm/sections.h> | 38 | #include <asm/sections.h> |
39 | #include <asm/tlb.h> | 39 | #include <asm/tlb.h> |
40 | 40 | ||
41 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
42 | |||
43 | unsigned long empty_zero_page; | 41 | unsigned long empty_zero_page; |
44 | EXPORT_SYMBOL_GPL(empty_zero_page); | 42 | EXPORT_SYMBOL_GPL(empty_zero_page); |
45 | 43 | ||
diff --git a/arch/sh/mm/init.c b/arch/sh/mm/init.c index 0d3f912e3334..58a93fb3d965 100644 --- a/arch/sh/mm/init.c +++ b/arch/sh/mm/init.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <asm/cache.h> | 28 | #include <asm/cache.h> |
29 | #include <asm/sizes.h> | 29 | #include <asm/sizes.h> |
30 | 30 | ||
31 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
32 | pgd_t swapper_pg_dir[PTRS_PER_PGD]; | 31 | pgd_t swapper_pg_dir[PTRS_PER_PGD]; |
33 | 32 | ||
34 | void __init generic_mem_init(void) | 33 | void __init generic_mem_init(void) |
diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c index 28c2cc81c9a9..ca217327e8d2 100644 --- a/arch/sparc/mm/init_32.c +++ b/arch/sparc/mm/init_32.c | |||
@@ -37,8 +37,6 @@ | |||
37 | #include <asm/prom.h> | 37 | #include <asm/prom.h> |
38 | #include <asm/leon.h> | 38 | #include <asm/leon.h> |
39 | 39 | ||
40 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
41 | |||
42 | unsigned long *sparc_valid_addr_bitmap; | 40 | unsigned long *sparc_valid_addr_bitmap; |
43 | EXPORT_SYMBOL(sparc_valid_addr_bitmap); | 41 | EXPORT_SYMBOL(sparc_valid_addr_bitmap); |
44 | 42 | ||
diff --git a/arch/tile/mm/init.c b/arch/tile/mm/init.c index d6e87fda2fb2..4e10c4023028 100644 --- a/arch/tile/mm/init.c +++ b/arch/tile/mm/init.c | |||
@@ -60,8 +60,6 @@ unsigned long VMALLOC_RESERVE = CONFIG_VMALLOC_RESERVE; | |||
60 | EXPORT_SYMBOL(VMALLOC_RESERVE); | 60 | EXPORT_SYMBOL(VMALLOC_RESERVE); |
61 | #endif | 61 | #endif |
62 | 62 | ||
63 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
64 | |||
65 | /* Create an L2 page table */ | 63 | /* Create an L2 page table */ |
66 | static pte_t * __init alloc_pte(void) | 64 | static pte_t * __init alloc_pte(void) |
67 | { | 65 | { |
diff --git a/arch/um/kernel/smp.c b/arch/um/kernel/smp.c index eefb107d2d73..155206a66908 100644 --- a/arch/um/kernel/smp.c +++ b/arch/um/kernel/smp.c | |||
@@ -7,9 +7,6 @@ | |||
7 | #include "asm/pgalloc.h" | 7 | #include "asm/pgalloc.h" |
8 | #include "asm/tlb.h" | 8 | #include "asm/tlb.h" |
9 | 9 | ||
10 | /* For some reason, mmu_gathers are referenced when CONFIG_SMP is off. */ | ||
11 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
12 | |||
13 | #ifdef CONFIG_SMP | 10 | #ifdef CONFIG_SMP |
14 | 11 | ||
15 | #include "linux/sched.h" | 12 | #include "linux/sched.h" |
diff --git a/arch/unicore32/mm/mmu.c b/arch/unicore32/mm/mmu.c index db2d334941b4..3e5c3e5a0b45 100644 --- a/arch/unicore32/mm/mmu.c +++ b/arch/unicore32/mm/mmu.c | |||
@@ -30,8 +30,6 @@ | |||
30 | 30 | ||
31 | #include "mm.h" | 31 | #include "mm.h" |
32 | 32 | ||
33 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
34 | |||
35 | /* | 33 | /* |
36 | * empty_zero_page is a special page that is used for | 34 | * empty_zero_page is a special page that is used for |
37 | * zero-initialized data and COW. | 35 | * zero-initialized data and COW. |
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index 37b8b0fe8320..30326443ab81 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c | |||
@@ -16,8 +16,6 @@ | |||
16 | #include <asm/tlb.h> | 16 | #include <asm/tlb.h> |
17 | #include <asm/proto.h> | 17 | #include <asm/proto.h> |
18 | 18 | ||
19 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
20 | |||
21 | unsigned long __initdata pgt_buf_start; | 19 | unsigned long __initdata pgt_buf_start; |
22 | unsigned long __meminitdata pgt_buf_end; | 20 | unsigned long __meminitdata pgt_buf_end; |
23 | unsigned long __meminitdata pgt_buf_top; | 21 | unsigned long __meminitdata pgt_buf_top; |
diff --git a/arch/xtensa/mm/mmu.c b/arch/xtensa/mm/mmu.c index 4bb91a970f1f..ca81654f3ec2 100644 --- a/arch/xtensa/mm/mmu.c +++ b/arch/xtensa/mm/mmu.c | |||
@@ -14,8 +14,6 @@ | |||
14 | #include <asm/mmu_context.h> | 14 | #include <asm/mmu_context.h> |
15 | #include <asm/page.h> | 15 | #include <asm/page.h> |
16 | 16 | ||
17 | DEFINE_PER_CPU(struct mmu_gather, mmu_gathers); | ||
18 | |||
19 | void __init paging_init(void) | 17 | void __init paging_init(void) |
20 | { | 18 | { |
21 | memset(swapper_pg_dir, 0, PAGE_SIZE); | 19 | memset(swapper_pg_dir, 0, PAGE_SIZE); |