diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-24 02:17:03 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-03-03 22:58:46 -0500 |
commit | 19f4fc3aee180000fe45952691bbe69dde1d9e95 (patch) | |
tree | 195578ae347797f6aeb66f237aeea7e0eae9847c /arch/x86 | |
parent | 7d197ed4a68e76000070979563051e08bf6fc0aa (diff) |
convert sendfile{,64} to COMPAT_SYSCALL_DEFINE
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/ia32/sys_ia32.c | 20 | ||||
-rw-r--r-- | arch/x86/include/asm/sys_ia32.h | 1 | ||||
-rw-r--r-- | arch/x86/syscalls/syscall_32.tbl | 2 |
3 files changed, 1 insertions, 22 deletions
diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c index ad7a20cbc699..ad6ca0472722 100644 --- a/arch/x86/ia32/sys_ia32.c +++ b/arch/x86/ia32/sys_ia32.c | |||
@@ -194,26 +194,6 @@ asmlinkage long sys32_pwrite(unsigned int fd, const char __user *ubuf, | |||
194 | } | 194 | } |
195 | 195 | ||
196 | 196 | ||
197 | asmlinkage long sys32_sendfile(int out_fd, int in_fd, | ||
198 | compat_off_t __user *offset, s32 count) | ||
199 | { | ||
200 | mm_segment_t old_fs = get_fs(); | ||
201 | int ret; | ||
202 | off_t of; | ||
203 | |||
204 | if (offset && get_user(of, offset)) | ||
205 | return -EFAULT; | ||
206 | |||
207 | set_fs(KERNEL_DS); | ||
208 | ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *)&of : NULL, | ||
209 | count); | ||
210 | set_fs(old_fs); | ||
211 | |||
212 | if (offset && put_user(of, offset)) | ||
213 | return -EFAULT; | ||
214 | return ret; | ||
215 | } | ||
216 | |||
217 | /* | 197 | /* |
218 | * Some system calls that need sign extended arguments. This could be | 198 | * Some system calls that need sign extended arguments. This could be |
219 | * done by a generic wrapper. | 199 | * done by a generic wrapper. |
diff --git a/arch/x86/include/asm/sys_ia32.h b/arch/x86/include/asm/sys_ia32.h index 8459efc39686..6d944e4bb524 100644 --- a/arch/x86/include/asm/sys_ia32.h +++ b/arch/x86/include/asm/sys_ia32.h | |||
@@ -41,7 +41,6 @@ asmlinkage long sys32_pread(unsigned int, char __user *, u32, u32, u32); | |||
41 | asmlinkage long sys32_pwrite(unsigned int, const char __user *, u32, u32, u32); | 41 | asmlinkage long sys32_pwrite(unsigned int, const char __user *, u32, u32, u32); |
42 | 42 | ||
43 | asmlinkage long sys32_personality(unsigned long); | 43 | asmlinkage long sys32_personality(unsigned long); |
44 | asmlinkage long sys32_sendfile(int, int, compat_off_t __user *, s32); | ||
45 | 44 | ||
46 | long sys32_kill(int, int); | 45 | long sys32_kill(int, int); |
47 | long sys32_fadvise64_64(int, __u32, __u32, __u32, __u32, int); | 46 | long sys32_fadvise64_64(int, __u32, __u32, __u32, __u32, int); |
diff --git a/arch/x86/syscalls/syscall_32.tbl b/arch/x86/syscalls/syscall_32.tbl index e6d55f0064df..6a00b1257d68 100644 --- a/arch/x86/syscalls/syscall_32.tbl +++ b/arch/x86/syscalls/syscall_32.tbl | |||
@@ -193,7 +193,7 @@ | |||
193 | 184 i386 capget sys_capget | 193 | 184 i386 capget sys_capget |
194 | 185 i386 capset sys_capset | 194 | 185 i386 capset sys_capset |
195 | 186 i386 sigaltstack sys_sigaltstack compat_sys_sigaltstack | 195 | 186 i386 sigaltstack sys_sigaltstack compat_sys_sigaltstack |
196 | 187 i386 sendfile sys_sendfile sys32_sendfile | 196 | 187 i386 sendfile sys_sendfile compat_sys_sendfile |
197 | 188 i386 getpmsg | 197 | 188 i386 getpmsg |
198 | 189 i386 putpmsg | 198 | 189 i386 putpmsg |
199 | 190 i386 vfork sys_vfork stub32_vfork | 199 | 190 i386 vfork sys_vfork stub32_vfork |