commit: 8dfbfb0f4e2d0c808e8f7fe9e9d260bb878fc0fc Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Thu Aug 16 11:51:22 2018 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Thu Aug 16 11:51:22 2018 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=8dfbfb0f
x86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled 0000_README | 4 +-- 1700_x86-l1tf-config-kvm-build-error-fix.patch | 40 ++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/0000_README b/0000_README index aadb011..7fd9f53 100644 --- a/0000_README +++ b/0000_README @@ -535,9 +535,9 @@ Patch: 1520_security-apparmor-Use-POSIX-compatible-printf.patch From: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/patch/security/apparmor?id=651e54953b5d4ad103f0efa54fc6b380807fca3a Desc: security/apparmor: Use POSIX-compatible "printf '%s'". See bug #622552 -Patch: 1700_ia64-fix-module-loading-for-gcc-5.4.patch +Patch: 1700_x86-l1tf-config-kvm-build-error-fix.patch From: http://www.kernel.org -Desc: ia64: Lift the slot=2 restriction from the kernel module loader. +Desc: x86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled Patch: 1701_ia64_fix_ptrace.patch From: https://patchwork.kernel.org/patch/10198159/ 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 0000000..0465d83 --- /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 <[email protected]> +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 <[email protected]> + +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 <[email protected]> +Cc: Meelis Roos <[email protected]> +Cc: Paolo Bonzini <[email protected]> +Cc: Thomas Gleixner <[email protected]> +Signed-off-by: Guenter Roeck <[email protected]> +Signed-off-by: Linus Torvalds <[email protected]> +Signed-off-by: Greg Kroah-Hartman <[email protected]> + +--- + 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 +@@ -647,10 +647,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) + {
