Index: kernel/arch/sparc64/include/trap/regwin.h
===================================================================
--- kernel/arch/sparc64/include/trap/regwin.h	(revision f389409f87a298e33da4584fafa80ff73cc3c7da)
+++ kernel/arch/sparc64/include/trap/regwin.h	(revision 68acf213513e3ac598c949d4ee2669fb0cfe9cb1)
@@ -183,4 +183,5 @@
 	add %l0, 1, %l0
 	wrpr %l0, 0, %cleanwin
+#if defined(SUN4U)
 	mov %r0, %l0
 	mov %r0, %l1
@@ -199,11 +200,12 @@
 	mov %r0, %o6
 	mov %r0, %o7
+#endif
 	retry
 .endm
 #endif /* __ASM__ */
 
-#if defined (SUN4U)
+#if defined(SUN4U)
 #include <arch/trap/sun4u/regwin.h>
-#elif defined (SUN4V)
+#elif defined(SUN4V)
 #include <arch/trap/sun4v/regwin.h>
 #endif