diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index 77066f1bbe2f540fbc5599eb3e2e4df9fb887c1d..0c68a76143af75cbe20f4947726113f187ab0831 100644
--- a/arch/sparc64/kernel/setup.c
+++ b/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)