[PATCH] slab: remove SLAB_KERNEL

SLAB_KERNEL is an alias of GFP_KERNEL.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

3 files changed, 3 insertions, 3 deletions

diff --git a/security/keys/key.c b/security/keys/key.c
index 70eacbe5abde..157bac658bf9 100644
--- a/security/keys/key.c
+++ b/security/keys/key.c
@@ -285,7 +285,7 @@ struct key *key_alloc(struct key_type *type, const char *desc,
         }
 
         /* allocate and initialise the key and its description */
-        key = kmem_cache_alloc(key_jar, SLAB_KERNEL);
+        key = kmem_cache_alloc(key_jar, GFP_KERNEL);
         if (!key)
                 goto no_memory_2;
 
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 78f98fe084eb..ac1aeed0b289 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -181,7 +181,7 @@ static int inode_alloc_security(struct inode *inode)
         struct task_security_struct *tsec = current->security;
         struct inode_security_struct *isec;
 
-        isec = kmem_cache_alloc(sel_inode_cache, SLAB_KERNEL);
+        isec = kmem_cache_alloc(sel_inode_cache, GFP_KERNEL);
         if (!isec)
                 return -ENOMEM;
 
diff --git a/security/selinux/ss/avtab.c b/security/selinux/ss/avtab.c
index d049c7acbc8b..2dfc6134c2c2 100644
--- a/security/selinux/ss/avtab.c
+++ b/security/selinux/ss/avtab.c
@@ -36,7 +36,7 @@ avtab_insert_node(struct avtab *h, int hvalue,
                   struct avtab_key *key, struct avtab_datum *datum)
 {
         struct avtab_node * newnode;
-        newnode = kmem_cache_alloc(avtab_node_cachep, SLAB_KERNEL);
+        newnode = kmem_cache_alloc(avtab_node_cachep, GFP_KERNEL);
         if (newnode == NULL)
                 return NULL;
         memset(newnode, 0, sizeof(struct avtab_node));