History

Merge tag 'asm-generic-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

Pull asm-generic syscall fix from Arnd Bergmann: "My last pull request for asm-generic had just one patch that added two new system calls to asm/unistd.h, but unfortunately it turned out to be wrong, pointing arch/tile compat mode at the native handlers rather than the compat ones. This was spotted by Yury Norov, who is working on ILP32 mode for arch/arm64, which would have the same problem when merged. This fixes the table to use the correct compat syscalls, like the other 64-bit architectures do. I'll try to find the time to come up with a solution that prevents this problem from happening again, by allowing all future system calls to just get added in a single file for use by all architectures" * tag 'asm-generic-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: asm-generic: use compat version for preadv2 and pwritev2

Linus Torvalds committed 10 years ago

Commit 85f397a2 parents c4781a8 1f93e9f1 file · +2 −2Browse files

Showing the changes to include/uapi (1 of 1 file). Show all

Unified · Split

include/uapi/asm-generic/unistd.h+2−2
@@ -718,9 +718,9 @@ __SYSCALL(__NR_mlock2, sys_mlock2) · 717 unmodified lines
718718 #define __NR_copy_file_range 285
719719 __SYSCALL(__NR_copy_file_range, sys_copy_file_range)
720720 #define __NR_preadv2 286
721−__SYSCALL(__NR_preadv2, sys_preadv2)
721+__SC_COMP(__NR_preadv2, sys_preadv2, compat_sys_preadv2)
722722 #define __NR_pwritev2 287
723−__SYSCALL(__NR_pwritev2, sys_pwritev2)
723+__SC_COMP(__NR_pwritev2, sys_pwritev2, compat_sys_pwritev2)
724724
725725 #undef __NR_syscalls
726726 #define __NR_syscalls 288