Index: sys/arch/mips/mips/mipsX_subr.S
===================================================================
RCS file: /cvsroot/src/sys/arch/mips/mips/mipsX_subr.S,v
retrieving revision 1.63
diff -u -p -r1.63 mipsX_subr.S
--- sys/arch/mips/mips/mipsX_subr.S	2 Jul 2016 19:40:57 -0000	1.63
+++ sys/arch/mips/mips/mipsX_subr.S	4 Jul 2016 14:01:22 -0000
@@ -1651,12 +1651,12 @@ NESTED_NOPROFILE(MIPSX(systemcall), CALL
 	 * Turn off FPU and enter kernel mode
 	 */
 #ifdef NOFPU
+	and	t0, a1, MIPS_SR_KSU_MASK|MIPS_SR_EXL
+	xor	t0, a1				# clear the bits
+#else
 	lui	t0, %hi(~(MIPS_SR_COP_1_BIT|MIPS_SR_EXL|MIPS_SR_KSU_MASK))
 	addiu	t0, %lo(~(MIPS_SR_COP_1_BIT|MIPS_SR_EXL|MIPS_SR_KSU_MASK))
 	and	t0, a1
-#else
-	and	t0, a1, MIPS_SR_EXL|MIPS_SR_KSU_MASK
-	xor	t0, a1				# turns off the FPU & ints on
 #endif
 	mtc0	t0, MIPS_COP_0_STATUS		# re-enable interrupts
 	COP0_SYNC