1 files changed, 7 insertions, 9 deletions

diff --git a/security/selinux/avc.c b/security/selinux/avc.c
index 4b4293194aee..2380b8d72cec 100644
--- a/security/selinux/avc.c
+++ b/security/selinux/avc.c
@@ -1,7 +1,7 @@
 /*
  * Implementation of the kernel access vector cache (AVC).
  *
- * Authors:  Stephen Smalley, <sds@epoch.ncsc.mil>
+ * Authors:  Stephen Smalley, <sds@tycho.nsa.gov>
  *           James Morris <jmorris@redhat.com>
  *
  * Update:   KaiGai, Kohei <kaigai@ak.jp.nec.com>
@@ -346,27 +346,26 @@ static struct avc_xperms_decision_node
         struct avc_xperms_decision_node *xpd_node;
         struct extended_perms_decision *xpd;
 
-        xpd_node = kmem_cache_zalloc(avc_xperms_decision_cachep,
-                                GFP_ATOMIC | __GFP_NOMEMALLOC);
+        xpd_node = kmem_cache_zalloc(avc_xperms_decision_cachep, GFP_NOWAIT);
         if (!xpd_node)
                 return NULL;
 
         xpd = &xpd_node->xpd;
         if (which & XPERMS_ALLOWED) {
                 xpd->allowed = kmem_cache_zalloc(avc_xperms_data_cachep,
-                                                GFP_ATOMIC | __GFP_NOMEMALLOC);
+                                                GFP_NOWAIT);
                 if (!xpd->allowed)
                         goto error;
         }
         if (which & XPERMS_AUDITALLOW) {
                 xpd->auditallow = kmem_cache_zalloc(avc_xperms_data_cachep,
-                                                GFP_ATOMIC | __GFP_NOMEMALLOC);
+                                                GFP_NOWAIT);
                 if (!xpd->auditallow)
                         goto error;
         }
         if (which & XPERMS_DONTAUDIT) {
                 xpd->dontaudit = kmem_cache_zalloc(avc_xperms_data_cachep,
-                                                GFP_ATOMIC | __GFP_NOMEMALLOC);
+                                                GFP_NOWAIT);
                 if (!xpd->dontaudit)
                         goto error;
         }
@@ -394,8 +393,7 @@ static struct avc_xperms_node *avc_xperms_alloc(void)
 {
         struct avc_xperms_node *xp_node;
 
-        xp_node = kmem_cache_zalloc(avc_xperms_cachep,
-                                GFP_ATOMIC|__GFP_NOMEMALLOC);
+        xp_node = kmem_cache_zalloc(avc_xperms_cachep, GFP_NOWAIT);
         if (!xp_node)
                 return xp_node;
         INIT_LIST_HEAD(&xp_node->xpd_head);
@@ -548,7 +546,7 @@ static struct avc_node *avc_alloc_node(void)
 {
         struct avc_node *node;
 
-        node = kmem_cache_zalloc(avc_node_cachep, GFP_ATOMIC|__GFP_NOMEMALLOC);
+        node = kmem_cache_zalloc(avc_node_cachep, GFP_NOWAIT);
         if (!node)
                 goto out;