diff options
| author | James Morris <jmorris@namei.org> | 2010-05-06 04:56:07 +0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-05-06 04:56:07 +0400 |
| commit | 0ffbe2699cda6afbe08501098dff8a8c2fe6ae09 (patch) | |
| tree | 81b1a2305d16c873371b65c5a863c0268036cefe /security/tomoyo/file.c | |
| parent | 4e5d6f7ec3833c0da9cf34fa5c53c6058c5908b6 (diff) | |
| parent | 7ebd467551ed6ae200d7835a84bbda0dcadaa511 (diff) | |
| download | linux-0ffbe2699cda6afbe08501098dff8a8c2fe6ae09.tar.xz | |
Merge branch 'master' into next
Diffstat (limited to 'security/tomoyo/file.c')
| -rw-r--r-- | security/tomoyo/file.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/tomoyo/file.c b/security/tomoyo/file.c index cf67e55a0d13..0687ada28e82 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] = { |