diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-22 17:35:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-22 17:35:38 -0800 |
| commit | b82dde0230439215b55e545880e90337ee16f51a (patch) | |
| tree | 8252f8b8d3d91a9473c9bd45ca441e52cff1dd7d | |
| parent | 79d245327f61ff21e7b9427c61fded5442734233 (diff) | |
| parent | 884a12a5972fc867a93f7adf7a8ac2ade5d38fff (diff) | |
| download | linux-b82dde0230439215b55e545880e90337ee16f51a.tar.bz2 | |
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
| -rw-r--r-- | arch/ia64/include/asm/unistd.h | 2 | ||||
| -rw-r--r-- | arch/ia64/include/uapi/asm/unistd.h | 1 | ||||
| -rw-r--r-- | arch/ia64/kernel/entry.S | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h index 74c132d901bd..6a8685051b67 100644 --- a/arch/ia64/include/asm/unistd.h +++ b/arch/ia64/include/asm/unistd.h @@ -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 diff --git a/arch/ia64/include/uapi/asm/unistd.h b/arch/ia64/include/uapi/asm/unistd.h index 762edce7572e..41369a103838 100644 --- a/arch/ia64/include/uapi/asm/unistd.h +++ b/arch/ia64/include/uapi/asm/unistd.h @@ -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 */ diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 534a74acb849..477c55e244ec 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S @@ -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 |