Index: kernel/arch/mips32/src/context.S
===================================================================
--- kernel/arch/mips32/src/context.S	(revision ed88c8e9e48e792fdd0df46568e33e36eb624db3)
+++ kernel/arch/mips32/src/context.S	(revision 9d8307a94aa6d903e4fcaa8ae5c22e2fa48fddfb)
@@ -47,4 +47,5 @@
 	sw $s8, CONTEXT_OFFSET_S8($a0)
 	sw $gp, CONTEXT_OFFSET_GP($a0)
+	sw $k1, CONTEXT_OFFSET_TP($a0)
 
 	sw $ra, CONTEXT_OFFSET_PC($a0)
@@ -67,4 +68,5 @@
 	lw $s8, CONTEXT_OFFSET_S8($a0)
 	lw $gp, CONTEXT_OFFSET_GP($a0)
+	lw $k1, CONTEXT_OFFSET_TP($a0)
 
 	lw $ra, CONTEXT_OFFSET_PC($a0)
Index: kernel/arch/mips32/src/start.S
===================================================================
--- kernel/arch/mips32/src/start.S	(revision ed88c8e9e48e792fdd0df46568e33e36eb624db3)
+++ kernel/arch/mips32/src/start.S	(revision 9d8307a94aa6d903e4fcaa8ae5c22e2fa48fddfb)
@@ -264,5 +264,4 @@
 	mfc0 $t2, $status
 	sw $t3, ISTATE_OFFSET_EPC($sp)  /* save EPC */
-	sw $k1, ISTATE_OFFSET_KT1($sp)  /* save $k1 not saved on context switch */
 
 	and $t4, $t2, REG_SAVE_MASK  /* save only KSU, EXL, ERL, IE */
@@ -300,5 +299,4 @@
 	/* restore epc + 4 */
 	lw $t2, ISTATE_OFFSET_EPC($sp)
-	lw $k1, ISTATE_OFFSET_KT1($sp)
 	addi $t2, $t2, 4
 	mtc0 $t2, $epc