diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /arch/ia64/ia32/sys_ia32.c | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/ia64/ia32/sys_ia32.c')
| -rw-r--r-- | arch/ia64/ia32/sys_ia32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c index e29a8a55486a..3fa67ecebc83 100644 --- a/arch/ia64/ia32/sys_ia32.c +++ b/arch/ia64/ia32/sys_ia32.c | |||
| @@ -2327,7 +2327,7 @@ sys32_sendfile (int out_fd, int in_fd, int __user *offset, unsigned int count) | |||
| 2327 | ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *) &of : NULL, count); | 2327 | ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *) &of : NULL, count); |
| 2328 | set_fs(old_fs); | 2328 | set_fs(old_fs); |
| 2329 | 2329 | ||
| 2330 | if (!ret && offset && put_user(of, offset)) | 2330 | if (offset && put_user(of, offset)) |
| 2331 | return -EFAULT; | 2331 | return -EFAULT; |
| 2332 | 2332 | ||
| 2333 | return ret; | 2333 | return ret; |