Index: kernel/arch/sparc64/include/trap/trap_table.h
===================================================================
--- kernel/arch/sparc64/include/trap/trap_table.h	(revision 5646813d46c6c28af3123d8f0877798b392a6672)
+++ kernel/arch/sparc64/include/trap/trap_table.h	(revision 700dcb56512f232c5ea579372dfb7d84382e7eff)
@@ -101,5 +101,5 @@
 .macro PREEMPTIBLE_HANDLER f
 	sethi %hi(\f), %g1
-	b preemptible_handler
+	ba %xcc, preemptible_handler
 	or %g1, %lo(\f), %g1
 .endm
Index: kernel/arch/sparc64/src/asm.S
===================================================================
--- kernel/arch/sparc64/src/asm.S	(revision 5646813d46c6c28af3123d8f0877798b392a6672)
+++ kernel/arch/sparc64/src/asm.S	(revision 700dcb56512f232c5ea579372dfb7d84382e7eff)
@@ -226,10 +226,10 @@
 .global memsetb
 memsetb:
-	b _memsetb
+	ba %xcc, _memsetb
 	nop
 
 .global memsetw
 memsetw:
-	b _memsetw
+	ba %xcc, _memsetw
 	nop
 
Index: kernel/arch/sparc64/src/dummy.s
===================================================================
--- kernel/arch/sparc64/src/dummy.s	(revision 5646813d46c6c28af3123d8f0877798b392a6672)
+++ kernel/arch/sparc64/src/dummy.s	(revision 700dcb56512f232c5ea579372dfb7d84382e7eff)
@@ -43,4 +43,4 @@
 .global cpu_halt
 cpu_halt:
-	b cpu_halt
+	ba %xcc, cpu_halt
 	nop