From d5a2b98348fad797e976bbf035f712f7a73bee71 Mon Sep 17 00:00:00 2001
From: Kyle McMartin <kyle@dreadnought.i.jkkm.org>
Date: Wed, 13 Oct 2010 20:35:56 -0400
Subject: [PATCH] --- yaml --- r: 218919 b: refs/heads/master c:
 caf96194c05cd97ce96546fbcb1f35ec06aaaac7 h: refs/heads/master i:   218917:
 bf80a2752e1eaf11883032f4531bf28ac71dee68   218915:
 ef9629e172a3378b16f5caf496fb08a0e9760a10   218911:
 1fc47506f9bc5a39e875ca8696d4b2f13b7a326b 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 38df4d60eb30..c11eea28e80c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c442ef96bfe1a981d44dd09d49a1eed93b94e82a
+refs/heads/master: caf96194c05cd97ce96546fbcb1f35ec06aaaac7
diff --git a/trunk/arch/parisc/include/asm/unistd.h b/trunk/arch/parisc/include/asm/unistd.h
index 1ce7d2851d90..3eb82c2a5ec3 100644
--- a/trunk/arch/parisc/include/asm/unistd.h
+++ b/trunk/arch/parisc/include/asm/unistd.h
@@ -813,8 +813,9 @@
 #define __NR_perf_event_open	(__NR_Linux + 318)
 #define __NR_recvmmsg		(__NR_Linux + 319)
 #define __NR_accept4		(__NR_Linux + 320)
+#define __NR_prlimit64		(__NR_Linux + 321)
 
-#define __NR_Linux_syscalls	(__NR_accept4 + 1)
+#define __NR_Linux_syscalls	(__NR_prlimit64 + 1)
 
 
 #define __IGNORE_select		/* newselect */
diff --git a/trunk/arch/parisc/kernel/syscall_table.S b/trunk/arch/parisc/kernel/syscall_table.S
index 3d52c978738f..74867dfdabe5 100644
--- a/trunk/arch/parisc/kernel/syscall_table.S
+++ b/trunk/arch/parisc/kernel/syscall_table.S
@@ -419,6 +419,7 @@
 	ENTRY_SAME(perf_event_open)
 	ENTRY_COMP(recvmmsg)
 	ENTRY_SAME(accept4)		/* 320 */
+	ENTRY_SAME(prlimit64)
 
 	/* Nothing yet */