diff options
-rw-r--r-- | arch/mips/kernel/linux32.c | 10 | ||||
-rw-r--r-- | arch/mips/kernel/scall32-o32.S | 1 | ||||
-rw-r--r-- | arch/mips/kernel/scall64-64.S | 1 | ||||
-rw-r--r-- | arch/mips/kernel/scall64-n32.S | 1 | ||||
-rw-r--r-- | arch/mips/kernel/scall64-o32.S | 1 | ||||
-rw-r--r-- | include/asm-mips/unistd.h | 15 |
6 files changed, 23 insertions, 6 deletions
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c index 3f40c37a9ee6..7c953bcc5f6a 100644 --- a/arch/mips/kernel/linux32.c +++ b/arch/mips/kernel/linux32.c | |||
@@ -1182,6 +1182,16 @@ asmlinkage ssize_t sys32_readahead(int fd, u32 pad0, u64 a2, u64 a3, | |||
1182 | return sys_readahead(fd, merge_64(a2, a3), count); | 1182 | return sys_readahead(fd, merge_64(a2, a3), count); |
1183 | } | 1183 | } |
1184 | 1184 | ||
1185 | asmlinkage long sys32_sync_file_range(int fd, int __pad, | ||
1186 | unsigned long a2, unsigned long a3, | ||
1187 | unsigned long a4, unsigned long a5, | ||
1188 | int flags) | ||
1189 | { | ||
1190 | return sys_sync_file_range(fd, | ||
1191 | merge_64(a2, a3), merge_64(a4, a5), | ||
1192 | flags); | ||
1193 | } | ||
1194 | |||
1185 | /* Argument list sizes for sys_socketcall */ | 1195 | /* Argument list sizes for sys_socketcall */ |
1186 | #define AL(x) ((x) * sizeof(unsigned int)) | 1196 | #define AL(x) ((x) * sizeof(unsigned int)) |
1187 | static unsigned char socketcall_nargs[18]={AL(0),AL(3),AL(3),AL(3),AL(2),AL(3), | 1197 | static unsigned char socketcall_nargs[18]={AL(0),AL(3),AL(3),AL(3),AL(2),AL(3), |
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S index c05ba056b1e4..4e36b87be1ed 100644 --- a/arch/mips/kernel/scall32-o32.S +++ b/arch/mips/kernel/scall32-o32.S | |||
@@ -635,6 +635,7 @@ einval: li v0, -EINVAL | |||
635 | sys sys_ppoll 5 | 635 | sys sys_ppoll 5 |
636 | sys sys_unshare 1 | 636 | sys sys_unshare 1 |
637 | sys sys_splice 4 | 637 | sys sys_splice 4 |
638 | sys sys_sync_file_range 7 /* 4305 */ | ||
638 | .endm | 639 | .endm |
639 | 640 | ||
640 | /* We pre-compute the number of _instruction_ bytes needed to | 641 | /* We pre-compute the number of _instruction_ bytes needed to |
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S index f7c4e751f54a..9ba750887377 100644 --- a/arch/mips/kernel/scall64-64.S +++ b/arch/mips/kernel/scall64-64.S | |||
@@ -461,3 +461,4 @@ sys_call_table: | |||
461 | PTR sys_ppoll | 461 | PTR sys_ppoll |
462 | PTR sys_unshare | 462 | PTR sys_unshare |
463 | PTR sys_splice | 463 | PTR sys_splice |
464 | PTR sys_sync_file_range | ||
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index 52aea55d9c5a..942aca26f9c4 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S | |||
@@ -387,3 +387,4 @@ EXPORT(sysn32_call_table) | |||
387 | PTR sys_ppoll /* 6265 */ | 387 | PTR sys_ppoll /* 6265 */ |
388 | PTR sys_unshare | 388 | PTR sys_unshare |
389 | PTR sys_splice | 389 | PTR sys_splice |
390 | PTR sys_sync_file_range | ||
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index c7e766e46368..b53a9207f530 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S | |||
@@ -509,4 +509,5 @@ sys_call_table: | |||
509 | PTR sys_ppoll | 509 | PTR sys_ppoll |
510 | PTR sys_unshare | 510 | PTR sys_unshare |
511 | PTR sys_splice | 511 | PTR sys_splice |
512 | PTR sys32_sync_file_range /* 4305 */ | ||
512 | .size sys_call_table,.-sys_call_table | 513 | .size sys_call_table,.-sys_call_table |
diff --git a/include/asm-mips/unistd.h b/include/asm-mips/unistd.h index 2998795fa25e..1068fe9a0a58 100644 --- a/include/asm-mips/unistd.h +++ b/include/asm-mips/unistd.h | |||
@@ -325,16 +325,17 @@ | |||
325 | #define __NR_ppoll (__NR_Linux + 302) | 325 | #define __NR_ppoll (__NR_Linux + 302) |
326 | #define __NR_unshare (__NR_Linux + 303) | 326 | #define __NR_unshare (__NR_Linux + 303) |
327 | #define __NR_splice (__NR_Linux + 304) | 327 | #define __NR_splice (__NR_Linux + 304) |
328 | #define __NR_sync_file_range (__NR_Linux + 305) | ||
328 | 329 | ||
329 | /* | 330 | /* |
330 | * Offset of the last Linux o32 flavoured syscall | 331 | * Offset of the last Linux o32 flavoured syscall |
331 | */ | 332 | */ |
332 | #define __NR_Linux_syscalls 304 | 333 | #define __NR_Linux_syscalls 305 |
333 | 334 | ||
334 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ | 335 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ |
335 | 336 | ||
336 | #define __NR_O32_Linux 4000 | 337 | #define __NR_O32_Linux 4000 |
337 | #define __NR_O32_Linux_syscalls 304 | 338 | #define __NR_O32_Linux_syscalls 305 |
338 | 339 | ||
339 | #if _MIPS_SIM == _MIPS_SIM_ABI64 | 340 | #if _MIPS_SIM == _MIPS_SIM_ABI64 |
340 | 341 | ||
@@ -606,16 +607,17 @@ | |||
606 | #define __NR_ppoll (__NR_Linux + 261) | 607 | #define __NR_ppoll (__NR_Linux + 261) |
607 | #define __NR_unshare (__NR_Linux + 262) | 608 | #define __NR_unshare (__NR_Linux + 262) |
608 | #define __NR_splice (__NR_Linux + 263) | 609 | #define __NR_splice (__NR_Linux + 263) |
610 | #define __NR_sync_file_range (__NR_Linux + 264) | ||
609 | 611 | ||
610 | /* | 612 | /* |
611 | * Offset of the last Linux 64-bit flavoured syscall | 613 | * Offset of the last Linux 64-bit flavoured syscall |
612 | */ | 614 | */ |
613 | #define __NR_Linux_syscalls 263 | 615 | #define __NR_Linux_syscalls 264 |
614 | 616 | ||
615 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ | 617 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ |
616 | 618 | ||
617 | #define __NR_64_Linux 5000 | 619 | #define __NR_64_Linux 5000 |
618 | #define __NR_64_Linux_syscalls 263 | 620 | #define __NR_64_Linux_syscalls 264 |
619 | 621 | ||
620 | #if _MIPS_SIM == _MIPS_SIM_NABI32 | 622 | #if _MIPS_SIM == _MIPS_SIM_NABI32 |
621 | 623 | ||
@@ -891,16 +893,17 @@ | |||
891 | #define __NR_ppoll (__NR_Linux + 265) | 893 | #define __NR_ppoll (__NR_Linux + 265) |
892 | #define __NR_unshare (__NR_Linux + 266) | 894 | #define __NR_unshare (__NR_Linux + 266) |
893 | #define __NR_splice (__NR_Linux + 267) | 895 | #define __NR_splice (__NR_Linux + 267) |
896 | #define __NR_sync_file_range (__NR_Linux + 268) | ||
894 | 897 | ||
895 | /* | 898 | /* |
896 | * Offset of the last N32 flavoured syscall | 899 | * Offset of the last N32 flavoured syscall |
897 | */ | 900 | */ |
898 | #define __NR_Linux_syscalls 267 | 901 | #define __NR_Linux_syscalls 268 |
899 | 902 | ||
900 | #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ | 903 | #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ |
901 | 904 | ||
902 | #define __NR_N32_Linux 6000 | 905 | #define __NR_N32_Linux 6000 |
903 | #define __NR_N32_Linux_syscalls 267 | 906 | #define __NR_N32_Linux_syscalls 268 |
904 | 907 | ||
905 | #ifndef __ASSEMBLY__ | 908 | #ifndef __ASSEMBLY__ |
906 | 909 | ||