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 /mm/mmap.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 'mm/mmap.c')
-rw-r--r-- | mm/mmap.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1736,7 +1736,7 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma, | |||
1736 | if (mm->map_count >= sysctl_max_map_count) | 1736 | if (mm->map_count >= sysctl_max_map_count) |
1737 | return -ENOMEM; | 1737 | return -ENOMEM; |
1738 | 1738 | ||
1739 | new = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); | 1739 | new = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); |
1740 | if (!new) | 1740 | if (!new) |
1741 | return -ENOMEM; | 1741 | return -ENOMEM; |
1742 | 1742 | ||
@@ -2057,7 +2057,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, | |||
2057 | vma_start < new_vma->vm_end) | 2057 | vma_start < new_vma->vm_end) |
2058 | *vmap = new_vma; | 2058 | *vmap = new_vma; |
2059 | } else { | 2059 | } else { |
2060 | new_vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); | 2060 | new_vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); |
2061 | if (new_vma) { | 2061 | if (new_vma) { |
2062 | *new_vma = *vma; | 2062 | *new_vma = *vma; |
2063 | pol = mpol_copy(vma_policy(vma)); | 2063 | pol = mpol_copy(vma_policy(vma)); |