diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-01 10:40:31 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-01-01 10:40:31 +1100 |
| commit | e88a1a52d43833f7f4d9661ff22f5bd667d0eba7 (patch) | |
| tree | 82d73f72ede34c59701fba948d3ed64aafe344df /include/asm-generic | |
| parent | e7e085f5b45df8a6737432fdbaf3b18ecd0d7a64 (diff) | |
| parent | 20834fb1b458753273e79a72570b054775503b78 (diff) | |
Merge remote branch 'limits/writable_limits'
Conflicts:
arch/x86/ia32/ia32entry.S
arch/x86/include/asm/unistd_32.h
arch/x86/include/asm/unistd_64.h
arch/x86/kernel/syscall_table_32.S
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/unistd.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-generic/unistd.h b/include/asm-generic/unistd.h index 6a0b30f78a62..fa0156f25415 100644 --- a/include/asm-generic/unistd.h +++ b/include/asm-generic/unistd.h @@ -626,9 +626,13 @@ __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_getprlimit 244 +__SYSCALL(__NR_getprlimit, sys_getprlimit) +#define __NR_setprlimit 245 +__SYSCALL(__NR_setprlimit, sys_setprlimit) #undef __NR_syscalls -#define __NR_syscalls 244 +#define __NR_syscalls 246 /* * All syscalls below here should go away really, |