rebase patches on top of Ubuntu-4.15.0-56.62

[pve-kernel.git] / patches / kernel / 0008-kvm-x86-Add-AMD-s-EX_CFG-to-the-list-of-ignored-MSRs.patch

diff --git a/patches/kernel/0008-kvm-x86-Add-AMD-s-EX_CFG-to-the-list-of-ignored-MSRs.patch b/patches/kernel/0008-kvm-x86-Add-AMD-s-EX_CFG-to-the-list-of-ignored-MSRs.patch
index 98180c1c1289e147035bbb214e61b2a83f2dd9cb..a1c8f5897c3b524d907986390f282e29e8320fc4 100644 (file)
--- a/patches/kernel/0008-kvm-x86-Add-AMD-s-EX_CFG-to-the-list-of-ignored-MSRs.patch
+++ b/patches/kernel/0008-kvm-x86-Add-AMD-s-EX_CFG-to-the-list-of-ignored-MSRs.patch
@@ -34,10 +34,10 @@ index 7ca92f9b5eae..4eb78a908544 100644
  /* Fam 10h MSRs */
  #define MSR_FAM10H_MMIO_CONF_BASE     0xc0010058
 diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
-index ac17f53812af..1154795459de 100644
+index 0bc041658a1b..e68f7bd79df5 100644
 --- a/arch/x86/kvm/x86.c
 +++ b/arch/x86/kvm/x86.c
-@@ -2240,6 +2240,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
+@@ -2241,6 +2241,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
        case MSR_AMD64_PATCH_LOADER:
        case MSR_AMD64_BU_CFG2:
        case MSR_AMD64_DC_CFG:
@@ -45,7 +45,7 @@ index ac17f53812af..1154795459de 100644
                break;
  
        case MSR_IA32_UCODE_REV:
-@@ -2528,6 +2529,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
+@@ -2529,6 +2530,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
        case MSR_AMD64_BU_CFG2:
        case MSR_IA32_PERF_CTL:
        case MSR_AMD64_DC_CFG: