Index: boot/arch/sparc64/loader/boot.S
===================================================================
--- boot/arch/sparc64/loader/boot.S	(revision a9ac978f3aba8259d5f8270ee59a08a41d15d94c)
+++ boot/arch/sparc64/loader/boot.S	(revision 8d4a5772bb8975bd74b05c14ebf01c08c7cd18ef)
@@ -59,10 +59,8 @@
 	 * Disable interrupts and disable address masking.
 	 */
-	rdpr %pstate, %g2
-	and %g2, ~(PSTATE_IE_BIT|PSTATE_AM_BIT), %g2
-	wrpr %g2, 0, %pstate
+	wrpr %g0, PSTATE_PRIV_BIT, %pstate
 
-	set initial_stack_top, %g3
-	add %g3, -STACK_BIAS, %sp
+	set initial_stack_top, %sp
+	add %sp, -STACK_BIAS, %sp
 
 	set ofw_cif, %l0
Index: boot/arch/sparc64/loader/register.h
===================================================================
--- boot/arch/sparc64/loader/register.h	(revision a9ac978f3aba8259d5f8270ee59a08a41d15d94c)
+++ boot/arch/sparc64/loader/register.h	(revision 8d4a5772bb8975bd74b05c14ebf01c08c7cd18ef)
@@ -31,4 +31,5 @@
 
 #define PSTATE_IE_BIT   2
+#define PSTATE_PRIV_BIT	4
 #define PSTATE_AM_BIT   8