diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-07-02 11:31:14 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-07-13 16:25:59 -0400 |
commit | 722cfd90420b660ad13f933efb135daf1d0e5400 (patch) | |
tree | e1fc9a799330d21389483c1807fc0148aade74e2 | |
parent | 94dee171df34b7955cd647da4c40ba67d55a7671 (diff) |
[MIPS] Wire up vmsplice(2) and move_pages(2).
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/kernel/scall32-o32.S | 2 | ||||
-rw-r--r-- | arch/mips/kernel/scall64-64.S | 2 | ||||
-rw-r--r-- | arch/mips/kernel/scall64-n32.S | 2 | ||||
-rw-r--r-- | arch/mips/kernel/scall64-o32.S | 2 | ||||
-rw-r--r-- | include/asm-mips/unistd.h | 18 |
5 files changed, 20 insertions, 6 deletions
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S index 8f8101f878c..c8e5f9c9a11 100644 --- a/arch/mips/kernel/scall32-o32.S +++ b/arch/mips/kernel/scall32-o32.S | |||
@@ -647,6 +647,8 @@ einval: li v0, -EINVAL | |||
647 | sys sys_splice 4 | 647 | sys sys_splice 4 |
648 | sys sys_sync_file_range 7 /* 4305 */ | 648 | sys sys_sync_file_range 7 /* 4305 */ |
649 | sys sys_tee 4 | 649 | sys sys_tee 4 |
650 | sys sys_vmsplice 4 | ||
651 | sys sys_move_pages 6 | ||
650 | .endm | 652 | .endm |
651 | 653 | ||
652 | /* We pre-compute the number of _instruction_ bytes needed to | 654 | /* 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 b4a34a625a2..809fd1b55f8 100644 --- a/arch/mips/kernel/scall64-64.S +++ b/arch/mips/kernel/scall64-64.S | |||
@@ -462,3 +462,5 @@ sys_call_table: | |||
462 | PTR sys_splice | 462 | PTR sys_splice |
463 | PTR sys_sync_file_range | 463 | PTR sys_sync_file_range |
464 | PTR sys_tee /* 5265 */ | 464 | PTR sys_tee /* 5265 */ |
465 | PTR sys_vmsplice | ||
466 | PTR sys_move_pages | ||
diff --git a/arch/mips/kernel/scall64-n32.S b/arch/mips/kernel/scall64-n32.S index df8c4f8ccd6..b2b5cb9fe57 100644 --- a/arch/mips/kernel/scall64-n32.S +++ b/arch/mips/kernel/scall64-n32.S | |||
@@ -388,3 +388,5 @@ EXPORT(sysn32_call_table) | |||
388 | PTR sys_splice | 388 | PTR sys_splice |
389 | PTR sys_sync_file_range | 389 | PTR sys_sync_file_range |
390 | PTR sys_tee | 390 | PTR sys_tee |
391 | PTR sys_vmsplice /* 6271 */ | ||
392 | PTR sys_move_pages | ||
diff --git a/arch/mips/kernel/scall64-o32.S b/arch/mips/kernel/scall64-o32.S index f04fe4f085c..3a138dcc882 100644 --- a/arch/mips/kernel/scall64-o32.S +++ b/arch/mips/kernel/scall64-o32.S | |||
@@ -510,4 +510,6 @@ sys_call_table: | |||
510 | PTR sys_splice | 510 | PTR sys_splice |
511 | PTR sys32_sync_file_range /* 4305 */ | 511 | PTR sys32_sync_file_range /* 4305 */ |
512 | PTR sys_tee | 512 | PTR sys_tee |
513 | PTR sys_vmsplice | ||
514 | PTR compat_sys_move_pages | ||
513 | .size sys_call_table,.-sys_call_table | 515 | .size sys_call_table,.-sys_call_table |
diff --git a/include/asm-mips/unistd.h b/include/asm-mips/unistd.h index 809f9f55bac..610ccb8a50b 100644 --- a/include/asm-mips/unistd.h +++ b/include/asm-mips/unistd.h | |||
@@ -327,16 +327,18 @@ | |||
327 | #define __NR_splice (__NR_Linux + 304) | 327 | #define __NR_splice (__NR_Linux + 304) |
328 | #define __NR_sync_file_range (__NR_Linux + 305) | 328 | #define __NR_sync_file_range (__NR_Linux + 305) |
329 | #define __NR_tee (__NR_Linux + 306) | 329 | #define __NR_tee (__NR_Linux + 306) |
330 | #define __NR_vmsplice (__NR_Linux + 307) | ||
331 | #define __NR_move_pages (__NR_Linux + 308) | ||
330 | 332 | ||
331 | /* | 333 | /* |
332 | * Offset of the last Linux o32 flavoured syscall | 334 | * Offset of the last Linux o32 flavoured syscall |
333 | */ | 335 | */ |
334 | #define __NR_Linux_syscalls 306 | 336 | #define __NR_Linux_syscalls 308 |
335 | 337 | ||
336 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ | 338 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ |
337 | 339 | ||
338 | #define __NR_O32_Linux 4000 | 340 | #define __NR_O32_Linux 4000 |
339 | #define __NR_O32_Linux_syscalls 306 | 341 | #define __NR_O32_Linux_syscalls 308 |
340 | 342 | ||
341 | #if _MIPS_SIM == _MIPS_SIM_ABI64 | 343 | #if _MIPS_SIM == _MIPS_SIM_ABI64 |
342 | 344 | ||
@@ -610,16 +612,18 @@ | |||
610 | #define __NR_splice (__NR_Linux + 263) | 612 | #define __NR_splice (__NR_Linux + 263) |
611 | #define __NR_sync_file_range (__NR_Linux + 264) | 613 | #define __NR_sync_file_range (__NR_Linux + 264) |
612 | #define __NR_tee (__NR_Linux + 265) | 614 | #define __NR_tee (__NR_Linux + 265) |
615 | #define __NR_vmsplice (__NR_Linux + 266) | ||
616 | #define __NR_move_pages (__NR_Linux + 267) | ||
613 | 617 | ||
614 | /* | 618 | /* |
615 | * Offset of the last Linux 64-bit flavoured syscall | 619 | * Offset of the last Linux 64-bit flavoured syscall |
616 | */ | 620 | */ |
617 | #define __NR_Linux_syscalls 265 | 621 | #define __NR_Linux_syscalls 267 |
618 | 622 | ||
619 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ | 623 | #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ |
620 | 624 | ||
621 | #define __NR_64_Linux 5000 | 625 | #define __NR_64_Linux 5000 |
622 | #define __NR_64_Linux_syscalls 265 | 626 | #define __NR_64_Linux_syscalls 267 |
623 | 627 | ||
624 | #if _MIPS_SIM == _MIPS_SIM_NABI32 | 628 | #if _MIPS_SIM == _MIPS_SIM_NABI32 |
625 | 629 | ||
@@ -897,16 +901,18 @@ | |||
897 | #define __NR_splice (__NR_Linux + 267) | 901 | #define __NR_splice (__NR_Linux + 267) |
898 | #define __NR_sync_file_range (__NR_Linux + 268) | 902 | #define __NR_sync_file_range (__NR_Linux + 268) |
899 | #define __NR_tee (__NR_Linux + 269) | 903 | #define __NR_tee (__NR_Linux + 269) |
904 | #define __NR_vmsplice (__NR_Linux + 270) | ||
905 | #define __NR_move_pages (__NR_Linux + 271) | ||
900 | 906 | ||
901 | /* | 907 | /* |
902 | * Offset of the last N32 flavoured syscall | 908 | * Offset of the last N32 flavoured syscall |
903 | */ | 909 | */ |
904 | #define __NR_Linux_syscalls 269 | 910 | #define __NR_Linux_syscalls 271 |
905 | 911 | ||
906 | #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ | 912 | #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ |
907 | 913 | ||
908 | #define __NR_N32_Linux 6000 | 914 | #define __NR_N32_Linux 6000 |
909 | #define __NR_N32_Linux_syscalls 269 | 915 | #define __NR_N32_Linux_syscalls 271 |
910 | 916 | ||
911 | #ifdef __KERNEL__ | 917 | #ifdef __KERNEL__ |
912 | 918 | ||