diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2022-07-14 16:04:12 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-07-14 16:04:44 +0200 |
| commit | cca3f3381bef16ae04933cc3ff480952f7ae298f (patch) | |
| tree | 82484c1917e332701e103900eefc44d44797ae3c /arch | |
| parent | Documentation: kvm: clarify histogram units (diff) | |
| parent | KVM: nVMX: Always enable TSC scaling for L2 when it was enabled for L1 (diff) | |
| download | linux-cca3f3381bef16ae04933cc3ff480952f7ae298f.tar.xz linux-cca3f3381bef16ae04933cc3ff480952f7ae298f.zip | |
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.c | 1 |
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, |