summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2012-05-17 12:17:10 +0200
committerIngo Molnar <mingo@kernel.org>2012-05-17 12:17:12 +0200
commitfac536f7e4927f34d480dc066f3a578c743b8f0e (patch)
tree13c8ecc3ea9132dcad74412778a6e84112083012 /kernel
parent13e099d2f77e1da3e4046860c48d956588633613 (diff)
parent30b4e9eb783d94e9f5d503b15eb31720679ae1c7 (diff)
downloadop-kernel-dev-fac536f7e4927f34d480dc066f3a578c743b8f0e.zip
op-kernel-dev-fac536f7e4927f34d480dc066f3a578c743b8f0e.tar.gz
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>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/sched/core.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 860fddf..bd314d7 100644
--- 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),
OpenPOWER on IntegriCloud