summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2014-09-24 16:37:20 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2014-09-26 12:22:39 +0200
commit48e9a6c1f54695609b709bf674aac133794ada00 (patch)
tree90058dfb8a3a6b1f758623fcad7ac9bc8e88a90c /arch/s390
parent2a0a5b2299b9bef76123fac91e68d39cb361c33e (diff)
downloadop-kernel-dev-48e9a6c1f54695609b709bf674aac133794ada00.zip
op-kernel-dev-48e9a6c1f54695609b709bf674aac133794ada00.tar.gz
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: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kernel/topology.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index 355a16c..b93bed7 100644
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -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;
- }
- set_topology_timer();
-out:
-
- set_sched_topology(s390_topology);
-
return device_create_file(cpu_subsys.dev_root, &dev_attr_dispatching);
}
device_initcall(topology_init);
+
+static int __init early_topology_init(void)
+{
+ set_sched_topology(s390_topology);
+ return 0;
+}
+early_initcall(early_topology_init);
OpenPOWER on IntegriCloud