rebase patches on top of Ubuntu-4.15.0-56.62

[pve-kernel.git] / patches / kernel / 0009-KVM-Take-vcpu-mutex-outside-vcpu_load.patch

diff --git a/patches/kernel/0009-KVM-Take-vcpu-mutex-outside-vcpu_load.patch b/patches/kernel/0009-KVM-Take-vcpu-mutex-outside-vcpu_load.patch
index 4335c9a6a6a2029a05a46fdf77edec923da84a4a..110b2c718261af6c761b60de4002043a703045e2 100644 (file)
--- a/patches/kernel/0009-KVM-Take-vcpu-mutex-outside-vcpu_load.patch
+++ b/patches/kernel/0009-KVM-Take-vcpu-mutex-outside-vcpu_load.patch
@@ -33,10 +33,10 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  4 files changed, 15 insertions(+), 28 deletions(-)
 
 diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
-index 35a212169043..a4a11751df22 100644
+index 7c8341e2d3c1..921968c00dde 100644
 --- a/arch/x86/kvm/vmx.c
 +++ b/arch/x86/kvm/vmx.c
-@@ -9960,10 +9960,8 @@ static void vmx_switch_vmcs(struct kvm_vcpu *vcpu, struct loaded_vmcs *vmcs)
+@@ -9966,10 +9966,8 @@ static void vmx_switch_vmcs(struct kvm_vcpu *vcpu, struct loaded_vmcs *vmcs)
  static void vmx_free_vcpu_nested(struct kvm_vcpu *vcpu)
  {
         struct vcpu_vmx *vmx = to_vmx(vcpu);
@@ -49,10 +49,10 @@ index 35a212169043..a4a11751df22 100644
         free_nested(vmx);
         vcpu_put(vcpu);
 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index 1154795459de..3bf992a56e56 100644
+index e68f7bd79df5..0c971dce8915 100644
 --- a/arch/x86/kvm/x86.c
 +++ b/arch/x86/kvm/x86.c
-@@ -7951,16 +7951,12 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
+@@ -7957,16 +7957,12 @@ struct kvm_vcpu *kvm_arch_vcpu_create(struct kvm *kvm,
  
  int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
  {
@@ -71,7 +71,7 @@ index 1154795459de..3bf992a56e56 100644
  }
  
  void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
-@@ -7970,13 +7966,15 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
+@@ -7976,13 +7972,15 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
  
        kvm_hv_vcpu_postcreate(vcpu);
  
@@ -88,7 +88,7 @@ index 1154795459de..3bf992a56e56 100644
  
        if (!kvmclock_periodic_sync)
                return;
-@@ -7987,11 +7985,9 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
+@@ -7993,11 +7991,9 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)
  
  void kvm_arch_vcpu_destroy(struct kvm_vcpu *vcpu)
  {
@@ -101,7 +101,7 @@ index 1154795459de..3bf992a56e56 100644
        kvm_mmu_unload(vcpu);
        vcpu_put(vcpu);
  
-@@ -8365,9 +8361,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
+@@ -8371,9 +8367,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
  
  static void kvm_unload_vcpu_mmu(struct kvm_vcpu *vcpu)
  {