From e6efe24e2d0fd1f1c4c10dd0666beda4a4e2ab9c Mon Sep 17 00:00:00 2001
From: Jiri Slaby <jslaby@suse.cz>
Date: Thu, 6 May 2010 20:17:00 +0200
Subject: [PATCH] --- yaml --- r: 207833 b: refs/heads/master c:
 f33ebbe9da2c3c24664a0ad4f8fd83f293547e63 h: refs/heads/master i:   207831:
 759da817841675596330100c9eb4851a8d9eacb1 v: v3

---
 [refs]                                   | 2 +-
 trunk/arch/x86/ia32/ia32entry.S          | 1 +
 trunk/arch/x86/include/asm/unistd_32.h   | 3 ++-
 trunk/arch/x86/include/asm/unistd_64.h   | 2 ++
 trunk/arch/x86/kernel/syscall_table_32.S | 1 +
 trunk/include/asm-generic/unistd.h       | 4 +++-
 6 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 32b5fce040d0..8225af7ee832 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c022a0acad534fd5f5d5f17280f6d4d135e74e81
+refs/heads/master: f33ebbe9da2c3c24664a0ad4f8fd83f293547e63
diff --git a/trunk/arch/x86/ia32/ia32entry.S b/trunk/arch/x86/ia32/ia32entry.S
index e790bc1fbfa3..a88e31d1836e 100644
--- a/trunk/arch/x86/ia32/ia32entry.S
+++ b/trunk/arch/x86/ia32/ia32entry.S
@@ -842,4 +842,5 @@ ia32_sys_call_table:
 	.quad compat_sys_rt_tgsigqueueinfo	/* 335 */
 	.quad sys_perf_event_open
 	.quad compat_sys_recvmmsg
+	.quad sys_prlimit64
 ia32_syscall_end:
diff --git a/trunk/arch/x86/include/asm/unistd_32.h b/trunk/arch/x86/include/asm/unistd_32.h
index beb9b5f8f8a4..35e0cb151b69 100644
--- a/trunk/arch/x86/include/asm/unistd_32.h
+++ b/trunk/arch/x86/include/asm/unistd_32.h
@@ -343,10 +343,11 @@
 #define __NR_rt_tgsigqueueinfo	335
 #define __NR_perf_event_open	336
 #define __NR_recvmmsg		337
+#define __NR_prlimit64		338
 
 #ifdef __KERNEL__
 
-#define NR_syscalls 338
+#define NR_syscalls 339
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
diff --git a/trunk/arch/x86/include/asm/unistd_64.h b/trunk/arch/x86/include/asm/unistd_64.h
index ff4307b0e81e..570bf5eae564 100644
--- a/trunk/arch/x86/include/asm/unistd_64.h
+++ b/trunk/arch/x86/include/asm/unistd_64.h
@@ -663,6 +663,8 @@ __SYSCALL(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo)
 __SYSCALL(__NR_perf_event_open, sys_perf_event_open)
 #define __NR_recvmmsg				299
 __SYSCALL(__NR_recvmmsg, sys_recvmmsg)
+#define __NR_prlimit64				300
+__SYSCALL(__NR_prlimit64, sys_prlimit64)
 
 #ifndef __NO_STUBS
 #define __ARCH_WANT_OLD_READDIR
diff --git a/trunk/arch/x86/kernel/syscall_table_32.S b/trunk/arch/x86/kernel/syscall_table_32.S
index 8b3729341216..eca1d7d23ab5 100644
--- a/trunk/arch/x86/kernel/syscall_table_32.S
+++ b/trunk/arch/x86/kernel/syscall_table_32.S
@@ -337,3 +337,4 @@ ENTRY(sys_call_table)
 	.long sys_rt_tgsigqueueinfo	/* 335 */
 	.long sys_perf_event_open
 	.long sys_recvmmsg
+	.long sys_prlimit64
diff --git a/trunk/include/asm-generic/unistd.h b/trunk/include/asm-generic/unistd.h
index 6a0b30f78a62..0dfd517e5ec9 100644
--- a/trunk/include/asm-generic/unistd.h
+++ b/trunk/include/asm-generic/unistd.h
@@ -626,9 +626,11 @@ __SYSCALL(__NR_perf_event_open, sys_perf_event_open)
 __SYSCALL(__NR_accept4, sys_accept4)
 #define __NR_recvmmsg 243
 __SYSCALL(__NR_recvmmsg, sys_recvmmsg)
+#define __NR_prlimit64 244
+__SYSCALL(__NR_prlimit64, sys_prlimit64)
 
 #undef __NR_syscalls
-#define __NR_syscalls 244
+#define __NR_syscalls 245
 
 /*
  * All syscalls below here should go away really,