Commit b82dde02 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'please-pull-copy_file_range' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux

Pull ia64 copy_file_range syscall update from Tony Luck:
 "Another release, another new syscall to wire up"

* tag 'please-pull-copy_file_range' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
  [IA64] Enable copy_file_range syscall for ia64
parents 79d24532 884a12a5
......@@ -11,7 +11,7 @@
#define NR_syscalls 323 /* length of syscall table */
#define NR_syscalls 324 /* length of syscall table */
/*
* The following defines stop scripts/checksyscalls.sh from complaining about
......
......@@ -336,5 +336,6 @@
#define __NR_membarrier 1344
#define __NR_kcmp 1345
#define __NR_mlock2 1346
#define __NR_copy_file_range 1347
#endif /* _UAPI_ASM_IA64_UNISTD_H */
......@@ -1772,5 +1772,6 @@ sys_call_table:
data8 sys_membarrier
data8 sys_kcmp // 1345
data8 sys_mlock2
data8 sys_copy_file_range
.org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls
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