summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2022-07-14 17:04:12 +0300
committerPaolo Bonzini <pbonzini@redhat.com>2022-07-14 17:04:44 +0300
commitcca3f3381bef16ae04933cc3ff480952f7ae298f (patch)
tree82484c1917e332701e103900eefc44d44797ae3c /arch
parent942d9e89524c135615e557fffa144104ea8fb361 (diff)
parent99482726452bdf8be9325199022b17fa6d7d58fe (diff)
downloadlinux-cca3f3381bef16ae04933cc3ff480952f7ae298f.tar.xz
Merge commit 'kvm-vmx-nested-tsc-fix' into kvm-master
Merge bugfix needed in both 5.19 (because it's bad) and 5.20 (because it is a prerequisite to test new features).
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kvm/vmx/nested.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
index 3a4e895269d7..ab135f9ef52f 100644
--- a/arch/x86/kvm/vmx/nested.c
+++ b/arch/x86/kvm/vmx/nested.c
@@ -2278,7 +2278,6 @@ static void prepare_vmcs02_early(struct vcpu_vmx *vmx, struct loaded_vmcs *vmcs0
SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY |
SECONDARY_EXEC_APIC_REGISTER_VIRT |
SECONDARY_EXEC_ENABLE_VMFUNC |
- SECONDARY_EXEC_TSC_SCALING |
SECONDARY_EXEC_DESC);
if (nested_cpu_has(vmcs12,