Merge branch 'master' into next

[mv-sheeva.git] / security / integrity / ima / ima_audit.c

diff --git a/security/integrity/ima/ima_audit.c b/security/integrity/ima/ima_audit.c
index fcb1f714cfcd99879962fcd79d2241a9e37df669..c5c5a72c30be30b0477446cd311e8f329cb7dd30 100644 (file)
--- a/security/integrity/ima/ima_audit.c
+++ b/security/integrity/ima/ima_audit.c
@@ -11,6 +11,7 @@
  */
 
 #include <linux/fs.h>
+#include <linux/gfp.h>
 #include <linux/audit.h>
 #include "ima.h"