Skip to content

Commit 4dfa573

Browse files
committed
Merge tag 'asm-generic-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
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://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: generic syscalls: wire up preadv2 and pwritev2 syscalls
2 parents 1ad9bf9 + 987aedb commit 4dfa573

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

include/uapi/asm-generic/unistd.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -717,9 +717,13 @@ __SYSCALL(__NR_membarrier, sys_membarrier)
717717
__SYSCALL(__NR_mlock2, sys_mlock2)
718718
#define __NR_copy_file_range 285
719719
__SYSCALL(__NR_copy_file_range, sys_copy_file_range)
720+
#define __NR_preadv2 286
721+
__SYSCALL(__NR_preadv2, sys_preadv2)
722+
#define __NR_pwritev2 287
723+
__SYSCALL(__NR_pwritev2, sys_pwritev2)
720724

721725
#undef __NR_syscalls
722-
#define __NR_syscalls 286
726+
#define __NR_syscalls 288
723727

724728
/*
725729
* All syscalls below here should go away really,

0 commit comments

Comments
 (0)