diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-18 03:37:03 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-18 03:37:03 +0200 |
| commit | 3b89f56783a4ef796190ef1192c25e72e0b986b6 (patch) | |
| tree | 9d34f03092a38fd79f14003c88489323f32d9334 | |
| parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwe... (diff) | |
| parent | AppArmor: fix task_setrlimit prototype (diff) | |
| download | linux-3b89f56783a4ef796190ef1192c25e72e0b986b6.tar.xz linux-3b89f56783a4ef796190ef1192c25e72e0b986b6.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
AppArmor: fix task_setrlimit prototype
| -rw-r--r-- | security/apparmor/lsm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index d5666d3cc21b..f73e2c204218 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c @@ -607,8 +607,8 @@ static int apparmor_setprocattr(struct task_struct *task, char *name, return error; } -static int apparmor_task_setrlimit(unsigned int resource, - struct rlimit *new_rlim) +static int apparmor_task_setrlimit(struct task_struct *task, + unsigned int resource, struct rlimit *new_rlim) { struct aa_profile *profile = aa_current_profile(); int error = 0; |