Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/s390/kernel/topology.c

+10 −8
Original line number Diff line number Diff line
@@ -464,15 +464,17 @@ static struct sched_domain_topology_level s390_topology[] = { 


static int __init topology_init(void)

{

	if (!MACHINE_HAS_TOPOLOGY) {

	if (MACHINE_HAS_TOPOLOGY)

		set_topology_timer();

	else

		topology_update_polarization_simple();

		goto out;

	return device_create_file(cpu_subsys.dev_root, &dev_attr_dispatching);

}

	set_topology_timer();

out:

device_initcall(topology_init);



static int __init early_topology_init(void)

{

	set_sched_topology(s390_topology);



	return device_create_file(cpu_subsys.dev_root, &dev_attr_dispatching);

	return 0;

}

device_initcall(topology_init);
 
early_initcall(early_topology_init);