Commit fac536f7 authored by Ingo Molnar's avatar 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: default avatarIngo Molnar <mingo@kernel.org>
parents 13e099d2 30b4e9eb
...@@ -6489,6 +6489,8 @@ static int __sdt_alloc(const struct cpumask *cpu_map) ...@@ -6489,6 +6489,8 @@ static int __sdt_alloc(const struct cpumask *cpu_map)
if (!sg) if (!sg)
return -ENOMEM; return -ENOMEM;
sg->next = sg;
*per_cpu_ptr(sdd->sg, j) = sg; *per_cpu_ptr(sdd->sg, j) = sg;
sgp = kzalloc_node(sizeof(struct sched_group_power), sgp = kzalloc_node(sizeof(struct sched_group_power),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment