Index: kernel/arch/sparc64/src/start.S
===================================================================
--- kernel/arch/sparc64/src/start.S	(revision e386cbf7b94023b86cf28ea0747181297aa532e7)
+++ kernel/arch/sparc64/src/start.S	(revision beb3926abd13d8632e1c3093c0d2bef995372dee)
@@ -36,6 +36,4 @@
 .register %g2, #scratch
 .register %g3, #scratch
-.register %g6, #scratch
-.register %g7, #scratch
 
 .section K_TEXT_START, "ax"
@@ -154,5 +152,5 @@
 	 */
 	
-	set kernel_image_start, %g7
+	set kernel_image_start, %g5
 	
 	! write ITLB tag of context 1
@@ -160,20 +158,20 @@
 	set VA_DMMU_TAG_ACCESS, %g2
 	stxa %g1, [%g2] ASI_IMMU
-	flush %g7
+	flush %g5
 
 	! write ITLB data and install the temporary mapping in context 1
 	SET_TLB_DATA(g1, g2, 0)			! use non-global mapping
 	stxa %g1, [%g0] ASI_ITLB_DATA_IN_REG		
-	flush %g7
+	flush %g5
 	
 	! switch to context 1
 	set MEM_CONTEXT_TEMP, %g1
 	stxa %g1, [VA_PRIMARY_CONTEXT_REG] %asi	! ASI_DMMU is correct here !!!
-	flush %g7
+	flush %g5
 	
 	! demap context 0
 	SET_TLB_DEMAP_CMD(g1, TLB_DEMAP_NUCLEUS)
 	stxa %g0, [%g1] ASI_IMMU_DEMAP			
-	flush %g7
+	flush %g5
 	
 	! write ITLB tag of context 0
@@ -181,14 +179,14 @@
 	set VA_DMMU_TAG_ACCESS, %g2
 	stxa %g1, [%g2] ASI_IMMU
-	flush %g7
+	flush %g5
 
 	! write ITLB data and install the permanent kernel mapping in context 0
 	SET_TLB_DATA(g1, g2, 0)			! use non-global mapping
 	stxa %g1, [%g0] ASI_ITLB_DATA_IN_REG		
-	flush %g7
+	flush %g5
 
 	! switch to context 0
 	stxa %g0, [VA_PRIMARY_CONTEXT_REG] %asi	! ASI_DMMU is correct here !!!
-	flush %g7
+	flush %g5
 
 	! ensure nucleus mapping
@@ -198,14 +196,14 @@
 	set MEM_CONTEXT_TEMP, %g1
 	stxa %g1, [VA_PRIMARY_CONTEXT_REG] %asi	! ASI_DMMU is correct here !!!
-	flush %g7
+	flush %g5
 
 	! demap context 1
 	SET_TLB_DEMAP_CMD(g1, TLB_DEMAP_PRIMARY)
 	stxa %g0, [%g1] ASI_IMMU_DEMAP			
-	flush %g7
+	flush %g5
 	
 	! set context 0 in the primary context register
 	stxa %g0, [VA_PRIMARY_CONTEXT_REG] %asi	! ASI_DMMU is correct here !!!
-	flush %g7
+	flush %g5
 	
 	! set TL back to 0