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/ia64/mm/init.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 'arch/ia64/mm/init.c')
-rw-r--r-- | arch/ia64/mm/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index ff87a5cba399..56dc2024220e 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c | |||
@@ -156,7 +156,7 @@ ia64_init_addr_space (void) | |||
156 | * the problem. When the process attempts to write to the register backing store | 156 | * the problem. When the process attempts to write to the register backing store |
157 | * for the first time, it will get a SEGFAULT in this case. | 157 | * for the first time, it will get a SEGFAULT in this case. |
158 | */ | 158 | */ |
159 | vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); | 159 | vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); |
160 | if (vma) { | 160 | if (vma) { |
161 | memset(vma, 0, sizeof(*vma)); | 161 | memset(vma, 0, sizeof(*vma)); |
162 | vma->vm_mm = current->mm; | 162 | vma->vm_mm = current->mm; |
@@ -175,7 +175,7 @@ ia64_init_addr_space (void) | |||
175 | 175 | ||
176 | /* map NaT-page at address zero to speed up speculative dereferencing of NULL: */ | 176 | /* map NaT-page at address zero to speed up speculative dereferencing of NULL: */ |
177 | if (!(current->personality & MMAP_PAGE_ZERO)) { | 177 | if (!(current->personality & MMAP_PAGE_ZERO)) { |
178 | vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); | 178 | vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); |
179 | if (vma) { | 179 | if (vma) { |
180 | memset(vma, 0, sizeof(*vma)); | 180 | memset(vma, 0, sizeof(*vma)); |
181 | vma->vm_mm = current->mm; | 181 | vma->vm_mm = current->mm; |