[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>

4 files changed, 3 insertions, 4 deletions

diff --git a/include/linux/fs.h b/include/linux/fs.h
index a8039c8d8cbb..94b831b8157c 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1483,7 +1483,7 @@ extern void __init vfs_caches_init(unsigned long);
 
 extern struct kmem_cache *names_cachep;
 
-#define __getname()     kmem_cache_alloc(names_cachep, SLAB_KERNEL)
+#define __getname()     kmem_cache_alloc(names_cachep, GFP_KERNEL)
 #define __putname(name) kmem_cache_free(names_cachep, (void *)(name))
 #ifndef CONFIG_AUDITSYSCALL
 #define putname(name)   __putname(name)
diff --git a/include/linux/rmap.h b/include/linux/rmap.h
index db2c1df4fef9..61c2ab634b00 100644
--- a/include/linux/rmap.h
+++ b/include/linux/rmap.h
@@ -34,7 +34,7 @@ extern kmem_cache_t *anon_vma_cachep;
 
 static inline struct anon_vma *anon_vma_alloc(void)
 {
-        return kmem_cache_alloc(anon_vma_cachep, SLAB_KERNEL);
+        return kmem_cache_alloc(anon_vma_cachep, GFP_KERNEL);
 }
 
 static inline void anon_vma_free(struct anon_vma *anon_vma)
diff --git a/include/linux/slab.h b/include/linux/slab.h
index 34b046ea88f1..639f65efa46e 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -19,7 +19,6 @@ typedef struct kmem_cache kmem_cache_t;
 #include        <asm/cache.h>           /* kmalloc_sizes.h needs L1_CACHE_BYTES */
 
 /* flags for kmem_cache_alloc() */
-#define SLAB_KERNEL             GFP_KERNEL
 #define SLAB_DMA                GFP_DMA
 
 /* flags to pass to kmem_cache_create().
diff --git a/include/linux/taskstats_kern.h b/include/linux/taskstats_kern.h
index 6562a2050a25..f81a5af8a4f8 100644
--- a/include/linux/taskstats_kern.h
+++ b/include/linux/taskstats_kern.h
@@ -35,7 +35,7 @@ static inline void taskstats_tgid_alloc(struct task_struct *tsk)
                 return;
 
         /* No problem if kmem_cache_zalloc() fails */
-        stats = kmem_cache_zalloc(taskstats_cache, SLAB_KERNEL);
+        stats = kmem_cache_zalloc(taskstats_cache, GFP_KERNEL);
 
         spin_lock_irq(&tsk->sighand->siglock);
         if (!sig->stats) {