diff options
author | Christoph Lameter <clameter@sgi.com> | 2006-12-06 23:33:17 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-07 11:39:24 -0500 |
commit | e94b1766097d53e6f3ccfb36c8baa562ffeda3fc (patch) | |
tree | 93fa0a8ab84976d4e89c50768ca8b8878d642a0d /kernel/fork.c | |
parent | 54e6ecb23951b195d02433a741c7f7cb0b796c78 (diff) |
[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>
Diffstat (limited to 'kernel/fork.c')
-rw-r--r-- | kernel/fork.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 5678e6c61ef2..711aa5f10da7 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) | |||
237 | goto fail_nomem; | 237 | goto fail_nomem; |
238 | charge = len; | 238 | charge = len; |
239 | } | 239 | } |
240 | tmp = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); | 240 | tmp = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); |
241 | if (!tmp) | 241 | if (!tmp) |
242 | goto fail_nomem; | 242 | goto fail_nomem; |
243 | *tmp = *mpnt; | 243 | *tmp = *mpnt; |
@@ -319,7 +319,7 @@ static inline void mm_free_pgd(struct mm_struct * mm) | |||
319 | 319 | ||
320 | __cacheline_aligned_in_smp DEFINE_SPINLOCK(mmlist_lock); | 320 | __cacheline_aligned_in_smp DEFINE_SPINLOCK(mmlist_lock); |
321 | 321 | ||
322 | #define allocate_mm() (kmem_cache_alloc(mm_cachep, SLAB_KERNEL)) | 322 | #define allocate_mm() (kmem_cache_alloc(mm_cachep, GFP_KERNEL)) |
323 | #define free_mm(mm) (kmem_cache_free(mm_cachep, (mm))) | 323 | #define free_mm(mm) (kmem_cache_free(mm_cachep, (mm))) |
324 | 324 | ||
325 | #include <linux/init_task.h> | 325 | #include <linux/init_task.h> |
@@ -621,7 +621,7 @@ static struct files_struct *alloc_files(void) | |||
621 | struct files_struct *newf; | 621 | struct files_struct *newf; |
622 | struct fdtable *fdt; | 622 | struct fdtable *fdt; |
623 | 623 | ||
624 | newf = kmem_cache_alloc(files_cachep, SLAB_KERNEL); | 624 | newf = kmem_cache_alloc(files_cachep, GFP_KERNEL); |
625 | if (!newf) | 625 | if (!newf) |
626 | goto out; | 626 | goto out; |
627 | 627 | ||