summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2021-08-13 03:20:18 -0400
committerPaolo Bonzini <pbonzini@redhat.com>2021-08-13 03:20:18 -0400
commit375d1adebc11b99e94e85f0ba2160e866e277447 (patch)
treee6acc1f462ccd6c331e7b76fbbdd933b6664fcf3 /arch
parentffbe17cadaf564b5da0e4eabdcff1b719e184a76 (diff)
parent7b9cae027ba3aaac295ae23a62f47876ed97da73 (diff)
Merge branch 'kvm-vmx-secctl' into kvm-master
Merge common topic branch for 5.14-rc6 and 5.15 merge window.
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/kvm/vmx/vmx.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h
index db88ed4f2121..17a1cb4b059d 100644
--- a/arch/x86/kvm/vmx/vmx.h
+++ b/arch/x86/kvm/vmx/vmx.h
@@ -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;
}