Index: kernel/arch/sparc64/include/atomic.h
===================================================================
--- kernel/arch/sparc64/include/atomic.h	(revision 253d3d0b04f3cdd9b3b0618555c429868401a3d7)
+++ kernel/arch/sparc64/include/atomic.h	(revision 5646813d46c6c28af3123d8f0877798b392a6672)
@@ -124,5 +124,5 @@
 		"brz %2, 0b\n"
 		"nop\n"
-		"ba 1b\n"
+		"ba %xcc, 1b\n"
 		"nop\n"
 	"2:\n"
Index: kernel/arch/sparc64/src/start.S
===================================================================
--- kernel/arch/sparc64/src/start.S	(revision 253d3d0b04f3cdd9b3b0618555c429868401a3d7)
+++ kernel/arch/sparc64/src/start.S	(revision 5646813d46c6c28af3123d8f0877798b392a6672)
@@ -295,5 +295,5 @@
 
 0:
-	ba 0b
+	ba %xcc, 0b
 	nop
 
@@ -353,5 +353,5 @@
 	
 0:
-	ba 0b
+	ba %xcc, 0b
 	nop
 
Index: kernel/arch/sparc64/src/trap/trap_table.S
===================================================================
--- kernel/arch/sparc64/src/trap/trap_table.S	(revision 253d3d0b04f3cdd9b3b0618555c429868401a3d7)
+++ kernel/arch/sparc64/src/trap/trap_table.S	(revision 5646813d46c6c28af3123d8f0877798b392a6672)
@@ -342,5 +342,5 @@
 .global trap_instruction_\cur\()_tl0
 trap_instruction_\cur\()_tl0:
-	ba trap_instruction_handler
+	ba %xcc, trap_instruction_handler
 	mov \cur, %g2
 .endr
@@ -481,5 +481,5 @@
 	be %xcc, 1f
 	nop
-0:	ba 0b					! this is for debugging, if we ever get here
+0:	ba %xcc, 0b				! this is for debugging, if we ever get here
 	nop					! it will be easy to find
 
@@ -546,5 +546,5 @@
 
 .if NOT(\is_syscall)
-	ba 1f
+	ba %xcc, 1f
 	nop
 0:
@@ -775,5 +775,5 @@
 	wrpr %g3, 0, %cwp			! switch to the preceeding window
 
-	ba 0b
+	ba %xcc, 0b
 	inc %g4