diff options
| author |   Takashi Iwai <tiwai@suse.de> | 2010-09-14 16:15:29 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-14 16:15:29 +0200 |
| commit | f3fbba6efbab93b9850821d41a75b02286d18315 (patch) | |
| tree | e2a680674d334c6e455d1a89a4dbfc3f549cb6d1 /security/apparmor/include/resource.h | |
| parent | ALSA: snd-usb-caiaq: Add support for Traktor Kontrol S4 (diff) | |
| parent | sound: Remove pr_<level> uses of KERN_<level> (diff) | |
| download | linux-dev-f3fbba6efbab93b9850821d41a75b02286d18315.tar.xz linux-dev-f3fbba6efbab93b9850821d41a75b02286d18315.zip | |
Merge branch 'fix/misc' into topic/misc
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); |