@@ -17,7 +17,7 @@
DECLARE_PER_CPU(u64, tlbstate_untag_mask);
-void __flush_tlb_all(void);
+noinstr void __flush_tlb_all(void);
#define TLB_FLUSH_ALL -1UL
#define TLB_GENERATION_INVALID 0
@@ -1229,7 +1229,7 @@ void flush_tlb_local(void)
/*
* Flush everything
*/
-void __flush_tlb_all(void)
+noinstr void __flush_tlb_all(void)
{
/*
* This is to catch users with enabled preemption and the PGE feature
@@ -1243,7 +1243,7 @@ void __flush_tlb_all(void)
/*
* !PGE -> !PCID (setup_pcid()), thus every flush is total.
*/
- flush_tlb_local();
+ __flush_tlb_local();
}
}
EXPORT_SYMBOL_GPL(__flush_tlb_all);
Later patches will require issuing a __flush_tlb_all() from noinstr code. Both __flush_tlb_local() and __flush_tlb_global() are now noinstr-compliant, so __flush_tlb_all() can be made noinstr itself. Signed-off-by: Valentin Schneider <vschneid@redhat.com> --- arch/x86/include/asm/tlbflush.h | 2 +- arch/x86/mm/tlb.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)