Merge branch 'master' into next

[sfrench/cifs-2.6.git] / security / integrity / ima / ima_queue.c

diff --git a/security/integrity/ima/ima_queue.c b/security/integrity/ima/ima_queue.c
index 148a3d85e7763ef6bf806eb937f58cd81d2ea60e..8e28f04a5e2e8282d2bdd940393fda3a889e77cc 100644 (file)
--- a/security/integrity/ima/ima_queue.c
+++ b/security/integrity/ima/ima_queue.c
@@ -20,6 +20,7 @@
  */
 #include <linux/module.h>
 #include <linux/rculist.h>
+#include <linux/slab.h>
 #include "ima.h"
 
 LIST_HEAD(ima_measurements);   /* list of all measurements */