diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2018-08-16 07:45:09 -0400 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2018-08-16 07:45:09 -0400 |
| commit | 3bdd6e6c6a489937f6611447824fa98451d18aa1 (patch) | |
| tree | 874b19052a25ee30b09e2aff37a7bf9ddfccd59a | |
| parent | Linuxpatch 4.18.1 (diff) | |
| download | linux-patches-4.18-4.tar.gz linux-patches-4.18-4.tar.bz2 linux-patches-4.18-4.zip | |
x86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled.4.18-4
| -rw-r--r-- | 0000_README | 4 | ||||
| -rw-r--r-- | 1700_x86-l1tf-config-kvm-build-error-fix.patch | 40 |
2 files changed, 44 insertions, 0 deletions
diff --git a/0000_README b/0000_README index cf32ff21..ad4a3ed5 100644 --- a/0000_README +++ b/0000_README @@ -55,6 +55,10 @@ Patch: 1510_fs-enable-link-security-restrictions-by-default.patch From: http://sources.debian.net/src/linux/3.16.7-ckt4-3/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch/ Desc: Enable link security restrictions by default. +Patch: 1700_x86-l1tf-config-kvm-build-error-fix.patch +From: http://www.kernel.org +Desc: x86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled + Patch: 2500_usb-storage-Disable-UAS-on-JMicron-SATA-enclosure.patch From: https://bugzilla.redhat.com/show_bug.cgi?id=1260207#c5 Desc: Add UAS disable quirk. See bug #640082. diff --git a/1700_x86-l1tf-config-kvm-build-error-fix.patch b/1700_x86-l1tf-config-kvm-build-error-fix.patch new file mode 100644 index 00000000..88c2ec6c --- /dev/null +++ b/1700_x86-l1tf-config-kvm-build-error-fix.patch @@ -0,0 +1,40 @@ +From 1eb46908b35dfbac0ec1848d4b1e39667e0187e9 Mon Sep 17 00:00:00 2001 +From: Guenter Roeck <linux@roeck-us.net> +Date: Wed, 15 Aug 2018 08:38:33 -0700 +Subject: x86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled + +From: Guenter Roeck <linux@roeck-us.net> + +commit 1eb46908b35dfbac0ec1848d4b1e39667e0187e9 upstream. + +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") +Reported-by: Meelis Roos <mroos@linux.ee> +Cc: Meelis Roos <mroos@linux.ee> +Cc: Paolo Bonzini <pbonzini@redhat.com> +Cc: Thomas Gleixner <tglx@linutronix.de> +Signed-off-by: Guenter Roeck <linux@roeck-us.net> +Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + +--- + arch/x86/kernel/cpu/bugs.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/arch/x86/kernel/cpu/bugs.c ++++ b/arch/x86/kernel/cpu/bugs.c +@@ -648,10 +648,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) + { |