diff options
| author | Borislav Petkov (AMD) <bp@alien8.de> | 2023-06-14 19:41:48 +0200 |
|---|---|---|
| committer | Borislav Petkov (AMD) <bp@alien8.de> | 2023-06-16 10:50:16 +0200 |
| commit | 013fdeb07a8fd32bbb3412e5f49d60207a78bf08 (patch) | |
| tree | 615c685ac0c75144dbd40ac79bc0ae8f5c6429f8 | |
| parent | 7e980867ced0037a65f588971b89769857b77aab (diff) | |
| download | linux-stable-013fdeb07a8fd32bbb3412e5f49d60207a78bf08.tar.gz linux-stable-013fdeb07a8fd32bbb3412e5f49d60207a78bf08.tar.bz2 linux-stable-013fdeb07a8fd32bbb3412e5f49d60207a78bf08.zip | |
x86/mm: Remove unused current_untag_mask()
e0bddc19ba95 ("x86/mm: Reduce untagged_addr() overhead for systems without LAM")
removed its only usage site so drop it.
Move the tlbstate_untag_mask up in the header and drop the ugly
ifdeffery as the unused declaration should be properly discarded.
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Link: https://lore.kernel.org/r/20230614174148.5439-1-bp@alien8.de
| -rw-r--r-- | arch/x86/include/asm/tlbflush.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h index 75bfaa421030..80450e1d5385 100644 --- a/arch/x86/include/asm/tlbflush.h +++ b/arch/x86/include/asm/tlbflush.h @@ -14,6 +14,8 @@ #include <asm/processor-flags.h> #include <asm/pgtable.h> +DECLARE_PER_CPU(u64, tlbstate_untag_mask); + void __flush_tlb_all(void); #define TLB_FLUSH_ALL -1UL @@ -54,15 +56,6 @@ static inline void cr4_clear_bits(unsigned long mask) local_irq_restore(flags); } -#ifdef CONFIG_ADDRESS_MASKING -DECLARE_PER_CPU(u64, tlbstate_untag_mask); - -static inline u64 current_untag_mask(void) -{ - return this_cpu_read(tlbstate_untag_mask); -} -#endif - #ifndef MODULE /* * 6 because 6 should be plenty and struct tlb_state will fit in two cache |