diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-14 05:40:12 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-14 05:40:12 +0100 |
| commit | 5df1b274cd2f0304339c7f5586fa16cce0fdfce2 (patch) | |
| tree | 3c04d03acdeaef1c3c9b264671ea8adecc46e362 /arch/ia64 | |
| parent | Unused iocbs in a batch should not be accounted as active. (diff) | |
| parent | ia64: Add accept4() syscall (diff) | |
| download | linux-5df1b274cd2f0304339c7f5586fa16cce0fdfce2.tar.xz linux-5df1b274cd2f0304339c7f5586fa16cce0fdfce2.zip | |
Merge branch 'wire-accept4' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
* 'wire-accept4' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
ia64: Add accept4() syscall
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/include/asm/unistd.h | 3 | ||||
| -rw-r--r-- | arch/ia64/kernel/entry.S | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h index 7617248f0d11..7a3bd2524944 100644 --- a/arch/ia64/include/asm/unistd.h +++ b/arch/ia64/include/asm/unistd.h @@ -323,11 +323,12 @@ #define __NR_sendmmsg 1331 #define __NR_process_vm_readv 1332 #define __NR_process_vm_writev 1333 +#define __NR_accept4 1334 #ifdef __KERNEL__ -#define NR_syscalls 310 /* length of syscall table */ +#define NR_syscalls 311 /* length of syscall table */ /* * The following defines stop scripts/checksyscalls.sh from complaining about diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 5b31d46aff67..1ccbe12a4d84 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S @@ -1779,6 +1779,7 @@ sys_call_table: data8 sys_sendmmsg data8 sys_process_vm_readv data8 sys_process_vm_writev + data8 sys_accept4 .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls #endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ |