diff --git a/[refs] b/[refs] index b4fd287f9761..22746622819f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0dbee3a6b006dbe814d002cb18e94bf24a216451 +refs/heads/master: 5cf9f062c8e33d5a09eaa447550330162b2a96ed diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 750612751a7f..d29950a60411 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -5243,10 +5243,9 @@ static struct ctl_table sd_ctl_root[] = { static struct ctl_table *sd_alloc_ctl_entry(int n) { struct ctl_table *entry = - kmalloc(n * sizeof(struct ctl_table), GFP_KERNEL); + kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL); BUG_ON(!entry); - memset(entry, 0, n * sizeof(struct ctl_table)); return entry; } @@ -6018,7 +6017,7 @@ static int build_sched_domains(const cpumask_t *cpu_map) /* * Allocate the per-node list of sched groups */ - sched_group_nodes = kzalloc(sizeof(struct sched_group *)*MAX_NUMNODES, + sched_group_nodes = kcalloc(MAX_NUMNODES, sizeof(struct sched_group *), GFP_KERNEL); if (!sched_group_nodes) { printk(KERN_WARNING "Can not alloc sched group node list\n");