diff options
Diffstat (limited to 'arch/mips/kernel/linux32.c')
-rw-r--r-- | arch/mips/kernel/linux32.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index 993abc868e54..4613219dd73e 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c | |||
@@ -313,7 +313,7 @@ asmlinkage int sys32_sysinfo(struct sysinfo32 *info) | |||
313 | struct sysinfo s; | 313 | struct sysinfo s; |
314 | int ret, err; | 314 | int ret, err; |
315 | mm_segment_t old_fs = get_fs (); | 315 | mm_segment_t old_fs = get_fs (); |
316 | 316 | ||
317 | set_fs (KERNEL_DS); | 317 | set_fs (KERNEL_DS); |
318 | ret = sys_sysinfo(&s); | 318 | ret = sys_sysinfo(&s); |
319 | set_fs (old_fs); | 319 | set_fs (old_fs); |
@@ -560,7 +560,7 @@ struct ipc64_perm32 { | |||
560 | compat_gid_t gid; | 560 | compat_gid_t gid; |
561 | compat_uid_t cuid; | 561 | compat_uid_t cuid; |
562 | compat_gid_t cgid; | 562 | compat_gid_t cgid; |
563 | compat_mode_t mode; | 563 | compat_mode_t mode; |
564 | unsigned short seq; | 564 | unsigned short seq; |
565 | unsigned short __pad1; | 565 | unsigned short __pad1; |
566 | unsigned int __unused1; | 566 | unsigned int __unused1; |
@@ -1334,17 +1334,17 @@ asmlinkage int sys32_sendfile(int out_fd, int in_fd, compat_off_t *offset, | |||
1334 | mm_segment_t old_fs = get_fs(); | 1334 | mm_segment_t old_fs = get_fs(); |
1335 | int ret; | 1335 | int ret; |
1336 | off_t of; | 1336 | off_t of; |
1337 | 1337 | ||
1338 | if (offset && get_user(of, offset)) | 1338 | if (offset && get_user(of, offset)) |
1339 | return -EFAULT; | 1339 | return -EFAULT; |
1340 | 1340 | ||
1341 | set_fs(KERNEL_DS); | 1341 | set_fs(KERNEL_DS); |
1342 | ret = sys_sendfile(out_fd, in_fd, offset ? &of : NULL, count); | 1342 | ret = sys_sendfile(out_fd, in_fd, offset ? &of : NULL, count); |
1343 | set_fs(old_fs); | 1343 | set_fs(old_fs); |
1344 | 1344 | ||
1345 | if (offset && put_user(of, offset)) | 1345 | if (offset && put_user(of, offset)) |
1346 | return -EFAULT; | 1346 | return -EFAULT; |
1347 | 1347 | ||
1348 | return ret; | 1348 | return ret; |
1349 | } | 1349 | } |
1350 | 1350 | ||
@@ -1362,11 +1362,11 @@ static unsigned char socketcall_nargs[18]={AL(0),AL(3),AL(3),AL(3),AL(2),AL(3), | |||
1362 | #undef AL | 1362 | #undef AL |
1363 | 1363 | ||
1364 | /* | 1364 | /* |
1365 | * System call vectors. | 1365 | * System call vectors. |
1366 | * | 1366 | * |
1367 | * Argument checking cleaned up. Saved 20% in size. | 1367 | * Argument checking cleaned up. Saved 20% in size. |
1368 | * This function doesn't need to set the kernel lock because | 1368 | * This function doesn't need to set the kernel lock because |
1369 | * it is set by the callees. | 1369 | * it is set by the callees. |
1370 | */ | 1370 | */ |
1371 | 1371 | ||
1372 | asmlinkage long sys32_socketcall(int call, unsigned int *args32) | 1372 | asmlinkage long sys32_socketcall(int call, unsigned int *args32) |
@@ -1402,11 +1402,11 @@ asmlinkage long sys32_socketcall(int call, unsigned int *args32) | |||
1402 | /* copy_from_user should be SMP safe. */ | 1402 | /* copy_from_user should be SMP safe. */ |
1403 | if (copy_from_user(a, args32, socketcall_nargs[call])) | 1403 | if (copy_from_user(a, args32, socketcall_nargs[call])) |
1404 | return -EFAULT; | 1404 | return -EFAULT; |
1405 | 1405 | ||
1406 | a0=a[0]; | 1406 | a0=a[0]; |
1407 | a1=a[1]; | 1407 | a1=a[1]; |
1408 | 1408 | ||
1409 | switch(call) | 1409 | switch(call) |
1410 | { | 1410 | { |
1411 | case SYS_SOCKET: | 1411 | case SYS_SOCKET: |
1412 | err = sys_socket(a0,a1,a[2]); | 1412 | err = sys_socket(a0,a1,a[2]); |