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