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/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/ia64/ia32')
-rw-r--r-- | arch/ia64/ia32/binfmt_elf32.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c index daa6b91bc921..578737ec7629 100644 --- a/arch/ia64/ia32/binfmt_elf32.c +++ b/arch/ia64/ia32/binfmt_elf32.c | |||
@@ -91,7 +91,7 @@ ia64_elf32_init (struct pt_regs *regs) | |||
91 | * it with privilege level 3 because the IVE uses non-privileged accesses to these | 91 | * it with privilege level 3 because the IVE uses non-privileged accesses to these |
92 | * tables. IA-32 segmentation is used to protect against IA-32 accesses to them. | 92 | * tables. IA-32 segmentation is used to protect against IA-32 accesses to them. |
93 | */ | 93 | */ |
94 | vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); | 94 | vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); |
95 | if (vma) { | 95 | if (vma) { |
96 | memset(vma, 0, sizeof(*vma)); | 96 | memset(vma, 0, sizeof(*vma)); |
97 | vma->vm_mm = current->mm; | 97 | vma->vm_mm = current->mm; |
@@ -117,7 +117,7 @@ ia64_elf32_init (struct pt_regs *regs) | |||
117 | * code is locked in specific gate page, which is pointed by pretcode | 117 | * code is locked in specific gate page, which is pointed by pretcode |
118 | * when setup_frame_ia32 | 118 | * when setup_frame_ia32 |
119 | */ | 119 | */ |
120 | vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); | 120 | vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); |
121 | if (vma) { | 121 | if (vma) { |
122 | memset(vma, 0, sizeof(*vma)); | 122 | memset(vma, 0, sizeof(*vma)); |
123 | vma->vm_mm = current->mm; | 123 | vma->vm_mm = current->mm; |
@@ -142,7 +142,7 @@ ia64_elf32_init (struct pt_regs *regs) | |||
142 | * Install LDT as anonymous memory. This gives us all-zero segment descriptors | 142 | * Install LDT as anonymous memory. This gives us all-zero segment descriptors |
143 | * until a task modifies them via modify_ldt(). | 143 | * until a task modifies them via modify_ldt(). |
144 | */ | 144 | */ |
145 | vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); | 145 | vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); |
146 | if (vma) { | 146 | if (vma) { |
147 | memset(vma, 0, sizeof(*vma)); | 147 | memset(vma, 0, sizeof(*vma)); |
148 | vma->vm_mm = current->mm; | 148 | vma->vm_mm = current->mm; |
@@ -214,7 +214,7 @@ ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack) | |||
214 | bprm->loader += stack_base; | 214 | bprm->loader += stack_base; |
215 | bprm->exec += stack_base; | 215 | bprm->exec += stack_base; |
216 | 216 | ||
217 | mpnt = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL); | 217 | mpnt = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL); |
218 | if (!mpnt) | 218 | if (!mpnt) |
219 | return -ENOMEM; | 219 | return -ENOMEM; |
220 | 220 | ||