From 63b05fbb23711ad42e69d771f9b4c6f35a9acf46 Mon Sep 17 00:00:00 2001
From: Pekka Enberg <penberg@cs.helsinki.fi>
Date: Sat, 25 Mar 2006 03:06:43 -0800
Subject: [PATCH] --- yaml --- r: 23507 b: refs/heads/master c:
 c5e3b83e97be4e09961c0af101644643e5d03d17 h: refs/heads/master i:   23505:
 3b2325656f5972778536d411f186532146c7e6c8   23503:
 0b12600efa9af279e11a59e9324315aacc89455a v: v3

---
 [refs]          | 2 +-
 trunk/mm/mmap.c | 6 ++----
 trunk/mm/slab.c | 3 +--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index e09b9b0569b4..313118f23055 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40c07ae8daa659b8feb149c84731629386873c16
+refs/heads/master: c5e3b83e97be4e09961c0af101644643e5d03d17
diff --git a/trunk/mm/mmap.c b/trunk/mm/mmap.c
index 0eb9894db6de..4f5b5709136a 100644
--- a/trunk/mm/mmap.c
+++ b/trunk/mm/mmap.c
@@ -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;
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index 6f5aeebd4306..6a3760e0353c 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -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;