diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-04-19 10:38:52 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-04-19 10:38:52 +0200 |
commit | 6666ea558b1f4134291c15ac59366f69c2d1f321 (patch) | |
tree | 99e4204b51e69a12721123d3bb1912f6ca0a2726 /arch/x86/include/asm/tlbflush.h | |
parent | 91ed140d6c1e168b11bbbddac4f6066f40a0c6b5 (diff) | |
parent | c3b46c73264b03000d1e18b22f5caf63332547c9 (diff) | |
download | linux-stable-6666ea558b1f4134291c15ac59366f69c2d1f321.tar.gz linux-stable-6666ea558b1f4134291c15ac59366f69c2d1f321.tar.bz2 linux-stable-6666ea558b1f4134291c15ac59366f69c2d1f321.zip |
Merge tag 'v4.6-rc4' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/tlbflush.h')
-rw-r--r-- | arch/x86/include/asm/tlbflush.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h index 3628e6c5ebf4..4e5be94e079a 100644 --- a/arch/x86/include/asm/tlbflush.h +++ b/arch/x86/include/asm/tlbflush.h @@ -319,12 +319,6 @@ static inline void reset_lazy_tlbstate(void) #endif /* SMP */ -/* Not inlined due to inc_irq_stat not being defined yet */ -#define flush_tlb_local() { \ - inc_irq_stat(irq_tlb_count); \ - local_flush_tlb(); \ -} - #ifndef CONFIG_PARAVIRT #define flush_tlb_others(mask, mm, start, end) \ native_flush_tlb_others(mask, mm, start, end) |