Commit 48e9a6c1 authored by Martin Schwidefsky's avatar Martin Schwidefsky

s390/topology: call set_sched_topology early

The call to topology_init is too late for the set_sched_topology call.
The initial scheduling domain structure has already been established
with default topology array. Use the smp_cpus_done() call to get the
s390 specific topology array registered early enough.

Cc: stable@vger.kernel.org # v3.16+
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 2a0a5b22
...@@ -464,15 +464,17 @@ static struct sched_domain_topology_level s390_topology[] = { ...@@ -464,15 +464,17 @@ static struct sched_domain_topology_level s390_topology[] = {
static int __init topology_init(void) static int __init topology_init(void)
{ {
if (!MACHINE_HAS_TOPOLOGY) { if (MACHINE_HAS_TOPOLOGY)
topology_update_polarization_simple();
goto out;
}
set_topology_timer(); set_topology_timer();
out: else
topology_update_polarization_simple();
set_sched_topology(s390_topology);
return device_create_file(cpu_subsys.dev_root, &dev_attr_dispatching); return device_create_file(cpu_subsys.dev_root, &dev_attr_dispatching);
} }
device_initcall(topology_init); device_initcall(topology_init);
static int __init early_topology_init(void)
{
set_sched_topology(s390_topology);
return 0;
}
early_initcall(early_topology_init);
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