diff options
author | Frederic Weisbecker <fweisbec@gmail.com> | 2010-04-30 19:11:13 +0200 |
---|---|---|
committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-04-30 19:12:47 +0200 |
commit | 868c522b1b75fd3fd3e6a636b4c344ac08edf13a (patch) | |
tree | d85b984d9818abc3ccc0237eb53b710d9e96c39e /security/integrity/ima/ima_api.c | |
parent | lockstat: Make lockstat counting per cpu (diff) | |
parent | Linux 2.6.34-rc6 (diff) | |
download | linux-868c522b1b75fd3fd3e6a636b4c344ac08edf13a.tar.xz linux-868c522b1b75fd3fd3e6a636b4c344ac08edf13a.zip |
Merge commit 'v2.6.34-rc6' into core/locking
Merge reason: Further lockdep patches depend on per cpu updates
made in -rc1.
Diffstat (limited to 'security/integrity/ima/ima_api.c')
-rw-r--r-- | security/integrity/ima/ima_api.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c index 2a5e0bcf3887..52015d098fdf 100644 --- a/security/integrity/ima/ima_api.c +++ b/security/integrity/ima/ima_api.c @@ -13,6 +13,7 @@ * and store_template. */ #include <linux/module.h> +#include <linux/slab.h> #include "ima.h" static const char *IMA_TEMPLATE_NAME = "ima"; |