diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2018-08-17 15:36:32 -0400 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2018-08-17 15:36:32 -0400 |
| commit | 4b86d5a2e2a3a350b298b8391a5052ae93c582b7 (patch) | |
| tree | 4f8d88c8a34fc11bde4049e6ca8887254d7f3684 | |
| parent | Linux patch 4.14.64 (diff) | |
| download | linux-patches-4b86d5a2.tar.gz linux-patches-4b86d5a2.tar.bz2 linux-patches-4b86d5a2.zip | |
Removal of redundant patch:4.14-70
x86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled
| -rw-r--r-- | 0000_README | 4 | ||||
| -rw-r--r-- | 1705_x86-l1tf-config-kvm-build-error-fix.patch | 40 |
2 files changed, 0 insertions, 44 deletions
diff --git a/0000_README b/0000_README index 41f1d759..614d36d7 100644 --- a/0000_README +++ b/0000_README @@ -311,10 +311,6 @@ Patch: 1700_ia64_fix_ptrace.patch From: https://patchwork.kernel.org/patch/10198159/ Desc: ia64: fix ptrace(PTRACE_GETREGS) (unbreaks strace, gdb). -Patch: 1705_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: 2100_bcache-data-corruption-fix-for-bi-partno.patch From: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=62530ed8b1d07a45dec94d46e521c0c6c2d476e6 Desc: bio: ensure __bio_clone_fast copies bi_partno. diff --git a/1705_x86-l1tf-config-kvm-build-error-fix.patch b/1705_x86-l1tf-config-kvm-build-error-fix.patch deleted file mode 100644 index 88c2ec6c..00000000 --- a/1705_x86-l1tf-config-kvm-build-error-fix.patch +++ /dev/null @@ -1,40 +0,0 @@ -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) - { |