[patch 8/9] x86/cpu: Provide a declaration for itlb_multihit_kvm_mitigation

Thomas Gleixner
2024-03-04T10:12:29Z

sparse complains rightfully about the missing declaration which has been
placed sloppily into the usage site:

bugs.c:2223:6: sparse: warning: symbol 'itlb_multihit_kvm_mitigation' was
not declared. Should it be static?

Add it to spec-ctrl.h where it belongs and remove the one in the kvm code.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/x86/include/asm/spec-ctrl.h | 2 ++
arch/x86/kvm/mmu/mmu.c | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)

--- a/arch/x86/include/asm/spec-ctrl.h
+++ b/arch/x86/include/asm/spec-ctrl.h
@@ -96,4 +96,6 @@ static inline void speculative_store_byp
extern void speculation_ctrl_update(unsigned long tif);
extern void speculation_ctrl_update_current(void);

+extern bool itlb_multihit_kvm_mitigation;
+
#endif
--- a/arch/x86/kvm/mmu/mmu.c
+++ b/arch/x86/kvm/mmu/mmu.c
@@ -53,12 +53,11 @@
#include <asm/cmpxchg.h>
#include <asm/io.h>
#include <asm/set_memory.h>
+#include <asm/spec-ctrl.h>
#include <asm/vmx.h>

#include "trace.h"

-extern bool itlb_multihit_kvm_mitigation;
-
static bool nx_hugepage_mitigation_hard_disabled;

int __read_mostly nx_huge_pages = -1;