x86/fpu, kvm: Remove host CR0.TS manipulation

[karo-tx-linux.git] / arch / x86 / kvm / vmx.c

diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index cf1b16dbc98a90d4035a480362a549f299faf55f..531c446331903072b49033dc4cdf86c5889b341c 100644 (file)
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -2144,12 +2144,6 @@ static void __vmx_load_host_state(struct vcpu_vmx *vmx)
 #endif
        if (vmx->host_state.msr_host_bndcfgs)
                wrmsrl(MSR_IA32_BNDCFGS, vmx->host_state.msr_host_bndcfgs);
-       /*
-        * If the FPU is not active (through the host task or
-        * the guest vcpu), then restore the cr0.TS bit.
-        */
-       if (!fpregs_active() && !vmx->vcpu.guest_fpu_loaded)
-               stts();
        load_gdt(this_cpu_ptr(&host_gdt));
 }
 
@@ -4871,9 +4865,11 @@ static void vmx_set_constant_host_state(struct vcpu_vmx *vmx)
        u32 low32, high32;
        unsigned long tmpl;
        struct desc_ptr dt;
-       unsigned long cr4;
+       unsigned long cr0, cr4;
 
-       vmcs_writel(HOST_CR0, read_cr0() & ~X86_CR0_TS);  /* 22.2.3 */
+       cr0 = read_cr0();
+       WARN_ON(cr0 & X86_CR0_TS);
+       vmcs_writel(HOST_CR0, cr0);  /* 22.2.3 */
        vmcs_writel(HOST_CR3, read_cr3());  /* 22.2.3  FIXME: shadow tables */
 
        /* Save the most likely value for this task's CR4 in the VMCS. */