Skip to content

Commit

Permalink
Merge commit 'kvm-vmx-nested-tsc-fix' into kvm-master
Browse files Browse the repository at this point in the history
Merge bugfix needed in both 5.19 (because it's bad) and 5.20 (because
it is a prerequisite to test new features).
  • Loading branch information
Paolo Bonzini committed Jul 14, 2022
2 parents 942d9e8 + 9948272 commit cca3f33
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion arch/x86/kvm/vmx/nested.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit cca3f33

Please sign in to comment.