aboutsummaryrefslogtreecommitdiff
path: root/arch/ia64/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-13 20:40:12 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-13 20:40:12 -0800
commit5df1b274cd2f0304339c7f5586fa16cce0fdfce2 (patch)
tree3c04d03acdeaef1c3c9b264671ea8adecc46e362 /arch/ia64/kernel
parent69e4747ee9727d660b88d7e1efe0f4afcb35db1b (diff)
parent65cc21b4523e94d5640542a818748cd3be8cd6b4 (diff)
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/kernel')
-rw-r--r--arch/ia64/kernel/entry.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index 5b31d46aff6..1ccbe12a4d8 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 */