git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into next
[safe/jmp/linux-2.6]
/
security
/
integrity
/
ima
/
ima_policy.c
diff --git
a/security/integrity/ima/ima_policy.c
b/security/integrity/ima/ima_policy.c
index
778a735
..
aef8c0a
100644
(file)
--- a/
security/integrity/ima/ima_policy.c
+++ b/
security/integrity/ima/ima_policy.c
@@
-15,6
+15,7
@@
#include <linux/security.h>
#include <linux/magic.h>
#include <linux/parser.h>
+#include <linux/slab.h>
#include "ima.h"