Commit cca3f338 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

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).
parents 942d9e89 99482726

arch/x86/kvm/vmx/nested.c

+0 −1
Original line number Diff line number Diff line
@@ -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,