diff options
author | Peter Zijlstra <peterz@infradead.org> | 2018-09-20 04:51:01 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-04-03 04:32:59 -0400 |
commit | b3fa8ed4e48802e6ba0aa5f3283313a27dcbf46f (patch) | |
tree | 45eee4345cfd6bbb2d807c69d647dd4147050aec | |
parent | 1808d65b55e4489770dd4f76fb0dff5b81eb9b11 (diff) |
asm-generic/tlb: Remove CONFIG_HAVE_GENERIC_MMU_GATHER
Since all architectures are now using it, it is redundant.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@kernel.org>
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: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@surriel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r-- | include/asm-generic/tlb.h | 1 | ||||
-rw-r--r-- | mm/mmu_gather.c | 4 |
2 files changed, 0 insertions, 5 deletions
diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h index af20aa8255cd..2648a02a6b1b 100644 --- a/include/asm-generic/tlb.h +++ b/include/asm-generic/tlb.h | |||
@@ -146,7 +146,6 @@ | |||
146 | * | 146 | * |
147 | * Use this if your architecture lacks an efficient flush_tlb_range(). | 147 | * Use this if your architecture lacks an efficient flush_tlb_range(). |
148 | */ | 148 | */ |
149 | #define HAVE_GENERIC_MMU_GATHER | ||
150 | 149 | ||
151 | #ifdef CONFIG_HAVE_RCU_TABLE_FREE | 150 | #ifdef CONFIG_HAVE_RCU_TABLE_FREE |
152 | /* | 151 | /* |
diff --git a/mm/mmu_gather.c b/mm/mmu_gather.c index 60ef38d200c0..7f5b2b8aa9dd 100644 --- a/mm/mmu_gather.c +++ b/mm/mmu_gather.c | |||
@@ -11,8 +11,6 @@ | |||
11 | #include <asm/pgalloc.h> | 11 | #include <asm/pgalloc.h> |
12 | #include <asm/tlb.h> | 12 | #include <asm/tlb.h> |
13 | 13 | ||
14 | #ifdef HAVE_GENERIC_MMU_GATHER | ||
15 | |||
16 | #ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER | 14 | #ifndef CONFIG_HAVE_MMU_GATHER_NO_GATHER |
17 | 15 | ||
18 | static bool tlb_next_batch(struct mmu_gather *tlb) | 16 | static bool tlb_next_batch(struct mmu_gather *tlb) |
@@ -109,8 +107,6 @@ void tlb_flush_mmu(struct mmu_gather *tlb) | |||
109 | tlb_flush_mmu_free(tlb); | 107 | tlb_flush_mmu_free(tlb); |
110 | } | 108 | } |
111 | 109 | ||
112 | #endif /* HAVE_GENERIC_MMU_GATHER */ | ||
113 | |||
114 | #ifdef CONFIG_HAVE_RCU_TABLE_FREE | 110 | #ifdef CONFIG_HAVE_RCU_TABLE_FREE |
115 | 111 | ||
116 | /* | 112 | /* |