summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Cree <mcree@orcon.net.nz>2011-10-31 17:09:49 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-31 17:30:51 -0700
commit0a8c384ebe4cc1c462076732dbffb595e7e81d5c (patch)
treef624e81a48d63f4df492db27aafaca366eaf8806
parenta1cb2c60ddc98ff4e5246f410558805401ceee67 (diff)
downloadlinux-3.10-0a8c384ebe4cc1c462076732dbffb595e7e81d5c.tar.gz
linux-3.10-0a8c384ebe4cc1c462076732dbffb595e7e81d5c.tar.bz2
linux-3.10-0a8c384ebe4cc1c462076732dbffb595e7e81d5c.zip
alpha: wire up accept4 syscall
Somehow wiring up the accept4 syscall on Alpha was missed long ago. This commit rectifies that oversight. Signed-off-by: Michael Cree <mcree@orcon.net.nz> Reviewed-by: Matt Turner <mattst88@gmail.com> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/alpha/include/asm/unistd.h3
-rw-r--r--arch/alpha/kernel/systbls.S1
2 files changed, 3 insertions, 1 deletions
diff --git a/arch/alpha/include/asm/unistd.h b/arch/alpha/include/asm/unistd.h
index 4ac48a095f3..1fbfd6450a3 100644
--- a/arch/alpha/include/asm/unistd.h
+++ b/arch/alpha/include/asm/unistd.h
@@ -457,10 +457,11 @@
#define __NR_clock_adjtime 499
#define __NR_syncfs 500
#define __NR_setns 501
+#define __NR_accept4 502
#ifdef __KERNEL__
-#define NR_SYSCALLS 502
+#define NR_SYSCALLS 503
#define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR
diff --git a/arch/alpha/kernel/systbls.S b/arch/alpha/kernel/systbls.S
index 6acea1f96de..53d0ce2d304 100644
--- a/arch/alpha/kernel/systbls.S
+++ b/arch/alpha/kernel/systbls.S
@@ -520,6 +520,7 @@ sys_call_table:
.quad sys_clock_adjtime
.quad sys_syncfs /* 500 */
.quad sys_setns
+ .quad sys_accept4
.size sys_call_table, . - sys_call_table
.type sys_call_table, @object