1 |
commit: 3bdd6e6c6a489937f6611447824fa98451d18aa1 |
2 |
Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Aug 16 11:45:09 2018 +0000 |
4 |
Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 16 11:45:09 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=3bdd6e6c |
7 |
|
8 |
x86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled. |
9 |
|
10 |
0000_README | 4 +++ |
11 |
1700_x86-l1tf-config-kvm-build-error-fix.patch | 40 ++++++++++++++++++++++++++ |
12 |
2 files changed, 44 insertions(+) |
13 |
|
14 |
diff --git a/0000_README b/0000_README |
15 |
index cf32ff2..ad4a3ed 100644 |
16 |
--- a/0000_README |
17 |
+++ b/0000_README |
18 |
@@ -55,6 +55,10 @@ Patch: 1510_fs-enable-link-security-restrictions-by-default.patch |
19 |
From: http://sources.debian.net/src/linux/3.16.7-ckt4-3/debian/patches/debian/fs-enable-link-security-restrictions-by-default.patch/ |
20 |
Desc: Enable link security restrictions by default. |
21 |
|
22 |
+Patch: 1700_x86-l1tf-config-kvm-build-error-fix.patch |
23 |
+From: http://www.kernel.org |
24 |
+Desc: x86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled |
25 |
+ |
26 |
Patch: 2500_usb-storage-Disable-UAS-on-JMicron-SATA-enclosure.patch |
27 |
From: https://bugzilla.redhat.com/show_bug.cgi?id=1260207#c5 |
28 |
Desc: Add UAS disable quirk. See bug #640082. |
29 |
|
30 |
diff --git a/1700_x86-l1tf-config-kvm-build-error-fix.patch b/1700_x86-l1tf-config-kvm-build-error-fix.patch |
31 |
new file mode 100644 |
32 |
index 0000000..88c2ec6 |
33 |
--- /dev/null |
34 |
+++ b/1700_x86-l1tf-config-kvm-build-error-fix.patch |
35 |
@@ -0,0 +1,40 @@ |
36 |
+From 1eb46908b35dfbac0ec1848d4b1e39667e0187e9 Mon Sep 17 00:00:00 2001 |
37 |
+From: Guenter Roeck <linux@××××××××.net> |
38 |
+Date: Wed, 15 Aug 2018 08:38:33 -0700 |
39 |
+Subject: x86/l1tf: Fix build error seen if CONFIG_KVM_INTEL is disabled |
40 |
+ |
41 |
+From: Guenter Roeck <linux@××××××××.net> |
42 |
+ |
43 |
+commit 1eb46908b35dfbac0ec1848d4b1e39667e0187e9 upstream. |
44 |
+ |
45 |
+allmodconfig+CONFIG_INTEL_KVM=n results in the following build error. |
46 |
+ |
47 |
+ ERROR: "l1tf_vmx_mitigation" [arch/x86/kvm/kvm.ko] undefined! |
48 |
+ |
49 |
+Fixes: 5b76a3cff011 ("KVM: VMX: Tell the nested hypervisor to skip L1D flush on vmentry") |
50 |
+Reported-by: Meelis Roos <mroos@×××××.ee> |
51 |
+Cc: Meelis Roos <mroos@×××××.ee> |
52 |
+Cc: Paolo Bonzini <pbonzini@××××××.com> |
53 |
+Cc: Thomas Gleixner <tglx@××××××××××.de> |
54 |
+Signed-off-by: Guenter Roeck <linux@××××××××.net> |
55 |
+Signed-off-by: Linus Torvalds <torvalds@××××××××××××××××.org> |
56 |
+Signed-off-by: Greg Kroah-Hartman <gregkh@×××××××××××××××.org> |
57 |
+ |
58 |
+--- |
59 |
+ arch/x86/kernel/cpu/bugs.c | 3 +-- |
60 |
+ 1 file changed, 1 insertion(+), 2 deletions(-) |
61 |
+ |
62 |
+--- a/arch/x86/kernel/cpu/bugs.c |
63 |
++++ b/arch/x86/kernel/cpu/bugs.c |
64 |
+@@ -648,10 +648,9 @@ void x86_spec_ctrl_setup_ap(void) |
65 |
+ enum l1tf_mitigations l1tf_mitigation __ro_after_init = L1TF_MITIGATION_FLUSH; |
66 |
+ #if IS_ENABLED(CONFIG_KVM_INTEL) |
67 |
+ EXPORT_SYMBOL_GPL(l1tf_mitigation); |
68 |
+- |
69 |
++#endif |
70 |
+ enum vmx_l1d_flush_state l1tf_vmx_mitigation = VMENTER_L1D_FLUSH_AUTO; |
71 |
+ EXPORT_SYMBOL_GPL(l1tf_vmx_mitigation); |
72 |
+-#endif |
73 |
+ |
74 |
+ static void __init l1tf_select_mitigation(void) |
75 |
+ { |