diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-05-20 11:46:12 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-05-20 12:31:37 +0200 |
| commit | a9b4fb7e79e7624c97c55e9c7562e3fe866ce70f (patch) | |
| tree | f690b927077f73993bc7e01c10fc47cce0460b85 /arch/x86/kvm/cpuid.c | |
| parent | ed3cf15271fa150320b46f03d369777b71786298 (diff) | |
| parent | c447e76b4cabb49ddae8e49c5758f031f35d55fb (diff) | |
| download | lwn-a9b4fb7e79e7624c97c55e9c7562e3fe866ce70f.tar.gz lwn-a9b4fb7e79e7624c97c55e9c7562e3fe866ce70f.zip | |
Merge branch 'kvm-master' into kvm-next
Grab MPX bugfix, and fix conflicts against Rik's adaptive FPU
deactivation patch.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/cpuid.c')
| -rw-r--r-- | arch/x86/kvm/cpuid.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 59b69f6a2844..92a74a0428aa 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -16,6 +16,8 @@ #include <linux/module.h> #include <linux/vmalloc.h> #include <linux/uaccess.h> +#include <asm/i387.h> /* For use_eager_fpu. Ugh! */ +#include <asm/fpu-internal.h> /* For use_eager_fpu. Ugh! */ #include <asm/user.h> #include <asm/xsave.h> #include "cpuid.h" @@ -95,6 +97,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 = use_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. |