From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 14 Feb 2020 21:15:04 +0000 (-0500)
Subject: add include for queue-4.9/kvm-x86-protect-dr-based-index-computations-from-spectre... 
X-Git-Tag: v4.4.214~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a6b413f61936249896601f148e5b8ed843c589d3;p=thirdparty%2Fkernel%2Fstable-queue.git

add include for queue-4.9/kvm-x86-protect-dr-based-index-computations-from-spectre-v1-l1tf-attacks.patch
---

diff --git a/queue-4.9/kvm-x86-protect-dr-based-index-computations-from-spectre-v1-l1tf-attacks.patch b/queue-4.9/kvm-x86-protect-dr-based-index-computations-from-spectre-v1-l1tf-attacks.patch
index e029ba34c06..5b9148e3ea0 100644
--- a/queue-4.9/kvm-x86-protect-dr-based-index-computations-from-spectre-v1-l1tf-attacks.patch
+++ b/queue-4.9/kvm-x86-protect-dr-based-index-computations-from-spectre-v1-l1tf-attacks.patch
@@ -24,12 +24,20 @@ Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- arch/x86/kvm/x86.c |    8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
+ arch/x86/kvm/x86.c |    9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
 
 --- a/arch/x86/kvm/x86.c
 +++ b/arch/x86/kvm/x86.c
-@@ -889,9 +889,11 @@ static u64 kvm_dr6_fixed(struct kvm_vcpu
+@@ -54,6 +54,7 @@
+ #include <linux/pvclock_gtod.h>
+ #include <linux/kvm_irqfd.h>
+ #include <linux/irqbypass.h>
++#include <linux/nospec.h>
+ #include <trace/events/kvm.h>
+ 
+ #include <asm/debugreg.h>
+@@ -889,9 +890,11 @@ static u64 kvm_dr6_fixed(struct kvm_vcpu
  
  static int __kvm_set_dr(struct kvm_vcpu *vcpu, int dr, unsigned long val)
  {
@@ -42,7 +50,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  		if (!(vcpu->guest_debug & KVM_GUESTDBG_USE_HW_BP))
  			vcpu->arch.eff_db[dr] = val;
  		break;
-@@ -928,9 +930,11 @@ EXPORT_SYMBOL_GPL(kvm_set_dr);
+@@ -928,9 +931,11 @@ EXPORT_SYMBOL_GPL(kvm_set_dr);
  
  int kvm_get_dr(struct kvm_vcpu *vcpu, int dr, unsigned long *val)
  {