diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-03-26 18:57:26 -0700 |
|---|---|---|
| committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2012-03-26 18:57:26 -0700 |
| commit | fc2ed77b9d6b579d61024163c74f41c24394fcc7 (patch) | |
| tree | 903d80ba1b1fc0eb15e122a8c12a72f72e7ed2de /security/apparmor/resource.c | |
| parent | 3d04d42312eacc68fbcddea337f7eb34bc035dfb (diff) | |
| parent | 50269e19ad990e79eeda101fc6df80cffd5d4831 (diff) | |
| download | linux-fc2ed77b9d6b579d61024163c74f41c24394fcc7.tar.gz linux-fc2ed77b9d6b579d61024163c74f41c24394fcc7.tar.bz2 linux-fc2ed77b9d6b579d61024163c74f41c24394fcc7.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'security/apparmor/resource.c')
| -rw-r--r-- | security/apparmor/resource.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/security/apparmor/resource.c b/security/apparmor/resource.c index a4136c10b1c6..72c25a4f2cfd 100644 --- a/security/apparmor/resource.c +++ b/security/apparmor/resource.c @@ -23,6 +23,11 @@ */ #include "rlim_names.h" +struct aa_fs_entry aa_fs_entry_rlimit[] = { + AA_FS_FILE_STRING("mask", AA_FS_RLIMIT_MASK), + { } +}; + /* audit callback for resource specific fields */ static void audit_cb(struct audit_buffer *ab, void *va) { |