summaryrefslogtreecommitdiffstats
path: root/include/asm-mips
diff options
context:
space:
mode:
authorThomas Bogendoerfer2007-09-13 20:23:48 +0200
committerRalf Baechle2007-10-18 19:11:46 +0200
commit15ad838d281b3681d96e37cba8a628177da8f4ff (patch)
tree655606a3de4a688ac5b409e7986ceb20b8c258c0 /include/asm-mips
parentMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff)
downloadkernel-qcow2-linux-15ad838d281b3681d96e37cba8a628177da8f4ff.tar.gz
kernel-qcow2-linux-15ad838d281b3681d96e37cba8a628177da8f4ff.tar.xz
kernel-qcow2-linux-15ad838d281b3681d96e37cba8a628177da8f4ff.zip
[MIPS] Always do the ARC64_TWIDDLE_PC thing.
Always jump to the place where the kernel is linked to. This helps where the bootloaders/proms ignores the start address inside the ELF header. Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'include/asm-mips')
-rw-r--r--include/asm-mips/mach-ip27/kernel-entry-init.h9
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 */