Commit 4dfa5739 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'asm-generic-4.6' of git://

Pull asm-generic update from Arnd Bergmann:
 "Here is one patch to wire up the preadv/pwritev system calls in the
  generic system call table, which is required for all architectures
  that were merged in the last few years, including arm64.

  Usually these get merged along with the syscall implementation or one
  of the architecture trees, but this time that did not happen.

  Andre and Christoph both sent a version of this patch, I picked the
  one I got first"

* tag 'asm-generic-4.6' of git://
  generic syscalls: wire up preadv2 and pwritev2 syscalls
parents 1ad9bf9f 987aedb5
......@@ -717,9 +717,13 @@ __SYSCALL(__NR_membarrier, sys_membarrier)
__SYSCALL(__NR_mlock2, sys_mlock2)
#define __NR_copy_file_range 285
__SYSCALL(__NR_copy_file_range, sys_copy_file_range)
#define __NR_preadv2 286
__SYSCALL(__NR_preadv2, sys_preadv2)
#define __NR_pwritev2 287
__SYSCALL(__NR_pwritev2, sys_pwritev2)
#undef __NR_syscalls
#define __NR_syscalls 286
#define __NR_syscalls 288
* All syscalls below here should go away really,
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment