Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 99ac79479928bae42d694b7cb53644be5d3b6dd2

Authored by Randolph Chung
Committed by Kyle McMartin
1 parent 3a16568016

[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>

Showing 1 changed file with 13 additions and 3 deletions Side-by-side Diff

arch/parisc/kernel/entry.S
Diff comments   View file @ 99ac794
... ... @@ -821,7 +821,12 @@
821 821 ldo -16(%r30),%r29 /* Reference param save area */
822 822 loadgp /* Thread could have been in a module */
823 823 #endif
  824 +#ifndef CONFIG_64BIT
824 825 b sys_exit
  826 +#else
  827 + load32 sys_exit, %r1
  828 + bv %r0(%r1)
  829 +#endif
825 830 ldi 0, %r26
826 831  
827 832 .import sys_execve, code
... ... @@ -1012,7 +1017,7 @@
1012 1017  
1013 1018 .import do_softirq,code
1014 1019 intr_do_softirq:
1015   - bl do_softirq,%r2
  1020 + BL do_softirq,%r2
1016 1021 #ifdef __LP64__
1017 1022 ldo -16(%r30),%r29 /* Reference param save area */
1018 1023 #else
1019 1024  
... ... @@ -1036,7 +1041,12 @@
1036 1041 #endif
1037 1042  
1038 1043 ldil L%intr_check_sig, %r2
  1044 +#ifndef CONFIG_64BIT
1039 1045 b schedule
  1046 +#else
  1047 + load32 schedule, %r20
  1048 + bv %r0(%r20)
  1049 +#endif
1040 1050 ldo R%intr_check_sig(%r2), %r2
1041 1051  
1042 1052  
... ... @@ -1897,7 +1907,7 @@
1897 1907 #ifdef __LP64__
1898 1908 ldo -16(%r30),%r29 /* Reference param save area */
1899 1909 #endif
1900   - bl \execve,%r2
  1910 + BL \execve,%r2
1901 1911 copy %r1,%arg0
1902 1912  
1903 1913 ldo -FRAME_SIZE(%r30),%r30
... ... @@ -2226,7 +2236,7 @@
2226 2236  
2227 2237 .import do_softirq,code
2228 2238 syscall_do_softirq:
2229   - bl do_softirq,%r2
  2239 + BL do_softirq,%r2
2230 2240 nop
2231 2241 /* NOTE: We enable I-bit incase we schedule later,
2232 2242 * and we might be going back to userspace if we were