Merge branch 'agp-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[sfrench/cifs-2.6.git] / security / integrity / ima / ima_iint.c

diff --git a/security/integrity/ima/ima_iint.c b/security/integrity/ima/ima_iint.c
index b8dd693f8790a62a4ae55b848bb8398cadbe3248..a4e2b1dac943b8ed05ee39dd23df2fbe56a80844 100644 (file)
--- 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;