diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-19 01:58:34 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-19 01:58:34 +0100 |
| commit | 7f6f3507fdfdc8fd4e25ef7d6e760a3b695b6abf (patch) | |
| tree | 8fe713fb47d8ba11f91f3e7b6147ce3a00eced20 | |
| parent | Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | ima: replace GFP_KERNEL with GFP_NOFS (diff) | |
| download | linux-7f6f3507fdfdc8fd4e25ef7d6e760a3b695b6abf.tar.xz linux-7f6f3507fdfdc8fd4e25ef7d6e760a3b695b6abf.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
ima: replace GFP_KERNEL with GFP_NOFS
| -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) if (!ima_initialized) return iint; - iint = kmem_cache_alloc(iint_cache, GFP_KERNEL); + iint = kmem_cache_alloc(iint_cache, GFP_NOFS); if (!iint) return iint; - rc = radix_tree_preload(GFP_KERNEL); + rc = radix_tree_preload(GFP_NOFS); if (rc < 0) goto out; |