From: Ralf Baechle Date: Thu, 12 Jul 2012 12:01:31 +0000 (+0200) Subject: MIPS: compat: Export O32 syscall table and rename to avoid duplicate symbol. X-Git-Tag: next-20120817~87^2^5~17 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0901855e02d464080994c12c85c0759540ed83ac;p=karo-tx-linux.git MIPS: compat: Export O32 syscall table and rename to avoid duplicate symbol. Signed-off-by: Ralf Baechle --- diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index 54228553691d..fa8538ef4d14 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) sll a3, a3, 0 dsll t0, v0, 3 # offset into table - ld t2, (sys_call_table - (__NR_O32_Linux * 8))(t0) + ld t2, (sys32_call_table - (__NR_O32_Linux * 8))(t0) sd a3, PT_R26(sp) # save a3 for syscall restarting @@ -179,7 +179,7 @@ LEAF(sys32_syscall) beqz t0, einval # do not recurse dsll t1, t0, 3 beqz v0, einval - ld t2, sys_call_table(t1) # syscall routine + ld t2, sys32_call_table(t1) # syscall routine move a0, a1 # shift argument registers move a1, a2 @@ -201,8 +201,8 @@ einval: li v0, -ENOSYS END(sys32_syscall) .align 3 - .type sys_call_table,@object -sys_call_table: + .type sys32_call_table,@object +EXPORT(sys32_call_table) PTR sys32_syscall /* 4000 */ PTR sys_exit PTR sys_fork @@ -550,4 +550,4 @@ sys_call_table: PTR sys_setns PTR compat_sys_process_vm_readv /* 4345 */ PTR compat_sys_process_vm_writev - .size sys_call_table,.-sys_call_table + .size sys32_call_table,.-sys32_call_table