diff --git a/[refs] b/[refs] index e8bcd6ab6d97..20301281a91d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0feaece97795c4c775a3c732c045706eda28d0e5 +refs/heads/master: ce164428c4cabfd284ca81913415cacd889aac33 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index fec97e4e196d..53608a59d6e3 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -6349,9 +6349,10 @@ static int build_sched_domains(const cpumask_t *cpu_map) > SD_NODES_PER_DOMAIN*cpus_weight(nodemask)) { if (!sched_group_allnodes) { sched_group_allnodes - = kmalloc(sizeof(struct sched_group) - * MAX_NUMNODES, - GFP_KERNEL); + = kmalloc_node(sizeof(struct sched_group) + * MAX_NUMNODES, + GFP_KERNEL, + cpu_to_node(i)); if (!sched_group_allnodes) { printk(KERN_WARNING "Can not alloc allnodes sched group\n");