Index: kernel/arch/sparc64/src/sun4v/start.S
===================================================================
--- kernel/arch/sparc64/src/sun4v/start.S	(revision 0242621db9dbfb5d1b8b7311deb452c6f64280dc)
+++ kernel/arch/sparc64/src/sun4v/start.S	(revision 34bf3d57b654a7c5ea18d1c73a769dbf49c8eee4)
@@ -155,5 +155,4 @@
    	mov 0, %o5
    	ta 0xff
-   	nop
 
 	/*
@@ -250,7 +249,6 @@
 	 * Call arch_pre_main(bootinfo)
 	 */
+	call arch_pre_main
 	or %l1, %g0, %o0
-	call arch_pre_main
-	nop
 	
 	call main_bsp
@@ -260,6 +258,5 @@
 
 0:
-	ba %xcc, 0b
-	nop
+	ba,a %xcc, 0b
 
 1:
@@ -273,8 +270,8 @@
 	 */
 
-	mov	1, %o0			! MMU enable flag
-	set	mmu_enabled, %o1
-	mov	MMU_ENABLE, %o5	! MMU enable HV call
-	ta	0x80		! call HV
+	mov 1, %o0		! MMU enable flag
+	set mmu_enabled, %o1
+	mov MMU_ENABLE, %o5	! MMU enable HV call
+	ta 0x80			! call HV
 
 	mmu_enabled:
@@ -295,6 +292,5 @@
 	/* Not reached. */
 0:
-	ba %xcc, 0b
-	nop
+	ba,a %xcc, 0b
 
 .align 8
@@ -314,6 +310,5 @@
 before_ap_boots:
 	setx 0x80400000, %g0, %o0
-	ba %xcc, kernel_image_start
-	nop
+	ba,a %xcc, kernel_image_start
 
 .section K_DATA_START, "aw", @progbits