[MIPS] Always do the ARC64_TWIDDLE_PC thing.

[~andy/linux] / arch / mips / kernel / head.S

diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S
index f78538eceef77c903bf393b20256ce7b2a5552a7..2367687310630c40a68b11423a21dab45cc6b2a9 100644 (file)
--- a/arch/mips/kernel/head.S
+++ b/arch/mips/kernel/head.S
@@ -27,16 +27,6 @@
 
 #include <kernel-entry-init.h>
 
-       .macro  ARC64_TWIDDLE_PC
-#if defined(CONFIG_ARC64) || defined(CONFIG_MAPPED_KERNEL)
-       /* We get launched at a XKPHYS address but the kernel is linked to
-          run at a KSEG0 address, so jump there.  */
-       PTR_LA  t0, \@f
-       jr      t0
-\@:
-#endif
-       .endm
-
        /*
         * inputs are the text nasid in t1, data nasid in t2.
         */
@@ -138,7 +128,6 @@
        .fill   0x400
 #endif
 
-EXPORT(stext)                                  # used for profiling
 EXPORT(_stext)
 
 #ifdef CONFIG_BOOT_RAW
@@ -150,13 +139,19 @@ EXPORT(_stext)
        __INIT
 #endif
 
+       __INIT_REFOK
+
 NESTED(kernel_entry, 16, sp)                   # kernel entry point
 
        kernel_entry_setup                      # cpu specific setup
 
        setup_c0_status_pri
 
-       ARC64_TWIDDLE_PC
+       /* We might not get launched at the address the kernel is linked to,
+          so we jump there.  */
+       PTR_LA  t0, 0f
+       jr      t0
+0:
 
 #ifdef CONFIG_MIPS_MT_SMTC
        /*