aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorÉmeric Maschino <emeric.maschino@gmail.com>2012-01-09 15:55:10 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-05-21 12:40:06 -0400
commit91fbfce4b765d078f242c568c7183389b0ce1b1c (patch)
tree6fb8af4f512935cb6c24f4babd0883a6b87121c1
parent51cb85a88c9588a1725bdb1eccadc2478e68cbad (diff)
ia64: Add accept4() syscall
commit 65cc21b4523e94d5640542a818748cd3be8cd6b4 upstream. While debugging udev > 170 failure on Debian Wheezy (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=648325), it appears that the issue was in fact due to missing accept4() in ia64. This patch simply adds accept4() to ia64. Signed-off-by: Émeric Maschino <emeric.maschino@gmail.com> Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/ia64/include/asm/unistd.h3
-rw-r--r--arch/ia64/kernel/entry.S3
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h
index 7c928da35b1..d8de1825b73 100644
--- a/arch/ia64/include/asm/unistd.h
+++ b/arch/ia64/include/asm/unistd.h
@@ -321,11 +321,12 @@
321#define __NR_syncfs 1329 321#define __NR_syncfs 1329
322#define __NR_setns 1330 322#define __NR_setns 1330
323#define __NR_sendmmsg 1331 323#define __NR_sendmmsg 1331
324#define __NR_accept4 1334
324 325
325#ifdef __KERNEL__ 326#ifdef __KERNEL__
326 327
327 328
328#define NR_syscalls 308 /* length of syscall table */ 329#define NR_syscalls 311 /* length of syscall table */
329 330
330/* 331/*
331 * The following defines stop scripts/checksyscalls.sh from complaining about 332 * 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 97dd2abdeb1..df477f8c9d8 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -1777,6 +1777,9 @@ sys_call_table:
1777 data8 sys_syncfs 1777 data8 sys_syncfs
1778 data8 sys_setns // 1330 1778 data8 sys_setns // 1330
1779 data8 sys_sendmmsg 1779 data8 sys_sendmmsg
1780 data8 sys_ni_syscall /* process_vm_readv */
1781 data8 sys_ni_syscall /* process_vm_writev */
1782 data8 sys_accept4
1780 1783
1781 .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls 1784 .org sys_call_table + 8*NR_syscalls // guard against failures to increase NR_syscalls
1782#endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */ 1785#endif /* __IA64_ASM_PARAVIRTUALIZED_NATIVE */