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 /arch/x86_64/ia32 | |
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 'arch/x86_64/ia32')
-rw-r--r-- | arch/x86_64/ia32/ia32_binfmt.c | 2 | ||||
-rw-r--r-- | arch/x86_64/ia32/syscall32.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/ia32/ia32_binfmt.c b/arch/x86_64/ia32/ia32_binfmt.c index 82ef182de6ae..932a62ad6c83 100644 --- a/arch/x86_64/ia32/ia32_binfmt.c +++ b/arch/x86_64/ia32/ia32_binfmt.c | |||
@@ -351,7 +351,7 @@ int ia32_setup_arg_pages(struct linux_binprm *bprm, unsigned long stack_top, | |||
351 | bprm->loader += stack_base; | 351 | bprm->loader += stack_base; |
352 | bprm->exec += stack_base; | 352 | bprm->exec += stack_base; |
353 | 353 | ||
354 | mpnt = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); | 354 | mpnt = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); |
355 | if (!mpnt) | 355 | if (!mpnt) |
356 | return -ENOMEM; | 356 | return -ENOMEM; |
357 | 357 | ||
diff --git a/arch/x86_64/ia32/syscall32.c b/arch/x86_64/ia32/syscall32.c index 3a01329473ab..3e5ed20cba45 100644 --- a/arch/x86_64/ia32/syscall32.c +++ b/arch/x86_64/ia32/syscall32.c | |||
@@ -49,7 +49,7 @@ int syscall32_setup_pages(struct linux_binprm *bprm, int exstack) | |||
49 | struct mm_struct *mm = current->mm; | 49 | struct mm_struct *mm = current->mm; |
50 | int ret; | 50 | int ret; |
51 | 51 | ||
52 | vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); | 52 | vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); |
53 | if (!vma) | 53 | if (!vma) |
54 | return -ENOMEM; | 54 | return -ENOMEM; |
55 | 55 | ||