projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for_linus-3.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jwesse...
[cascardo/linux.git]
/
security
/
apparmor
/
include
/
resource.h
diff --git
a/security/apparmor/include/resource.h
b/security/apparmor/include/resource.h
index
3c88be9
..
d3f4cf0
100644
(file)
--- a/
security/apparmor/include/resource.h
+++ b/
security/apparmor/include/resource.h
@@
-18,6
+18,8
@@
#include <linux/resource.h>
#include <linux/sched.h>
#include <linux/resource.h>
#include <linux/sched.h>
+#include "apparmorfs.h"
+
struct aa_profile;
/* struct aa_rlimit - rlimit settings for the profile
struct aa_profile;
/* struct aa_rlimit - rlimit settings for the profile
@@
-32,9
+34,11
@@
struct aa_rlimit {
struct rlimit limits[RLIM_NLIMITS];
};
struct rlimit limits[RLIM_NLIMITS];
};
+extern struct aa_fs_entry aa_fs_entry_rlimit[];
+
int aa_map_resource(int resource);
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);
void __aa_transition_rlimits(struct aa_profile *old, struct aa_profile *new);