diff options
author | Ingo Molnar <mingo@kernel.org> | 2012-05-17 06:17:10 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2012-05-17 06:17:12 -0400 |
commit | fac536f7e4927f34d480dc066f3a578c743b8f0e (patch) | |
tree | 13c8ecc3ea9132dcad74412778a6e84112083012 | |
parent | 13e099d2f77e1da3e4046860c48d956588633613 (diff) | |
parent | 30b4e9eb783d94e9f5d503b15eb31720679ae1c7 (diff) |
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>
-rw-r--r-- | kernel/sched/core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 860fddfb7bb7..bd314d7cd9f8 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c | |||
@@ -6489,6 +6489,8 @@ static int __sdt_alloc(const struct cpumask *cpu_map) | |||
6489 | if (!sg) | 6489 | if (!sg) |
6490 | return -ENOMEM; | 6490 | return -ENOMEM; |
6491 | 6491 | ||
6492 | sg->next = sg; | ||
6493 | |||
6492 | *per_cpu_ptr(sdd->sg, j) = sg; | 6494 | *per_cpu_ptr(sdd->sg, j) = sg; |
6493 | 6495 | ||
6494 | sgp = kzalloc_node(sizeof(struct sched_group_power), | 6496 | sgp = kzalloc_node(sizeof(struct sched_group_power), |