UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2009-11-18 16:58:34 -08:00
parent d22966d067 c09c59e6a0
commit 7f6f3507fd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/integrity/ima/ima_iint.c
View File

@ -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;