|
@@ -1040,12 +1040,11 @@ munmap_back:
|
|
* specific mapper. the address has already been validated, but
|
|
* specific mapper. the address has already been validated, but
|
|
* not unmapped, but the maps are removed from the list.
|
|
* 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) {
|
|
if (!vma) {
|
|
error = -ENOMEM;
|
|
error = -ENOMEM;
|
|
goto unacct_error;
|
|
goto unacct_error;
|
|
}
|
|
}
|
|
- memset(vma, 0, sizeof(*vma));
|
|
|
|
|
|
|
|
vma->vm_mm = mm;
|
|
vma->vm_mm = mm;
|
|
vma->vm_start = addr;
|
|
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
|
|
* 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) {
|
|
if (!vma) {
|
|
vm_unacct_memory(len >> PAGE_SHIFT);
|
|
vm_unacct_memory(len >> PAGE_SHIFT);
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
}
|
|
}
|
|
- memset(vma, 0, sizeof(*vma));
|
|
|
|
|
|
|
|
vma->vm_mm = mm;
|
|
vma->vm_mm = mm;
|
|
vma->vm_start = addr;
|
|
vma->vm_start = addr;
|