]> Pileus Git - ~andy/linux/commitdiff
drivers/char/mspec.c: use {k,v}zalloc to allocate memory
authorRakib Mullick <rakib.mullick@gmail.com>
Thu, 26 May 2011 23:25:56 +0000 (16:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 27 May 2011 00:12:37 +0000 (17:12 -0700)
Let memory allocator initialize the allocated memory as null, thus remove
the use of memset.

Signed-off-by: Rakib Mullick <rakib.mullick@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
drivers/char/mspec.c

index 966a95bc974b2c0489c7c4f33b52d1b3872238a0..25d139c9dbeddd86440847f3ced302950883ef98 100644 (file)
@@ -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;