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

Commit c5e3b83e authored by Pekka Enberg's avatar Pekka Enberg Committed by Linus Torvalds
Browse files

[PATCH] mm: use kmem_cache_zalloc 



Convert mm/ to use the new kmem_cache_zalloc allocator.

Signed-off-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 40c07ae8

mm/mmap.c

+2 −4
Original line number Diff line number Diff line
@@ -1040,12 +1040,11 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr, 
	 * specific mapper. the address has already been validated, but

	 * not unmapped, but the maps are removed from the list.

	 */

	vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);

	vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);

	if (!vma) {

		error = -ENOMEM;

		goto unacct_error;

	}

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



	vma->vm_mm = mm;

	vma->vm_start = addr;
@@ -1896,12 +1895,11 @@ unsigned long do_brk(unsigned long addr, unsigned long len) 
	/*

	 * create a vma struct for an anonymous mapping

	 */

	vma = kmem_cache_alloc(vm_area_cachep, SLAB_KERNEL);

	vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL);

	if (!vma) {

		vm_unacct_memory(len >> PAGE_SHIFT);

		return -ENOMEM;

	}

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



	vma->vm_mm = mm;

	vma->vm_start = addr;

mm/slab.c

+1 −2
Original line number Diff line number Diff line
@@ -1990,10 +1990,9 @@ kmem_cache_create (const char *name, size_t size, size_t align, 
	align = ralign;



	/* Get cache's description obj. */

	cachep = kmem_cache_alloc(&cache_cache, SLAB_KERNEL);

	cachep = kmem_cache_zalloc(&cache_cache, SLAB_KERNEL);

	if (!cachep)

		goto oops;

	memset(cachep, 0, sizeof(struct kmem_cache));



#if DEBUG

	cachep->obj_size = size;