From 685a8a8ba19728c51b3de047e3a9038561214fb1 Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@mcmartin.ca>
Date: Sat, 26 Dec 2009 17:19:17 +0000
Subject: [PATCH] --- yaml --- r: 186463 b: refs/heads/master c:
 81e4a5e3057740a625cf556879ae0becf6199f8c h: refs/heads/master i:   186461:
 123c8bc39633530cc7f79da0588bd5a0ea7ea7ca   186459:
 33a7dbff00d07dd3284cd0269518aef3cfa97f7c   186455:
 53c2c35e2a16416b5a9126651e92d04c16cd4179   186447:
 a690b1c2b9228239e1df768b978a17cfa3682229   186431:
 4d345f0553b2cea83d1ee27ce5f33b8c98d62879 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/parisc/include/asm/unistd.h   | 3 ++-
 trunk/arch/parisc/kernel/syscall_table.S | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9050ca8788c5..17b30e78b758 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ceb38e6b691debe4bf04cb63165c503a8556177
+refs/heads/master: 81e4a5e3057740a625cf556879ae0becf6199f8c
diff --git a/trunk/arch/parisc/include/asm/unistd.h b/trunk/arch/parisc/include/asm/unistd.h
index ee6363463b72..1ce7d2851d90 100644
--- a/trunk/arch/parisc/include/asm/unistd.h
+++ b/trunk/arch/parisc/include/asm/unistd.h
@@ -812,8 +812,9 @@
 #define __NR_rt_tgsigqueueinfo	(__NR_Linux + 317)
 #define __NR_perf_event_open	(__NR_Linux + 318)
 #define __NR_recvmmsg		(__NR_Linux + 319)
+#define __NR_accept4		(__NR_Linux + 320)
 
-#define __NR_Linux_syscalls	(__NR_recvmmsg + 1)
+#define __NR_Linux_syscalls	(__NR_accept4 + 1)
 
 
 #define __IGNORE_select		/* newselect */
diff --git a/trunk/arch/parisc/kernel/syscall_table.S b/trunk/arch/parisc/kernel/syscall_table.S
index a0c54cf81949..de5f6dab48b7 100644
--- a/trunk/arch/parisc/kernel/syscall_table.S
+++ b/trunk/arch/parisc/kernel/syscall_table.S
@@ -418,6 +418,7 @@
 	ENTRY_COMP(rt_tgsigqueueinfo)
 	ENTRY_SAME(perf_event_open)
 	ENTRY_COMP(recvmmsg)
+	ENTRY_SAME(accept4)		/* 320 */
 
 	/* Nothing yet */