---

yaml --- r: 252061 b: refs/heads/master c: 658c74c h: refs/heads/master i: 252059: 57ad575 v: v3
git-mirror · May 27, 2011 · 1d604ee · 1d604ee
1 parent 6b00dda
commit 1d604ee
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 074127367a503de0168e2ca5d0b36a6f761f026a
+refs/heads/master: 658c74cf3c98b1c9bc21e26731052db66251dfd8
diff --git a/trunk/drivers/char/mspec.c b/trunk/drivers/char/mspec.c
@@ -271,14 +271,13 @@ mspec_mmap(struct file *file, struct vm_area_struct *vma,
 	pages = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT;
 	vdata_size = sizeof(struct vma_data) + pages * sizeof(long);
 	if (vdata_size <= PAGE_SIZE)
-		vdata = kmalloc(vdata_size, GFP_KERNEL);
+		vdata = kzalloc(vdata_size, GFP_KERNEL);
 	else {
-		vdata = vmalloc(vdata_size);
+		vdata = vzalloc(vdata_size);
 		flags = VMD_VMALLOCED;
 	}
 	if (!vdata)
 		return -ENOMEM;
-	memset(vdata, 0, vdata_size);
 
 	vdata->vm_start = vma->vm_start;
 	vdata->vm_end = vma->vm_end;