Merge branch 'sched/urgent' into sched/core

Merge reason: bring together all the pending scheduler bits, for the sched/numa changes. Signed-off-by: Ingo Molnar <mingo@kernel.org>
mariux64 · May 17, 2012 · fac536f · fac536f
2 parents 13e099d + 30b4e9e
commit fac536f
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
@@ -6489,6 +6489,8 @@ static int __sdt_alloc(const struct cpumask *cpu_map)
 			if (!sg)
 				return -ENOMEM;
 
+			sg->next = sg;
+
 			*per_cpu_ptr(sdd->sg, j) = sg;
 
 			sgp = kzalloc_node(sizeof(struct sched_group_power),