diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-10-14 19:57:29 +0400 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-10-14 19:57:29 +0400 |
| commit | ce0ecc8abfa9904e27a5f3ac4dd83398b134278d (patch) | |
| tree | 031363a799c1869889c961fcc49715896f59f703 /security/apparmor/include/resource.h | |
| parent | de5bbad6770882209b0ac58b0ba9259a98cfb953 (diff) | |
| parent | cb655d0f3d57c23db51b981648e452988c0223f9 (diff) | |
| download | linux-ce0ecc8abfa9904e27a5f3ac4dd83398b134278d.tar.xz | |
Merge branch 'master' into for-linus
Diffstat (limited to 'security/apparmor/include/resource.h')
| -rw-r--r-- | security/apparmor/include/resource.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/apparmor/include/resource.h b/security/apparmor/include/resource.h index 3c88be946494..02baec732bb5 100644 --- a/security/apparmor/include/resource.h +++ b/security/apparmor/include/resource.h @@ -33,8 +33,8 @@ struct aa_rlimit { }; int aa_map_resource(int resource); -int aa_task_setrlimit(struct aa_profile *profile, unsigned int resource, - struct rlimit *new_rlim); +int aa_task_setrlimit(struct aa_profile *profile, struct task_struct *, + unsigned int resource, struct rlimit *new_rlim); void __aa_transition_rlimits(struct aa_profile *old, struct aa_profile *new); |