diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-12-04 09:59:47 -0500 |
| commit | 5cb2faa6ede7ada9cb2bffc832c4ce60f53d6834 (patch) | |
| tree | 7b72b66081d042a41dc822575503133364857ce2 /security | |
| parent | e0ee98513d1a2e24d2ddbdecf4216bcca29d1158 (diff) | |
| parent | 6060e8df517847bf445ebc61de7d4d9c7faae990 (diff) | |
Merge branch 'pending-misc' (early part) into devel
Diffstat (limited to 'security')
| -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 | ||