[SPARC64]: Elminate all usage of hard-coded trap globals.

[firefly-linux-kernel-4.4.55.git] / arch / sparc64 / kernel / setup.c

diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c
index 158bd31e15b790f255a81e2d23e024baf7157dca..59a70301a6cf65aeebc0195191595064e5d95bea 100644 (file)
--- a/arch/sparc64/kernel/setup.c
+++ b/arch/sparc64/kernel/setup.c
@@ -507,6 +507,11 @@ void __init setup_arch(char **cmdline_p)
        /* Work out if we are starfire early on */
        check_if_starfire();
 
+       /* Now we know enough to patch the __get_cpu_id()
+        * trampoline used by trap code.
+        */
+       per_cpu_patch();
+
        boot_flags_init(*cmdline_p);
 
        idprom_init();
@@ -545,6 +550,9 @@ void __init setup_arch(char **cmdline_p)
        smp_setup_cpu_possible_map();
 
        paging_init();
+
+       /* Get boot processor trap_block[] setup.  */
+       init_cur_cpu_trap();
 }
 
 static int __init set_preferred_console(void)