diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-10 01:27:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-10 01:27:33 -0400 |
| commit | e548833df83c3554229eff0672900bfe958b45fd (patch) | |
| tree | 85efc4a76dc356593d6d394776aeb845dc580fb6 /security/apparmor/lsm.c | |
| parent | cbd9da7be869f676afc204e1a664163778c770bd (diff) | |
| parent | 053d8f6622701f849fda2ca2c9ae596c13599ba9 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/main.c
Diffstat (limited to 'security/apparmor/lsm.c')
| -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, | |||
| 607 | return error; | 607 | return error; |
| 608 | } | 608 | } |
| 609 | 609 | ||
| 610 | static int apparmor_task_setrlimit(unsigned int resource, | 610 | static int apparmor_task_setrlimit(struct task_struct *task, |
| 611 | struct rlimit *new_rlim) | 611 | unsigned int resource, struct rlimit *new_rlim) |
| 612 | { | 612 | { |
| 613 | struct aa_profile *profile = aa_current_profile(); | 613 | struct aa_profile *profile = aa_current_profile(); |
| 614 | int error = 0; | 614 | int error = 0; |