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/powerpc | |
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/powerpc')
-rw-r--r-- | arch/powerpc/kernel/vdso.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/cell/spufs/inode.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c index c913ad5cad29..a4b28c73bba0 100644 --- a/arch/powerpc/kernel/vdso.c +++ b/arch/powerpc/kernel/vdso.c | |||
@@ -264,7 +264,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, | |||
264 | 264 | ||
265 | 265 | ||
266 | /* Allocate a VMA structure and fill it up */ | 266 | /* Allocate a VMA structure and fill it up */ |
267 | vma = kmem_cache_zalloc(vm_area_cachep, SLAB_KERNEL); | 267 | vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL); |
268 | if (vma == NULL) { | 268 | if (vma == NULL) { |
269 | rc = -ENOMEM; | 269 | rc = -ENOMEM; |
270 | goto fail_mmapsem; | 270 | goto fail_mmapsem; |
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c index c7d010749a18..7edfcc9d2853 100644 --- a/arch/powerpc/platforms/cell/spufs/inode.c +++ b/arch/powerpc/platforms/cell/spufs/inode.c | |||
@@ -48,7 +48,7 @@ spufs_alloc_inode(struct super_block *sb) | |||
48 | { | 48 | { |
49 | struct spufs_inode_info *ei; | 49 | struct spufs_inode_info *ei; |
50 | 50 | ||
51 | ei = kmem_cache_alloc(spufs_inode_cache, SLAB_KERNEL); | 51 | ei = kmem_cache_alloc(spufs_inode_cache, GFP_KERNEL); |
52 | if (!ei) | 52 | if (!ei) |
53 | return NULL; | 53 | return NULL; |
54 | 54 | ||