From 1d604ee977b8f533ae253a3f8c430d46a0a55710 Mon Sep 17 00:00:00 2001
From: Rakib Mullick <rakib.mullick@gmail.com>
Date: Thu, 26 May 2011 16:25:56 -0700
Subject: [PATCH] --- yaml --- r: 252061 b: refs/heads/master c:
 658c74cf3c98b1c9bc21e26731052db66251dfd8 h: refs/heads/master i:   252059:
 57ad5759b8af8be071d46e5e353d854b441bd4d0 v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/char/mspec.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 0d48a32f9767..f87e1b51b563 100644
--- 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
index 966a95bc974b..25d139c9dbed 100644
--- 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;