Index: sys/arch/mips/mips/locore_mips1.S
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/mips/locore_mips1.S,v
retrieving revision 1.85
diff -u -p -r1.85 locore_mips1.S
--- sys/arch/mips/mips/locore_mips1.S	11 Jun 2015 07:30:10 -0000	1.85
+++ sys/arch/mips/mips/locore_mips1.S	3 Jul 2016 15:21:06 -0000
@@ -663,17 +663,18 @@ NESTED_NOPROFILE(MIPSX(user_gen_exceptio
 	move	MIPS_CURLWP, k1
 #ifdef NOFPU
 	li	t0, MIPS_SR_INT_IE		# reenable intrs
+	or	t0, a0
 #else
-	lui	t0, %hi(MIPS_SR_COP_1_BIT)
+	lui	t0, %hi(~MIPS_SR_COP_1_BIT)
+	addiu	t0, %lo(~MIPS_SR_COP_1_BIT)
 	and	t0, a0
-	or	t0, MIPS_SR_INT_IE		# make sure intrs are still on
 #endif
-	xor	t0, a0				# turn off the FPU & ints on
+	mtc0	t0, MIPS_COP_0_STATUS
+	nop
+
 /*
  * Call the trap handler.
  */
-	mtc0	t0, MIPS_COP_0_STATUS
-
 	jal	_C_LABEL(trap)
 	 REG_S	a3, CALLFRAME_RA(sp)		# for debugging
 /*