Index: kernel/arch/sparc64/src/start.S
===================================================================
--- kernel/arch/sparc64/src/start.S	(revision c23baaba8508e03b530374f43aa8f061ee436dc9)
+++ kernel/arch/sparc64/src/start.S	(revision 398e7688de12da26b65b495b144b4116c331da05)
@@ -77,16 +77,4 @@
 
 	/*
-	 * Copy the bootinfo structure passed from the boot loader
-	 * to the kernel bootinfo structure.
-	 */
-	brz %l7, 0f				! skip if you are not the bootstrap CPU
-	nop
-	
-	sethi %hi(bootinfo), %o0
-	call memcpy
-	or %o0, %lo(bootinfo), %o0
-0:
-
-	/*
 	 * Switch to kernel trap table.
 	 */
@@ -210,15 +198,6 @@
 	flush %g5
 
-	! switch to context 0
-	stxa %g0, [VA_PRIMARY_CONTEXT_REG] %asi	! ASI_DMMU is correct here !!!
-	flush %g5
-
-	! ensure nucleus mapping
+	! enter nucleus - using context 0
 	wrpr %g0, 1, %tl
-
-	! set context 1 in the primary context register
-	mov MEM_CONTEXT_TEMP, %g1
-	stxa %g1, [VA_PRIMARY_CONTEXT_REG] %asi	! ASI_DMMU is correct here !!!
-	flush %g5
 
 	! demap context 1
@@ -231,9 +210,13 @@
 	flush %g5
 	
-	! set TL back to 0
+	! leave nucleus - using primary context, i.e. context 0
 	wrpr %g0, 0, %tl
 
 	brz %l7, 1f				! skip if you are not the bootstrap CPU
 	nop
+
+	sethi %hi(bootinfo), %o0
+	call memcpy				! copy bootinfo
+	or %o0, %lo(bootinfo), %o0
 
 	call arch_pre_main
@@ -272,5 +255,4 @@
 	nop
 
-
 	/*
 	 * Configure stack for the AP.