diff options
author | Clark Williams <williams@redhat.com> | 2012-02-29 09:50:56 -0600 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2012-02-29 09:50:56 -0600 |
commit | 5f269e50cb10cd1a74b89f7fda87b0c9082754f0 (patch) | |
tree | 76f82e09728bbed59baebcff2e0b008f0ab5eead /arch/x86/kvm/vmx.c | |
parent | a0c034c3726715d1928b301ddd43c51799c0c07a (diff) | |
parent | 1de504ea25617f701ac3a246a1c9dfd2246d4900 (diff) |
Merge commit 'v3.2.8' into rt-3.2.7-rt13v3.2.8-rt13
Conflicts:
arch/x86/kernel/process_32.c
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 579a0b51696a..4ea76784fe65 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -1456,7 +1456,7 @@ static void __vmx_load_host_state(struct vcpu_vmx *vmx) #ifdef CONFIG_X86_64 wrmsrl(MSR_KERNEL_GS_BASE, vmx->msr_host_kernel_gs_base); #endif - if (current_thread_info()->status & TS_USEDFPU) + if (__thread_has_fpu(current)) clts(); load_gdt(&__get_cpu_var(host_gdt)); } |