2 files changed, 4 insertions, 4 deletions

diff --git a/arch/mips/kvm/locore.S b/arch/mips/kvm/locore.S
index d7279c03c517..4a68b176d6e4 100644
--- a/arch/mips/kvm/locore.S
+++ b/arch/mips/kvm/locore.S
@@ -434,7 +434,7 @@ __kvm_mips_return_to_guest:
         /* Setup status register for running guest in UM */
         .set    at
         or      v1, v1, (ST0_EXL | KSU_USER | ST0_IE)
-        and     v1, v1, ~ST0_CU0
+        and     v1, v1, ~(ST0_CU0 | ST0_MX)
         .set    noat
         mtc0    v1, CP0_STATUS
         ehb
diff --git a/arch/mips/kvm/mips.c b/arch/mips/kvm/mips.c
index 9a28ea4f54f3..e97b90784031 100644
--- a/arch/mips/kvm/mips.c
+++ b/arch/mips/kvm/mips.c
@@ -15,6 +15,7 @@
 #include <linux/vmalloc.h>
 #include <linux/fs.h>
 #include <linux/bootmem.h>
+#include <asm/fpu.h>
 #include <asm/page.h>
 #include <asm/cacheflush.h>
 #include <asm/mmu_context.h>
@@ -379,6 +380,8 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
                 vcpu->mmio_needed = 0;
         }
 
+        lose_fpu(1);
+
         local_irq_disable();
         /* Check if we have any exceptions/interrupts pending */
         kvm_mips_deliver_interrupts(vcpu,
@@ -986,9 +989,6 @@ static void kvm_mips_set_c0_status(void)
 {
         uint32_t status = read_c0_status();
 
-        if (cpu_has_fpu)
-                status |= (ST0_CU1);
-
         if (cpu_has_dsp)
                 status |= (ST0_MX);