summaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/sys32.S
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2009-08-28 07:00:20 +0200
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2009-08-28 07:00:20 +0200
commit4b61bb575b1fb42ab1df228ae7812e5135f656da (patch)
tree03456466e6f678456ea462a7da4b352d1aa03aa3 /arch/sparc/kernel/sys32.S
parentInput: xpad - add USB ID for the drumkit controller from Rock Band (diff)
parentLinux 2.6.31-rc8 (diff)
downloadlinux-4b61bb575b1fb42ab1df228ae7812e5135f656da.tar.xz
linux-4b61bb575b1fb42ab1df228ae7812e5135f656da.zip
Merge commit 'v2.6.31-rc8' into next
Diffstat (limited to 'arch/sparc/kernel/sys32.S')
-rw-r--r--arch/sparc/kernel/sys32.S4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sparc/kernel/sys32.S b/arch/sparc/kernel/sys32.S
index f061c4dda9ef..aed94869ad6a 100644
--- a/arch/sparc/kernel/sys32.S
+++ b/arch/sparc/kernel/sys32.S
@@ -134,10 +134,12 @@ SIGN1(sys32_getpeername, sys_getpeername, %o0)
SIGN1(sys32_getsockname, sys_getsockname, %o0)
SIGN2(sys32_ioprio_get, sys_ioprio_get, %o0, %o1)
SIGN3(sys32_ioprio_set, sys_ioprio_set, %o0, %o1, %o2)
-SIGN2(sys32_splice, sys_splice, %o0, %o1)
+SIGN2(sys32_splice, sys_splice, %o0, %o2)
SIGN2(sys32_sync_file_range, compat_sync_file_range, %o0, %o5)
SIGN2(sys32_tee, sys_tee, %o0, %o1)
SIGN1(sys32_vmsplice, compat_sys_vmsplice, %o0)
+SIGN1(sys32_truncate, sys_truncate, %o1)
+SIGN1(sys32_ftruncate, sys_ftruncate, %o1)
.globl sys32_mmap2
sys32_mmap2: