summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2013-03-02 10:38:22 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2013-03-03 23:00:40 -0500
commit2ae80c43d480548dd32591664c93ef011ac34b21 (patch)
tree6e701db31d1695d5a324bb2cf59b1fcfd199c63f /arch
parent728ee06ca863eb05004aebcaf6f61905f545ef08 (diff)
downloadlinux-stable-2ae80c43d480548dd32591664c93ef011ac34b21.tar.gz
linux-stable-2ae80c43d480548dd32591664c93ef011ac34b21.tar.bz2
linux-stable-2ae80c43d480548dd32591664c93ef011ac34b21.zip
sparc: no need to sign-extend in sync_file_range() wrapper
the first argument will be sign-extended by sys_sync_file_range() SYSCALL_DEFINE-generate wrapper; the last argument is unsigned int, so the same wrapper will will truncate it anyway. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc/kernel/sys32.S1
-rw-r--r--arch/sparc/kernel/sys_sparc32.c2
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc/kernel/sys32.S b/arch/sparc/kernel/sys32.S
index 0dbc2d6afdfc..2e680b5245c9 100644
--- a/arch/sparc/kernel/sys32.S
+++ b/arch/sparc/kernel/sys32.S
@@ -48,7 +48,6 @@ SIGN3(sys32_futex, compat_sys_futex, %o1, %o2, %o5)
SIGN1(sys32_recvfrom, compat_sys_recvfrom, %o0)
SIGN1(sys32_recvmsg, compat_sys_recvmsg, %o0)
SIGN1(sys32_sendmsg, compat_sys_sendmsg, %o0)
-SIGN2(sys32_sync_file_range, compat_sync_file_range, %o0, %o5)
.globl sys32_mmap2
sys32_mmap2:
diff --git a/arch/sparc/kernel/sys_sparc32.c b/arch/sparc/kernel/sys_sparc32.c
index d546188b13df..3d0ddbc005fe 100644
--- a/arch/sparc/kernel/sys_sparc32.c
+++ b/arch/sparc/kernel/sys_sparc32.c
@@ -238,7 +238,7 @@ long compat_sys_fadvise64_64(int fd,
advice);
}
-long compat_sync_file_range(int fd, unsigned long off_high, unsigned long off_low, unsigned long nb_high, unsigned long nb_low, int flags)
+long sys32_sync_file_range(unsigned int fd, unsigned long off_high, unsigned long off_low, unsigned long nb_high, unsigned long nb_low, unsigned int flags)
{
return sys_sync_file_range(fd,
(off_high << 32) | off_low,