diff options
| author | James Morris <jmorris@macbook.(none)> | 2009-12-03 01:33:40 -0500 |
|---|---|---|
| committer | James Morris <jmorris@macbook.(none)> | 2009-12-03 01:33:40 -0500 |
| commit | c84d6efd363a3948eb32ec40d46bab6338580454 (patch) | |
| tree | 3ba7ac46e6626fe8ac843834588609eb6ccee5c6 /security/integrity/ima/ima_iint.c | |
| parent | 7539cf4b92be4aecc573ea962135f246a7a33401 (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'security/integrity/ima/ima_iint.c')
| -rw-r--r-- | security/integrity/ima/ima_iint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/integrity/ima/ima_iint.c b/security/integrity/ima/ima_iint.c index b8dd693f8790..a4e2b1dac943 100644 --- a/security/integrity/ima/ima_iint.c +++ b/security/integrity/ima/ima_iint.c | |||
| @@ -58,11 +58,11 @@ struct ima_iint_cache *ima_iint_insert(struct inode *inode) | |||
| 58 | 58 | ||
| 59 | if (!ima_initialized) | 59 | if (!ima_initialized) |
| 60 | return iint; | 60 | return iint; |
| 61 | iint = kmem_cache_alloc(iint_cache, GFP_KERNEL); | 61 | iint = kmem_cache_alloc(iint_cache, GFP_NOFS); |
| 62 | if (!iint) | 62 | if (!iint) |
| 63 | return iint; | 63 | return iint; |
| 64 | 64 | ||
| 65 | rc = radix_tree_preload(GFP_KERNEL); | 65 | rc = radix_tree_preload(GFP_NOFS); |
| 66 | if (rc < 0) | 66 | if (rc < 0) |
| 67 | goto out; | 67 | goto out; |
| 68 | 68 | ||