[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, 6 insertions, 6 deletions

diff --git a/kernel/delayacct.c b/kernel/delayacct.c
index 66a0ea48751..70e9ec60308 100644
--- a/kernel/delayacct.c
+++ b/kernel/delayacct.c
@@ -41,7 +41,7 @@ void delayacct_init(void)
 
 void __delayacct_tsk_init(struct task_struct *tsk)
 {
-        tsk->delays = kmem_cache_zalloc(delayacct_cache, SLAB_KERNEL);
+        tsk->delays = kmem_cache_zalloc(delayacct_cache, GFP_KERNEL);
         if (tsk->delays)
                 spin_lock_init(&tsk->delays->lock);
 }
diff --git a/kernel/fork.c b/kernel/fork.c
index 5678e6c61ef..711aa5f10da 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -237,7 +237,7 @@ static inline int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm)
                                 goto fail_nomem;
                         charge = len;
                 }
-                tmp = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);
+                tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);
                 if (!tmp)
                         goto fail_nomem;
                 *tmp = *mpnt;
@@ -319,7 +319,7 @@ static inline void mm_free_pgd(struct mm_struct * mm)
 
  __cacheline_aligned_in_smp DEFINE_SPINLOCK(mmlist_lock);
 
-#define allocate_mm()   (kmem_cache_alloc(mm_cachep, SLAB_KERNEL))
+#define allocate_mm()   (kmem_cache_alloc(mm_cachep, GFP_KERNEL))
 #define free_mm(mm)     (kmem_cache_free(mm_cachep, (mm)))
 
 #include <linux/init_task.h>
@@ -621,7 +621,7 @@ static struct files_struct *alloc_files(void)
         struct files_struct *newf;
         struct fdtable *fdt;
 
-        newf = kmem_cache_alloc(files_cachep, SLAB_KERNEL);
+        newf = kmem_cache_alloc(files_cachep, GFP_KERNEL);
         if (!newf)
                 goto out;
 
diff --git a/kernel/taskstats.c b/kernel/taskstats.c
index d3d28919d4b..1b2b326cf70 100644
--- a/kernel/taskstats.c
+++ b/kernel/taskstats.c
@@ -425,7 +425,7 @@ void taskstats_exit_alloc(struct taskstats **ptidstats, unsigned int *mycpu)
         *mycpu = raw_smp_processor_id();
 
         *ptidstats = NULL;
-        tmp = kmem_cache_zalloc(taskstats_cache, SLAB_KERNEL);
+        tmp = kmem_cache_zalloc(taskstats_cache, GFP_KERNEL);
         if (!tmp)
                 return;
 
diff --git a/kernel/user.c b/kernel/user.c
index 220e586127a..c1f93c164c9 100644
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -132,7 +132,7 @@ struct user_struct * alloc_uid(uid_t uid)
         if (!up) {
                 struct user_struct *new;
 
-                new = kmem_cache_alloc(uid_cachep, SLAB_KERNEL);
+                new = kmem_cache_alloc(uid_cachep, GFP_KERNEL);
                 if (!new)
                         return NULL;
                 new->uid = uid;