Commit 7f6f3507 authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'for-linus' of...

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
parents d22966d0 c09c59e6
...@@ -58,11 +58,11 @@ struct ima_iint_cache *ima_iint_insert(struct inode *inode) ...@@ -58,11 +58,11 @@ struct ima_iint_cache *ima_iint_insert(struct inode *inode)
if (!ima_initialized) if (!ima_initialized)
return iint; return iint;
iint = kmem_cache_alloc(iint_cache, GFP_KERNEL); iint = kmem_cache_alloc(iint_cache, GFP_NOFS);
if (!iint) if (!iint)
return iint; return iint;
rc = radix_tree_preload(GFP_KERNEL); rc = radix_tree_preload(GFP_NOFS);
if (rc < 0) if (rc < 0)
goto out; goto out;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment