diff options
| author | James Morris <jmorris@namei.org> | 2010-05-06 10:56:07 +1000 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-06 10:56:07 +1000 |
| commit | 0ffbe2699cda6afbe08501098dff8a8c2fe6ae09 (patch) | |
| tree | 81b1a2305d16c873371b65c5a863c0268036cefe /security/tomoyo | |
| parent | 4e5d6f7ec3833c0da9cf34fa5c53c6058c5908b6 (diff) | |
| parent | 7ebd467551ed6ae200d7835a84bbda0dcadaa511 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'security/tomoyo')
| -rw-r--r-- | security/tomoyo/common.c | 1 | ||||
| -rw-r--r-- | security/tomoyo/domain.c | 1 | ||||
| -rw-r--r-- | security/tomoyo/file.c | 1 | ||||
| -rw-r--r-- | security/tomoyo/gc.c | 1 | ||||
| -rw-r--r-- | security/tomoyo/realpath.c | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c index b9f64ca5f15..3c86bbc33ae 100644 --- a/security/tomoyo/common.c +++ b/security/tomoyo/common.c @@ -10,6 +10,7 @@ */ #include <linux/uaccess.h> +#include <linux/slab.h> #include <linux/security.h> #include <linux/hardirq.h> #include "common.h" diff --git a/security/tomoyo/domain.c b/security/tomoyo/domain.c index ed514188324..e1edec4a9b9 100644 --- a/security/tomoyo/domain.c +++ b/security/tomoyo/domain.c @@ -11,6 +11,7 @@ #include "common.h" #include <linux/binfmts.h> +#include <linux/slab.h> /* Variables definitions.*/ diff --git a/security/tomoyo/file.c b/security/tomoyo/file.c index cf67e55a0d1..0687ada28e8 100644 --- a/security/tomoyo/file.c +++ b/security/tomoyo/file.c @@ -10,6 +10,7 @@ */ #include "common.h" +#include <linux/slab.h> /* Keyword array for single path operations. */ static const char *tomoyo_path_keyword[TOMOYO_MAX_PATH_OPERATION] = { diff --git a/security/tomoyo/gc.c b/security/tomoyo/gc.c index 9645525ccdd..d9ad35bc7fa 100644 --- a/security/tomoyo/gc.c +++ b/security/tomoyo/gc.c @@ -9,6 +9,7 @@ #include "common.h" #include <linux/kthread.h> +#include <linux/slab.h> enum tomoyo_gc_id { TOMOYO_ID_DOMAIN_INITIALIZER, diff --git a/security/tomoyo/realpath.c b/security/tomoyo/realpath.c index 8fe3ee20a18..6a51e0af241 100644 --- a/security/tomoyo/realpath.c +++ b/security/tomoyo/realpath.c @@ -15,6 +15,7 @@ #include <linux/fs_struct.h> #include <linux/hash.h> #include <linux/magic.h> +#include <linux/slab.h> #include "common.h" /** |