Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e94b1766 authored by Christoph Lameter's avatar Christoph Lameter Committed by Linus Torvalds
Browse files

[PATCH] slab: remove SLAB_KERNEL 



SLAB_KERNEL is an alias of GFP_KERNEL.

Signed-off-by: default avatarChristoph Lameter <clameter@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 54e6ecb2

arch/i386/kernel/sysenter.c

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack) 
		goto up_fail;

	}



	vma = kmem_cache_zalloc(vm_area_cachep, SLAB_KERNEL);

	vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);

	if (!vma) {

		ret = -ENOMEM;

		goto up_fail;

arch/ia64/ia32/binfmt_elf32.c

+4 −4
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ ia64_elf32_init (struct pt_regs *regs) 
	 * it with privilege level 3 because the IVE uses non-privileged accesses to these

	 * tables.  IA-32 segmentation is used to protect against IA-32 accesses to them.

	 */

	vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);

	vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);

	if (vma) {

		memset(vma, 0, sizeof(*vma));

		vma->vm_mm = current->mm;
@@ -117,7 +117,7 @@ ia64_elf32_init (struct pt_regs *regs) 
	 * code is locked in specific gate page, which is pointed by pretcode

	 * when setup_frame_ia32

	 */

	vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);

	vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);

	if (vma) {

		memset(vma, 0, sizeof(*vma));

		vma->vm_mm = current->mm;
@@ -142,7 +142,7 @@ ia64_elf32_init (struct pt_regs *regs) 
	 * Install LDT as anonymous memory.  This gives us all-zero segment descriptors

	 * until a task modifies them via modify_ldt().

	 */

	vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);

	vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);

	if (vma) {

		memset(vma, 0, sizeof(*vma));

		vma->vm_mm = current->mm;
@@ -214,7 +214,7 @@ ia32_setup_arg_pages (struct linux_binprm *bprm, int executable_stack) 
		bprm->loader += stack_base;

	bprm->exec += stack_base;



	mpnt = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);

	mpnt = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);

	if (!mpnt)

		return -ENOMEM;

arch/ia64/kernel/perfmon.c

+1 −1
Original line number Diff line number Diff line
@@ -2302,7 +2302,7 @@ pfm_smpl_buffer_alloc(struct task_struct *task, pfm_context_t *ctx, unsigned lon 
	DPRINT(("smpl_buf @%p\n", smpl_buf));



	/* allocate vma */

	vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);

	vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);

	if (!vma) {

		DPRINT(("Cannot allocate vma\n"));

		goto error_kmem;

arch/ia64/mm/init.c

+2 −2
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ ia64_init_addr_space (void) 
	 * the problem.  When the process attempts to write to the register backing store

	 * for the first time, it will get a SEGFAULT in this case.

	 */

	vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);

	vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);

	if (vma) {

		memset(vma, 0, sizeof(*vma));

		vma->vm_mm = current->mm;
@@ -175,7 +175,7 @@ ia64_init_addr_space (void) 


	/* map NaT-page at address zero to speed up speculative dereferencing of NULL: */

	if (!(current->personality & MMAP_PAGE_ZERO)) {

		vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);

		vma = kmem_cache_alloc(vm_area_cachep, GFP_KERNEL);

		if (vma) {

			memset(vma, 0, sizeof(*vma));

			vma->vm_mm = current->mm;

arch/powerpc/kernel/vdso.c

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, 




	/* Allocate a VMA structure and fill it up */

	vma = kmem_cache_zalloc(vm_area_cachep, SLAB_KERNEL);

	vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);

	if (vma == NULL) {

		rc = -ENOMEM;

		goto fail_mmapsem;