Browse Source

[PATCH] mm: use kmem_cache_zalloc

Convert mm/ to use the new kmem_cache_zalloc allocator.

Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Pekka Enberg 19 years ago
parent
commit
c5e3b83e97
2 changed files with 3 additions and 6 deletions
  1. 2 4
      mm/mmap.c
  2. 1 2
      mm/slab.c

+ 2 - 4
mm/mmap.c

@@ -1040,12 +1040,11 @@ munmap_back:
 	 * specific mapper. the address has already been validated, but
 	 * specific mapper. the address has already been validated, but
 	 * not unmapped, but the maps are removed from the list.
 	 * 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) {
 	if (!vma) {
 		error = -ENOMEM;
 		error = -ENOMEM;
 		goto unacct_error;
 		goto unacct_error;
 	}
 	}
-	memset(vma, 0, sizeof(*vma));
 
 
 	vma->vm_mm = mm;
 	vma->vm_mm = mm;
 	vma->vm_start = addr;
 	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
 	 * 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) {
 	if (!vma) {
 		vm_unacct_memory(len >> PAGE_SHIFT);
 		vm_unacct_memory(len >> PAGE_SHIFT);
 		return -ENOMEM;
 		return -ENOMEM;
 	}
 	}
-	memset(vma, 0, sizeof(*vma));
 
 
 	vma->vm_mm = mm;
 	vma->vm_mm = mm;
 	vma->vm_start = addr;
 	vma->vm_start = addr;

+ 1 - 2
mm/slab.c

@@ -1990,10 +1990,9 @@ kmem_cache_create (const char *name, size_t size, size_t align,
 	align = ralign;
 	align = ralign;
 
 
 	/* Get cache's description obj. */
 	/* Get cache's description obj. */
-	cachep = kmem_cache_alloc(&cache_cache, SLAB_KERNEL);
+	cachep = kmem_cache_zalloc(&cache_cache, SLAB_KERNEL);
 	if (!cachep)
 	if (!cachep)
 		goto oops;
 		goto oops;
-	memset(cachep, 0, sizeof(struct kmem_cache));
 
 
 #if DEBUG
 #if DEBUG
 	cachep->obj_size = size;
 	cachep->obj_size = size;