diff --git a/[refs] b/[refs] index ed7e74ffbb61..b81a36a5c9fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3a5aa9858cc9cecc3aadac7311d376c7c9e101a +refs/heads/master: 15f0b676a482fb4067cfe25de417c417dda3440a diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index e93c75ffdc88..ee4211bd40c5 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -6022,7 +6022,7 @@ static int build_sched_domains(const cpumask_t *cpu_map) domainspan = sched_domain_node_span(i); cpus_and(domainspan, domainspan, *cpu_map); - sg = kmalloc(sizeof(struct sched_group), GFP_KERNEL); + sg = kmalloc_node(sizeof(struct sched_group), GFP_KERNEL, i); if (!sg) { printk(KERN_WARNING "Can not alloc domain group for " "node %d\n", i); @@ -6055,7 +6055,8 @@ static int build_sched_domains(const cpumask_t *cpu_map) if (cpus_empty(tmp)) continue; - sg = kmalloc(sizeof(struct sched_group), GFP_KERNEL); + sg = kmalloc_node(sizeof(struct sched_group), + GFP_KERNEL, i); if (!sg) { printk(KERN_WARNING "Can not alloc domain group for node %d\n", j);