diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-23 02:35:38 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-01-23 02:35:38 +0100 |
commit | b82dde0230439215b55e545880e90337ee16f51a (patch) | |
tree | 8252f8b8d3d91a9473c9bd45ca441e52cff1dd7d /arch/ia64/include/asm/unistd.h | |
parent | Merge tag 'armsoc-tegra' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... (diff) | |
parent | [IA64] Enable copy_file_range syscall for ia64 (diff) | |
download | linux-b82dde0230439215b55e545880e90337ee16f51a.tar.xz linux-b82dde0230439215b55e545880e90337ee16f51a.zip |
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
Diffstat (limited to 'arch/ia64/include/asm/unistd.h')
-rw-r--r-- | arch/ia64/include/asm/unistd.h | 2 |
1 files changed, 1 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 |