diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-05-20 09:09:26 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-05-20 09:09:26 +0200 |
| commit | 06cd3d8c14bdd06f49f1c6a06acf219749c5598e (patch) | |
| tree | b9dd9ad824e489803072b9517dc01c0d75a4f918 /arch/x86/kvm/vmx.c | |
| parent | 0f6ff2bce0d4c3e4ff34f5d2ffb7329025b30844 (diff) | |
| parent | bc231d9ede99518b67a77544d9084f15b898fe2e (diff) | |
| download | linux-next-06cd3d8c14bdd06f49f1c6a06acf219749c5598e.tar.gz | |
Merge branch 'linus' into x86/urgent, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kvm/vmx.c')
| -rw-r--r-- | arch/x86/kvm/vmx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 133679d520af..cb47fe3da292 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -3390,7 +3390,7 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf) } } - if (cpu_has_xsaves) + if (boot_cpu_has(X86_FEATURE_XSAVES)) rdmsrl(MSR_IA32_XSS, host_xss); return 0; |