Index: kernel/arch/sparc64/src/trap/trap_table.S
===================================================================
--- kernel/arch/sparc64/src/trap/trap_table.S	(revision 577b531c31f06ba14573dcf44830503f428e4120)
+++ kernel/arch/sparc64/src/trap/trap_table.S	(revision a1a83e5e5ddb366d3021bdee2baa08d1a60230fc)
@@ -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