diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 12:07:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-10 12:07:51 -0700 |
| commit | b34d8915c413acb51d837a45fb8747b61f65c020 (patch) | |
| tree | ced5fac166324634653d84b1afe2b958b3904f4d /security/capability.c | |
| parent | e8a89cebdbaab14caaa26debdb4ffd493b8831af (diff) | |
| parent | f33ebbe9da2c3c24664a0ad4f8fd83f293547e63 (diff) | |
| download | linux-b34d8915c413acb51d837a45fb8747b61f65c020.tar.gz linux-b34d8915c413acb51d837a45fb8747b61f65c020.tar.bz2 linux-b34d8915c413acb51d837a45fb8747b61f65c020.zip | |
Merge branch 'writable_limits' of git://decibel.fi.muni.cz/~xslaby/linux
* 'writable_limits' of git://decibel.fi.muni.cz/~xslaby/linux:
unistd: add __NR_prlimit64 syscall numbers
rlimits: implement prlimit64 syscall
rlimits: switch more rlimit syscalls to do_prlimit
rlimits: redo do_setrlimit to more generic do_prlimit
rlimits: add rlimit64 structure
rlimits: do security check under task_lock
rlimits: allow setrlimit to non-current tasks
rlimits: split sys_setrlimit
rlimits: selinux, do rlimits changes under task_lock
rlimits: make sure ->rlim_max never grows in sys_setrlimit
rlimits: add task_struct to update_rlimit_cpu
rlimits: security, add task_struct to setrlimit
Fix up various system call number conflicts. We not only added fanotify
system calls in the meantime, but asm-generic/unistd.h added a wait4
along with a range of reserved per-architecture system calls.
Diffstat (limited to 'security/capability.c')
| -rw-r--r-- | security/capability.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/capability.c b/security/capability.c index a0bbf30fb6dc..95a6599a37bb 100644 --- a/security/capability.c +++ b/security/capability.c @@ -411,7 +411,8 @@ static int cap_task_getioprio(struct task_struct *p) return 0; } -static int cap_task_setrlimit(unsigned int resource, struct rlimit *new_rlim) +static int cap_task_setrlimit(struct task_struct *p, unsigned int resource, + struct rlimit *new_rlim) { return 0; } |