diff --git a/[refs] b/[refs]
index 57382c4e3336..1d61fcff4b13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3763be32d591cacf808c36390a8af3f2784cde5f
+refs/heads/master: 52845cdb3b9c4c5fe1c2e295bd14457ff8dd6bcc
diff --git a/trunk/arch/sparc64/kernel/setup.c b/trunk/arch/sparc64/kernel/setup.c
index 77066f1bbe2f..0c68a76143af 100644
--- a/trunk/arch/sparc64/kernel/setup.c
+++ b/trunk/arch/sparc64/kernel/setup.c
@@ -379,10 +379,10 @@ void __init setup_arch(char **cmdline_p)
 
 	smp_setup_cpu_possible_map();
 
-	paging_init();
-
 	/* Get boot processor trap_block[] setup.  */
 	init_cur_cpu_trap(current_thread_info());
+
+	paging_init();
 }
 
 static int __init set_preferred_console(void)