Skip to contentSkip to conversation

x86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled

PATCH RESEND Applied Guenter Roeck 2 participants 2 messages Aug 15, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH RESEND 1/1 x86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled

allmodconfig+CONFIG_INTEL_KVM=n results in the following build error.

ERROR: "l1tf_vmx_mitigation" [arch/x86/kvm/kvm.ko] undefined!

Fixes 5b76a3cff011 ("KVM: VMX: Tell the nested hypervisor to skip L1D flush on vmentry")
Cc Meelis Roos <[email protected]>
Cc Paolo Bonzini <[email protected]>
Cc Thomas Gleixner <[email protected]>

---
Sorry for the early resend; widening the audience.

This problem affects Chrome OS builds, and I'll need to apply either this or a similar patch.
Since I would like to avoid applying a patch just to revert it later, any feedback if this is the correct patch or even the right approach would be most appreciated.

Thanks,
Guenter

 arch/x86/kernel/cpu/bugs.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
arch/x86/kernel/cpu/bugs.c +1 -2
index 27830880e7a7..cb4a16292aa7 100644
@@ -664,10 +664,9 @@ void x86_spec_ctrl_setup_ap(void)
 enum l1tf_mitigations l1tf_mitigation __ro_after_init = L1TF_MITIGATION_FLUSH;
 #if IS_ENABLED(CONFIG_KVM_INTEL)
 EXPORT_SYMBOL_GPL(l1tf_mitigation);
-
+#endif
 enum vmx_l1d_flush_state l1tf_vmx_mitigation = VMENTER_L1D_FLUSH_AUTO;
 EXPORT_SYMBOL_GPL(l1tf_vmx_mitigation);
-#endif
 
 static void __init l1tf_select_mitigation(void)
 {
Signature · 1 line
2.7.4
#1 lore raw
Quoted 2 lines · Guenter Roeck

Sorry for the early resend; widening the audience.

Yeah, I don't seem to see the first one, and the x86 people are all on vacation.

Applied.

Linus