Replace kmalloc+memset with kzalloc Signed-off-by: Yan Burman diff -rubp linux-2.6.19-rc5_orig/ipc/sem.c linux-2.6.19-rc5_kzalloc/ipc/sem.c --- linux-2.6.19-rc5_orig/ipc/sem.c 2006-11-09 12:16:20.000000000 +0200 +++ linux-2.6.19-rc5_kzalloc/ipc/sem.c 2006-11-11 22:44:04.000000000 +0200 @@ -1070,14 +1070,13 @@ static struct sem_undo *find_undo(struct ipc_rcu_getref(sma); sem_unlock(sma); - new = (struct sem_undo *) kmalloc(sizeof(struct sem_undo) + sizeof(short)*nsems, GFP_KERNEL); + new = kzalloc(sizeof(struct sem_undo) + sizeof(short)*nsems, GFP_KERNEL); if (!new) { ipc_lock_by_ptr(&sma->sem_perm); ipc_rcu_putref(sma); sem_unlock(sma); return ERR_PTR(-ENOMEM); } - memset(new, 0, sizeof(struct sem_undo) + sizeof(short)*nsems); new->semadj = (short *) &new[1]; new->semid = semid; diff -rubp linux-2.6.19-rc5_orig/kernel/auditfilter.c linux-2.6.19-rc5_kzalloc/kernel/auditfilter.c --- linux-2.6.19-rc5_orig/kernel/auditfilter.c 2006-11-09 12:16:21.000000000 +0200 +++ linux-2.6.19-rc5_kzalloc/kernel/auditfilter.c 2006-11-11 22:44:04.000000000 +0200 @@ -636,10 +636,9 @@ static struct audit_rule *audit_krule_to struct audit_rule *rule; int i; - rule = kmalloc(sizeof(*rule), GFP_KERNEL); + rule = kzalloc(sizeof(*rule), GFP_KERNEL); if (unlikely(!rule)) return NULL; - memset(rule, 0, sizeof(*rule)); rule->flags = krule->flags | krule->listnr; rule->action = krule->action; diff -rubp linux-2.6.19-rc5_orig/kernel/futex.c linux-2.6.19-rc5_kzalloc/kernel/futex.c --- linux-2.6.19-rc5_orig/kernel/futex.c 2006-11-09 12:16:21.000000000 +0200 +++ linux-2.6.19-rc5_kzalloc/kernel/futex.c 2006-11-11 22:44:04.000000000 +0200 @@ -324,12 +324,11 @@ static int refill_pi_state_cache(void) if (likely(current->pi_state_cache)) return 0; - pi_state = kmalloc(sizeof(*pi_state), GFP_KERNEL); + pi_state = kzalloc(sizeof(*pi_state), GFP_KERNEL); if (!pi_state) return -ENOMEM; - memset(pi_state, 0, sizeof(*pi_state)); INIT_LIST_HEAD(&pi_state->list); /* pi_mutex gets initialized later */ pi_state->owner = NULL; diff -rubp linux-2.6.19-rc5_orig/kernel/kexec.c linux-2.6.19-rc5_kzalloc/kernel/kexec.c --- linux-2.6.19-rc5_orig/kernel/kexec.c 2006-11-09 12:16:21.000000000 +0200 +++ linux-2.6.19-rc5_kzalloc/kernel/kexec.c 2006-11-11 22:44:04.000000000 +0200 @@ -108,11 +108,10 @@ static int do_kimage_alloc(struct kimage /* Allocate a controlling structure */ result = -ENOMEM; - image = kmalloc(sizeof(*image), GFP_KERNEL); + image = kzalloc(sizeof(*image), GFP_KERNEL); if (!image) goto out; - memset(image, 0, sizeof(*image)); image->head = 0; image->entry = &image->head; image->last_entry = &image->head; diff -rubp linux-2.6.19-rc5_orig/lib/kobject.c linux-2.6.19-rc5_kzalloc/lib/kobject.c --- linux-2.6.19-rc5_orig/lib/kobject.c 2006-11-09 12:16:20.000000000 +0200 +++ linux-2.6.19-rc5_kzalloc/lib/kobject.c 2006-11-11 22:44:04.000000000 +0200 @@ -111,10 +111,9 @@ char *kobject_get_path(struct kobject *k len = get_kobj_path_length(kobj); if (len == 0) return NULL; - path = kmalloc(len, gfp_mask); + path = kzalloc(len, gfp_mask); if (!path) return NULL; - memset(path, 0x00, len); fill_kobj_path(kobj, path, len); return path; diff -rubp linux-2.6.19-rc5_orig/mm/nommu.c linux-2.6.19-rc5_kzalloc/mm/nommu.c --- linux-2.6.19-rc5_orig/mm/nommu.c 2006-11-09 12:16:21.000000000 +0200 +++ linux-2.6.19-rc5_kzalloc/mm/nommu.c 2006-11-11 22:44:04.000000000 +0200 @@ -806,10 +806,9 @@ unsigned long do_mmap_pgoff(struct file vm_flags = determine_vm_flags(file, prot, flags, capabilities); /* we're going to need to record the mapping if it works */ - vml = kmalloc(sizeof(struct vm_list_struct), GFP_KERNEL); + vml = kzalloc(sizeof(struct vm_list_struct), GFP_KERNEL); if (!vml) goto error_getting_vml; - memset(vml, 0, sizeof(*vml)); down_write(&nommu_vma_sem); @@ -885,11 +884,10 @@ unsigned long do_mmap_pgoff(struct file } /* we're going to need a VMA struct as well */ - vma = kmalloc(sizeof(struct vm_area_struct), GFP_KERNEL); + vma = kzalloc(sizeof(struct vm_area_struct), GFP_KERNEL); if (!vma) goto error_getting_vma; - memset(vma, 0, sizeof(*vma)); INIT_LIST_HEAD(&vma->anon_vma_node); atomic_set(&vma->vm_usage, 1); if (file)