diff options
| author |   Mike Pagano <mpagano@gentoo.org> | 2018-08-17 15:31:30 -0400 |
|---|---|---|
| committer | Mike Pagano <mpagano@gentoo.org> | 2018-08-17 15:31:30 -0400 |
| commit | 5b1c12860e4bb46e53237d0159814697ef211ae4 (patch) | |
| tree | 39174a54a22094ae5d22b1d9fc43b59a0a4d6d1a | |
| parent | Linux patch 4.9.121 (diff) | |
| download | linux-patches-5b1c1286.tar.gz linux-patches-5b1c1286.tar.bz2 linux-patches-5b1c1286.zip | |
Removal of redundant patch:4.9-125
x86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled
| -rw-r--r-- | 0000_README | 4 | ||||
| -rw-r--r-- | 1700_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 17809f73..f11157c4 100644 --- a/0000_README +++ b/0000_README @@ -539,10 +539,6 @@ 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_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: 1701_ia64_fix_ptrace.patch From: https://patchwork.kernel.org/patch/10198159/ Desc: ia64: fix ptrace(PTRACE_GETREGS) (unbreaks strace, gdb). diff --git a/1700_x86-l1tf-config-kvm-build-error-fix.patch b/1700_x86-l1tf-config-kvm-build-error-fix.patch deleted file mode 100644 index 0465d835..00000000 --- a/1700_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 -@@ -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) - { |