diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-05-23 16:47:12 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-05-25 09:39:19 +0200 |
commit | 3152657f104ce9b0f80793c92a745d5e97b43812 (patch) | |
tree | b720a75f328d16b999f02be8173e0db24ed699cb /arch/x86/kvm/cpuid.c | |
parent | b8c1b8ea7b219a7ba6d58d97bfdf1403b741f8d5 (diff) | |
parent | ba155e2d21f6bf05de86a78dbe5bfd8757604a65 (diff) | |
download | linux-3152657f104ce9b0f80793c92a745d5e97b43812.tar.bz2 |
Merge branch 'linus' into x86/fpu
Resolve semantic conflict in arch/x86/kvm/cpuid.c with:
c447e76b4cab ("kvm/fpu: Enable eager restore kvm FPU for MPX")
By removing the FPU internal include files.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kvm/cpuid.c')
-rw-r--r-- | arch/x86/kvm/cpuid.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 2426e6530d3c..9f705e618af5 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -95,6 +95,8 @@ int kvm_update_cpuid(struct kvm_vcpu *vcpu) if (best && (best->eax & (F(XSAVES) | F(XSAVEC)))) best->ebx = xstate_required_size(vcpu->arch.xcr0, true); + vcpu->arch.eager_fpu = guest_cpuid_has_mpx(vcpu); + /* * The existing code assumes virtual address is 48-bit in the canonical * address checks; exit if it is ever changed. |