Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] time: Move R4000 clockevent device code to separate configurable file
  [MIPS] time: Delete dead cycles_per_jiffy, mips_timer_ack and null_timer_ack
  [MIPS] IP32: Retire use of plat_timer_setup.
  [MIPS] Jazz: Retire use of plat_timer_setup.
  [MIPS] IP27: Convert to clock_event_device.
  [MIPS] JMR3927: Convert to clock_event_device.
  [MIPS] Always do the ARC64_TWIDDLE_PC thing.

1 files changed, 8 insertions, 1 deletions

diff --git a/include/asm-mips/mach-ip27/kernel-entry-init.h b/include/asm-mips/mach-ip27/kernel-entry-init.h
index c1a10314b317..624d66c7f290 100644
--- a/include/asm-mips/mach-ip27/kernel-entry-init.h
+++ b/include/asm-mips/mach-ip27/kernel-entry-init.h
@@ -46,7 +46,14 @@
         lh      t1, KV_RO_NASID_OFFSET(t0)
         lh      t2, KV_RW_NASID_OFFSET(t0)
         MAPPED_KERNEL_SETUP_TLB
-        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:
         .endm
 
 #endif /* __ASM_MACH_IP27_KERNEL_ENTRY_H */