diff options
author | Steve French <sfrench@us.ibm.com> | 2006-02-22 23:38:53 +0000 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2006-02-22 23:38:53 +0000 |
commit | 5d2f248a5f3acac4b763439327c92091be7abb1c (patch) | |
tree | 8f30098a6d17c0367adfbb780e5a8d9a5c43ad5a /arch/mips/kernel/scall64-n32.S | |
parent | a048d7a8704b35ff6372fdf5eedd4533f37b1885 (diff) | |
parent | 9e956c2dac9bec602ed1ba29181b45ba6d2b6448 (diff) | |
download | blackbird-op-linux-5d2f248a5f3acac4b763439327c92091be7abb1c.tar.gz blackbird-op-linux-5d2f248a5f3acac4b763439327c92091be7abb1c.zip |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'arch/mips/kernel/scall64-n32.S')
-rw-r--r-- | arch/mips/kernel/scall64-n32.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index bc4980cefc8b..d87b5446fa13 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S @@ -245,9 +245,9 @@ EXPORT(sysn32_call_table) PTR sys_capget PTR sys_capset PTR sys32_rt_sigpending /* 6125 */ - PTR sysn32_rt_sigtimedwait + PTR compat_sys_rt_sigtimedwait PTR sys_rt_sigqueueinfo - PTR sys32_rt_sigsuspend + PTR sysn32_rt_sigsuspend PTR sys32_sigaltstack PTR compat_sys_utime /* 6130 */ PTR sys_mknod |