Commit fac536f7 authored May 17, 2012 by Ingo Molnar

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>

parents 13e099d2 30b4e9eb

kernel/sched/core.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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),