Commit 375d1ade authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge branch 'kvm-vmx-secctl' into kvm-master 

Merge common topic branch for 5.14-rc6 and 5.15 merge window.
parents ffbe17ca 7b9cae02

arch/x86/kvm/vmx/vmx.h

+1 −1
Original line number Diff line number Diff line
@@ -522,7 +522,7 @@ static inline struct vmcs *alloc_vmcs(bool shadow) 


static inline bool vmx_has_waitpkg(struct vcpu_vmx *vmx)

{

	return vmx->secondary_exec_control &

	return secondary_exec_controls_get(vmx) &

		SECONDARY_EXEC_ENABLE_USR_WAIT_PAUSE;

}