Index: kernel/arch/sparc64/src/sun4v/start.S
===================================================================
--- kernel/arch/sparc64/src/sun4v/start.S	(revision 819a7680d7084ac5520e063d46ba2f7f896b0183)
+++ kernel/arch/sparc64/src/sun4v/start.S	(revision 71d0d73754e90e17b9c25671ba4aa25c3c536274)
@@ -219,5 +219,5 @@
 	! on APs skip executing the following code
 	cmp %l7, 0
-	be 1f
+	be %xcc, 1f
 	nop
 
@@ -260,5 +260,5 @@
 
 0:
-	ba 0b
+	ba %xcc, 0b
 	nop
 
@@ -295,5 +295,5 @@
 	/* Not reached. */
 0:
-	ba 0b
+	ba %xcc, 0b
 	nop
 
@@ -314,5 +314,5 @@
 before_ap_boots:
 	setx 0x80400000, %g0, %o0
-	ba kernel_image_start
+	ba %xcc, kernel_image_start
 	nop
 
Index: kernel/arch/sparc64/src/trap/sun4v/trap_table.S
===================================================================
--- kernel/arch/sparc64/src/trap/sun4v/trap_table.S	(revision 819a7680d7084ac5520e063d46ba2f7f896b0183)
+++ kernel/arch/sparc64/src/trap/sun4v/trap_table.S	(revision 71d0d73754e90e17b9c25671ba4aa25c3c536274)
@@ -71,5 +71,5 @@
 .org trap_table + TT_INSTRUCTION_ACCESS_MMU_MISS*ENTRY_SIZE
 .global instruction_access_mmu_miss_handler_tl0
-	ba fast_instruction_access_mmu_miss_handler_tl0
+	ba %xcc, fast_instruction_access_mmu_miss_handler_tl0
 	nop
 
@@ -187,5 +187,5 @@
 .global data_access_mmu_miss_tl0
 data_access_mmu_miss_tl0:
-	ba fast_data_access_mmu_miss_handler_tl0
+	ba %xcc, fast_data_access_mmu_miss_handler_tl0
 	nop
 
@@ -394,5 +394,5 @@
 .global trap_instruction_\cur\()_tl0
 trap_instruction_\cur\()_tl0:
-	ba trap_instruction_handler
+	ba %xcc, trap_instruction_handler
 	mov \cur, %g2
 .endr
@@ -414,5 +414,5 @@
 .global instruction_access_mmu_miss_handler_tl1
 	wrpr %g0, 1, %tl
-	ba fast_instruction_access_mmu_miss_handler_tl0
+	ba %xcc, fast_instruction_access_mmu_miss_handler_tl0
 	nop
 
@@ -498,5 +498,5 @@
 .global data_access_mmu_miss_tl1
 data_access_mmu_miss_tl1:
-	ba fast_data_access_mmu_miss_handler_tl1
+	ba %xcc, fast_data_access_mmu_miss_handler_tl1
 	nop
 
@@ -787,5 +787,5 @@
 	be 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
 
@@ -982,5 +982,5 @@
 	wrpr %g3, 0, %cwp			! switch to the preceeding window
 
-	ba 5b
+	ba %xcc, 5b
 	inc %g4
 
@@ -1066,5 +1066,5 @@
 
 	PREEMPTIBLE_HANDLER_KERNEL
-	ba 101f
+	ba %xcc, 101f
 	nop