From: Deepak Saxena Signed-off-by: Deepak Saxena Signed-off-by: Andrew Morton --- drivers/cpufreq/cpufreq.c | 3 +-- drivers/cpufreq/cpufreq_stats.c | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff -puN drivers/cpufreq/cpufreq.c~cpufreq-kmalloc-memset-kzalloc-conversion drivers/cpufreq/cpufreq.c --- 25/drivers/cpufreq/cpufreq.c~cpufreq-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:31:32 2005 +++ 25-akpm/drivers/cpufreq/cpufreq.c Tue Oct 11 15:31:32 2005 @@ -595,12 +595,11 @@ static int cpufreq_add_dev (struct sys_d goto module_out; } - policy = kmalloc(sizeof(struct cpufreq_policy), GFP_KERNEL); + policy = kzalloc(sizeof(struct cpufreq_policy), GFP_KERNEL); if (!policy) { ret = -ENOMEM; goto nomem_out; } - memset(policy, 0, sizeof(struct cpufreq_policy)); policy->cpu = cpu; policy->cpus = cpumask_of_cpu(cpu); diff -puN drivers/cpufreq/cpufreq_stats.c~cpufreq-kmalloc-memset-kzalloc-conversion drivers/cpufreq/cpufreq_stats.c --- 25/drivers/cpufreq/cpufreq_stats.c~cpufreq-kmalloc-memset-kzalloc-conversion Tue Oct 11 15:31:32 2005 +++ 25-akpm/drivers/cpufreq/cpufreq_stats.c Tue Oct 11 15:31:32 2005 @@ -192,9 +192,8 @@ cpufreq_stats_create_table (struct cpufr unsigned int cpu = policy->cpu; if (cpufreq_stats_table[cpu]) return -EBUSY; - if ((stat = kmalloc(sizeof(struct cpufreq_stats), GFP_KERNEL)) == NULL) + if ((stat = kzalloc(sizeof(struct cpufreq_stats), GFP_KERNEL)) == NULL) return -ENOMEM; - memset(stat, 0, sizeof (struct cpufreq_stats)); data = cpufreq_cpu_get(cpu); if ((ret = sysfs_create_group(&data->kobj, &stats_attr_group))) @@ -216,12 +215,11 @@ cpufreq_stats_create_table (struct cpufr alloc_size += count * count * sizeof(int); #endif stat->max_state = count; - stat->time_in_state = kmalloc(alloc_size, GFP_KERNEL); + stat->time_in_state = kzalloc(alloc_size, GFP_KERNEL); if (!stat->time_in_state) { ret = -ENOMEM; goto error_out; } - memset(stat->time_in_state, 0, alloc_size); stat->freq_table = (unsigned int *)(stat->time_in_state + count); #ifdef CONFIG_CPU_FREQ_STAT_DETAILS _