The static key is only ever updated in __init mmio_apply_mitigation Mark it to let objtool know not to warn about it. Signed-off-by: Valentin Schneider --- arch/x86/kernel/cpu/bugs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index d7fa03bf51b45..a2d7dc4d2a4a3 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -196,8 +196,11 @@ DEFINE_STATIC_KEY_FALSE(switch_mm_cond_l1d_flush); * Controls CPU Fill buffer clear before VMenter. This is a subset of * X86_FEATURE_CLEAR_CPU_BUF, and should only be enabled when KVM-only * mitigation is required. + * + * NOINSTR: This static key is only updated during init, so it can't be + * a cause of post-init interference. */ -DEFINE_STATIC_KEY_FALSE(cpu_buf_vm_clear); +DEFINE_STATIC_KEY_FALSE_NOINSTR(cpu_buf_vm_clear); EXPORT_SYMBOL_GPL(cpu_buf_vm_clear); #undef pr_fmt -- 2.51.0