diff --git a/[refs] b/[refs] index 6a7d17caa07a..bb8e6efd2357 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f62388187207bea83f1865d507bf892a1f9152c3 +refs/heads/master: 4d67d860531ad5378dedfad7661c540f3365013d diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c index 94dff883b449..c28b0b9e5cc0 100644 --- a/trunk/mm/vmalloc.c +++ b/trunk/mm/vmalloc.c @@ -2375,8 +2375,8 @@ struct vm_struct **pcpu_get_vm_areas(const unsigned long *offsets, return NULL; } - vms = kzalloc(sizeof(vms[0]) * nr_vms, GFP_KERNEL); - vas = kzalloc(sizeof(vas[0]) * nr_vms, GFP_KERNEL); + vms = kcalloc(nr_vms, sizeof(vms[0]), GFP_KERNEL); + vas = kcalloc(nr_vms, sizeof(vas[0]), GFP_KERNEL); if (!vas || !vms) goto err_free2;