Commit 0159677857c5ada0a0a2c03a4dd59312382b73d0

Authored by Martin Schwidefsky
Committed by Linus Torvalds
1 parent 6a050da45b

[PATCH] s390: add vmsplice system call

Add new vmsplice system call and add missing __NR_xxx defines for
sys_set_robust_list, sys_get_robust_list, sys_splice, sys_sync_file_range
and sys_tee.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 3 changed files with 16 additions and 1 deletions Side-by-side Diff

arch/s390/kernel/compat_wrapper.S
... ... @@ -1650,4 +1650,12 @@
1650 1650 llgfr %r4,%r4 # size_t
1651 1651 llgfr %r5,%r5 # unsigned int
1652 1652 jg sys_tee
  1653 +
  1654 + .globl compat_sys_vmsplice_wrapper
  1655 +compat_sys_vmsplice_wrapper:
  1656 + lgfr %r2,%r2 # int
  1657 + llgtr %r3,%r3 # compat_iovec *
  1658 + llgfr %r4,%r4 # unsigned int
  1659 + llgfr %r5,%r5 # unsigned int
  1660 + jg compat_sys_vmsplice
arch/s390/kernel/syscalls.S
... ... @@ -317,4 +317,5 @@
317 317 SYSCALL(sys_splice,sys_splice,sys_splice_wrapper)
318 318 SYSCALL(sys_sync_file_range,sys_sync_file_range,sys_sync_file_range_wrapper)
319 319 SYSCALL(sys_tee,sys_tee,sys_tee_wrapper)
  320 +SYSCALL(sys_vmsplice,sys_vmsplice,compat_sys_vmsplice_wrapper)
include/asm-s390/unistd.h
... ... @@ -296,8 +296,14 @@
296 296 #define __NR_pselect6 301
297 297 #define __NR_ppoll 302
298 298 #define __NR_unshare 303
  299 +#define __NR_set_robust_list 304
  300 +#define __NR_get_robust_list 305
  301 +#define __NR_splice 306
  302 +#define __NR_sync_file_range 307
  303 +#define __NR_tee 308
  304 +#define __NR_vmsplice 309
299 305  
300   -#define NR_syscalls 304
  306 +#define NR_syscalls 310
301 307  
302 308 /*
303 309 * There are some system calls that are not present on 64 bit, some