summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-17 18:37:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-17 18:37:03 -0700
commit3b89f56783a4ef796190ef1192c25e72e0b986b6 (patch)
tree9d34f03092a38fd79f14003c88489323f32d9334
parent392abeea52db4dc870c0ea41912df8ca60b27d44 (diff)
parent7cb4dc9fc95f89587f57f287b47e091d7806255e (diff)
downloadop-kernel-dev-3b89f56783a4ef796190ef1192c25e72e0b986b6.zip
op-kernel-dev-3b89f56783a4ef796190ef1192c25e72e0b986b6.tar.gz
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.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
index d5666d3..f73e2c2 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;
OpenPOWER on IntegriCloud