diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-25 16:48:45 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-03-25 16:48:45 -0700 |
| commit | dad44decc242a7ad185f1001541b0b7d49e2f58e (patch) | |
| tree | def666a53c058ca372ba64be4cb5f57f04352ff8 | |
| parent | c155c7492c9ab81f3d358a10eb4f29376ae53d85 (diff) | |
| parent | 2d5ae5c2c7025b3bac264545f88b4d958fbdccc8 (diff) | |
| download | lwn-dad44decc242a7ad185f1001541b0b7d49e2f58e.tar.gz lwn-dad44decc242a7ad185f1001541b0b7d49e2f58e.zip | |
Merge tag 'please-pull-preadv2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 update from Tony Luck:
"Wire up new system calls p{read,write}v2 for ia64"
* tag 'please-pull-preadv2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
[IA64] Enable preadv2 and pwritev2 syscalls for ia64
| -rw-r--r-- | arch/ia64/include/asm/unistd.h | 2 | ||||
| -rw-r--r-- | arch/ia64/include/uapi/asm/unistd.h | 2 | ||||
| -rw-r--r-- | arch/ia64/kernel/entry.S | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h index 6a8685051b67..8c85209753ab 100644 --- a/arch/ia64/include/asm/unistd.h +++ b/arch/ia64/include/asm/unistd.h @@ -11,7 +11,7 @@ -#define NR_syscalls 324 /* length of syscall table */ +#define NR_syscalls 326 /* 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 41369a103838..ea5363daa7bd 100644 --- a/arch/ia64/include/uapi/asm/unistd.h +++ b/arch/ia64/include/uapi/asm/unistd.h @@ -337,5 +337,7 @@ #define __NR_kcmp 1345 #define __NR_mlock2 1346 #define __NR_copy_file_range 1347 +#define __NR_preadv2 1348 +#define __NR_pwritev2 1349 #endif /* _UAPI_ASM_IA64_UNISTD_H */ diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 477c55e244ec..cfaa7b25084c 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S @@ -1773,5 +1773,7 @@ sys_call_table: data8 sys_kcmp // 1345 data8 sys_mlock2 data8 sys_copy_file_range + data8 sys_preadv2 + data8 sys_pwritev2 .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls |