Index: kernel/arch/sparc64/include/context.h
===================================================================
--- kernel/arch/sparc64/include/context.h	(revision 3869e9c5de00d96dac63768b3c6224643771a98b)
+++ kernel/arch/sparc64/include/context.h	(revision f0f05add8ff9556055682fa6275acad5afad8e81)
@@ -49,6 +49,5 @@
 	(c)->pc = ((uintptr_t) _pc) - 8;								\
 	(c)->sp = ((uintptr_t) stack) + ALIGN_UP((size), STACK_ALIGNMENT) - (STACK_BIAS + SP_DELTA);	\
-	(c)->fp = -STACK_BIAS;										\
-	(c)->cleanwin = 0
+	(c)->fp = -STACK_BIAS
 	
 
@@ -77,5 +76,4 @@
 	uint64_t l7;
 	ipl_t ipl;
-	uint64_t cleanwin;
 };
 
Index: kernel/arch/sparc64/include/context_offset.h
===================================================================
--- kernel/arch/sparc64/include/context_offset.h	(revision 3869e9c5de00d96dac63768b3c6224643771a98b)
+++ kernel/arch/sparc64/include/context_offset.h	(revision f0f05add8ff9556055682fa6275acad5afad8e81)
@@ -48,5 +48,4 @@
 #define OFFSET_L6       0x80
 #define OFFSET_L7       0x88
-#define OFFSET_CLEANWIN 0x98
 
 #endif
Index: kernel/arch/sparc64/src/context.S
===================================================================
--- kernel/arch/sparc64/src/context.S	(revision 3869e9c5de00d96dac63768b3c6224643771a98b)
+++ kernel/arch/sparc64/src/context.S	(revision f0f05add8ff9556055682fa6275acad5afad8e81)
@@ -61,6 +61,4 @@
 	stx %l6, [\r + OFFSET_L6]
 	stx %l7, [\r + OFFSET_L7]
-	rdpr %cleanwin, %g1
-	stx %g1, [\r + OFFSET_CLEANWIN]
 .endm
 
@@ -84,6 +82,4 @@
 	ldx [\r + OFFSET_L6], %l6
 	ldx [\r + OFFSET_L7], %l7
-	ldx [\r + OFFSET_CLEANWIN], %g1
-	wrpr %g1, %g0, %cleanwin
 .endm