Skip to content

Commit cca3f33

Browse files
committed
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).
2 parents 942d9e8 + 9948272 commit cca3f33

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

arch/x86/kvm/vmx/nested.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2278,7 +2278,6 @@ static void prepare_vmcs02_early(struct vcpu_vmx *vmx, struct loaded_vmcs *vmcs0
22782278
SECONDARY_EXEC_VIRTUAL_INTR_DELIVERY |
22792279
SECONDARY_EXEC_APIC_REGISTER_VIRT |
22802280
SECONDARY_EXEC_ENABLE_VMFUNC |
2281-
SECONDARY_EXEC_TSC_SCALING |
22822281
SECONDARY_EXEC_DESC);
22832282

22842283
if (nested_cpu_has(vmcs12,

0 commit comments

Comments
 (0)