diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2012-07-12 08:01:31 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2013-10-29 16:24:52 -0400 |
commit | 2a9c27517685341655f2ed78aabdd0ee671c7210 (patch) | |
tree | 1a790386b055f4be6be3a334c1395bf425dc027a | |
parent | f4ae17aa0f2122b52f642985b46210a1f2eceb0a (diff) |
MIPS: compat: Export O32 syscall table and rename to avoid duplicate symbol.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/kernel/scall64-o32.S | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index 37605dc8eef7..f1acdb429f4f 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S | |||
@@ -53,7 +53,7 @@ NESTED(handle_sys, PT_SIZE, sp) | |||
53 | sll a3, a3, 0 | 53 | sll a3, a3, 0 |
54 | 54 | ||
55 | dsll t0, v0, 3 # offset into table | 55 | dsll t0, v0, 3 # offset into table |
56 | ld t2, (sys_call_table - (__NR_O32_Linux * 8))(t0) | 56 | ld t2, (sys32_call_table - (__NR_O32_Linux * 8))(t0) |
57 | 57 | ||
58 | sd a3, PT_R26(sp) # save a3 for syscall restarting | 58 | sd a3, PT_R26(sp) # save a3 for syscall restarting |
59 | 59 | ||
@@ -168,7 +168,7 @@ LEAF(sys32_syscall) | |||
168 | beqz t0, einval # do not recurse | 168 | beqz t0, einval # do not recurse |
169 | dsll t1, t0, 3 | 169 | dsll t1, t0, 3 |
170 | beqz v0, einval | 170 | beqz v0, einval |
171 | ld t2, sys_call_table(t1) # syscall routine | 171 | ld t2, sys32_call_table(t1) # syscall routine |
172 | 172 | ||
173 | move a0, a1 # shift argument registers | 173 | move a0, a1 # shift argument registers |
174 | move a1, a2 | 174 | move a1, a2 |
@@ -190,8 +190,8 @@ einval: li v0, -ENOSYS | |||
190 | END(sys32_syscall) | 190 | END(sys32_syscall) |
191 | 191 | ||
192 | .align 3 | 192 | .align 3 |
193 | .type sys_call_table,@object | 193 | .type sys32_call_table,@object |
194 | sys_call_table: | 194 | EXPORT(sys32_call_table) |
195 | PTR sys32_syscall /* 4000 */ | 195 | PTR sys32_syscall /* 4000 */ |
196 | PTR sys_exit | 196 | PTR sys_exit |
197 | PTR __sys_fork | 197 | PTR __sys_fork |
@@ -541,4 +541,4 @@ sys_call_table: | |||
541 | PTR compat_sys_process_vm_writev | 541 | PTR compat_sys_process_vm_writev |
542 | PTR sys_kcmp | 542 | PTR sys_kcmp |
543 | PTR sys_finit_module | 543 | PTR sys_finit_module |
544 | .size sys_call_table,.-sys_call_table | 544 | .size sys32_call_table,.-sys32_call_table |