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

+2 -2
+2 -2
security/integrity/ima/ima_iint.c
··· 58 58 59 59 if (!ima_initialized) 60 60 return iint; 61 - iint = kmem_cache_alloc(iint_cache, GFP_KERNEL); 61 + iint = kmem_cache_alloc(iint_cache, GFP_NOFS); 62 62 if (!iint) 63 63 return iint; 64 64 65 - rc = radix_tree_preload(GFP_KERNEL); 65 + rc = radix_tree_preload(GFP_NOFS); 66 66 if (rc < 0) 67 67 goto out; 68 68