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

security/integrity/ima/ima_iint.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;