summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRandolph Chung <tausq@parisc-linux.org>2005-10-21 22:42:57 -0400
committerKyle McMartin <kyle@parisc-linux.org>2005-10-21 22:42:57 -0400
commit99ac79479928bae42d694b7cb53644be5d3b6dd2 (patch)
treef7f8793f2d5df8d3179f86c1eb75c93a2c94749b /arch
parent3a165680168758733b7a9f7fb835954fbe6b91a8 (diff)
downloadlinux-next-99ac79479928bae42d694b7cb53644be5d3b6dd2.tar.gz
[PARISC] Replace some calls to bl with b,l or bv to use longer offsets
convert some bl calls to b,l or bv to use longer offsets Signed-off-by: Randolph Chung <tausq@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/parisc/kernel/entry.S16
1 files changed, 13 insertions, 3 deletions
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index 65a82c2645a7..ec04e0ad77fa 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -821,7 +821,12 @@ ret_from_kernel_thread:
ldo -16(%r30),%r29 /* Reference param save area */
loadgp /* Thread could have been in a module */
#endif
+#ifndef CONFIG_64BIT
b sys_exit
+#else
+ load32 sys_exit, %r1
+ bv %r0(%r1)
+#endif
ldi 0, %r26
.import sys_execve, code
@@ -1012,7 +1017,7 @@ intr_restore:
.import do_softirq,code
intr_do_softirq:
- bl do_softirq,%r2
+ BL do_softirq,%r2
#ifdef __LP64__
ldo -16(%r30),%r29 /* Reference param save area */
#else
@@ -1036,7 +1041,12 @@ intr_do_resched:
#endif
ldil L%intr_check_sig, %r2
+#ifndef CONFIG_64BIT
b schedule
+#else
+ load32 schedule, %r20
+ bv %r0(%r20)
+#endif
ldo R%intr_check_sig(%r2), %r2
@@ -1897,7 +1907,7 @@ sys_vfork_wrapper:
#ifdef __LP64__
ldo -16(%r30),%r29 /* Reference param save area */
#endif
- bl \execve,%r2
+ BL \execve,%r2
copy %r1,%arg0
ldo -FRAME_SIZE(%r30),%r30
@@ -2226,7 +2236,7 @@ pt_regs_ok:
.import do_softirq,code
syscall_do_softirq:
- bl do_softirq,%r2
+ BL do_softirq,%r2
nop
/* NOTE: We enable I-bit incase we schedule later,
* and we might be going back to userspace if we were