rebase patches on top of Ubuntu-5.19.0-24.25

[pve-kernel.git] / patches / kernel / 0015-KVM-x86-emulator-smm-use-smram-struct-for-32-bit-smr.patch

diff --git a/patches/kernel/0015-KVM-x86-emulator-smm-use-smram-struct-for-32-bit-smr.patch b/patches/kernel/0015-KVM-x86-emulator-smm-use-smram-struct-for-32-bit-smr.patch
index 6061e50e046190ecd9b28b81fcb940a615ed01b0..a3aa51e92516eb7fe2edc90b54d1c11eb532841e 100644 (file)
--- a/patches/kernel/0015-KVM-x86-emulator-smm-use-smram-struct-for-32-bit-smr.patch
+++ b/patches/kernel/0015-KVM-x86-emulator-smm-use-smram-struct-for-32-bit-smr.patch
@@ -15,7 +15,7 @@ Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
  2 files changed, 60 insertions(+), 96 deletions(-)
 
 diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
-index e29ae05e395b..70815bf6b4d2 100644
+index d0a70517e042..9aef34e5053b 100644
 --- a/arch/x86/kvm/emulate.c
 +++ b/arch/x86/kvm/emulate.c
 @@ -2359,25 +2359,17 @@ static void rsm_set_desc_flags(struct desc_struct *desc, u32 flags)
@@ -145,10 +145,10 @@ index e29ae05e395b..70815bf6b4d2 100644
        if (ret != X86EMUL_CONTINUE)
                goto emulate_shutdown;
 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index 5cd86c42c72c..61bd788c1d65 100644
+index e4cffaeddc2c..0169f80e880e 100644
 --- a/arch/x86/kvm/x86.c
 +++ b/arch/x86/kvm/x86.c
-@@ -9629,22 +9629,18 @@ static u32 enter_smm_get_segment_flags(struct kvm_segment *seg)
+@@ -9642,22 +9642,18 @@ static u32 enter_smm_get_segment_flags(struct kvm_segment *seg)
        return flags;
  }
  
@@ -179,7 +179,7 @@ index 5cd86c42c72c..61bd788c1d65 100644
  }
  
  #ifdef CONFIG_X86_64
-@@ -9665,54 +9661,47 @@ static void enter_smm_save_seg_64(struct kvm_vcpu *vcpu, char *buf, int n)
+@@ -9678,54 +9674,47 @@ static void enter_smm_save_seg_64(struct kvm_vcpu *vcpu, char *buf, int n)
  }
  #endif
  
@@ -257,7 +257,7 @@ index 5cd86c42c72c..61bd788c1d65 100644
  }
  
  #ifdef CONFIG_X86_64
-@@ -9783,7 +9772,7 @@ static void enter_smm(struct kvm_vcpu *vcpu)
+@@ -9796,7 +9785,7 @@ static void enter_smm(struct kvm_vcpu *vcpu)
                enter_smm_save_state_64(vcpu, (char *)&smram);
        else
  #endif