Index: kernel/arch/sparc64/src/context.S
===================================================================
--- kernel/arch/sparc64/src/context.S	(revision 1b20da07baaa3e3c424f62c927274e676e4295cd)
+++ kernel/arch/sparc64/src/context.S	(revision 9b7adc385e10a6ce5a0bedf71fdcd0ae1b9fd585)
@@ -63,4 +63,5 @@
 	stx %l6, [%o0 + CONTEXT_OFFSET_L6]
 	stx %l7, [%o0 + CONTEXT_OFFSET_L7]
+	stx %g7, [%o0 + CONTEXT_OFFSET_TP]
 	retl
 	mov 1, %o0		! context_save_arch returns 1
@@ -103,4 +104,5 @@
 	ldx [%o0 + CONTEXT_OFFSET_L6], %l6
 	ldx [%o0 + CONTEXT_OFFSET_L7], %l7
+	ldx [%o0 + CONTEXT_OFFSET_TP], %g7
 	retl
 	xor %o0, %o0, %o0	! context_restore_arch returns 0