diff options
| author | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2014-09-24 16:37:20 +0200 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2014-11-17 14:11:39 +0000 |
| commit | 8d765b881abfbb71eb7fa1480810aa85584a9ece (patch) | |
| tree | d5267a059647bf8711bd14276be6a775df1964ec /arch/s390/kernel | |
| parent | fd6baa91c66049615150dab76a28b67eb8ede49c (diff) | |
| download | linux-stable-8d765b881abfbb71eb7fa1480810aa85584a9ece.tar.gz linux-stable-8d765b881abfbb71eb7fa1480810aa85584a9ece.tar.bz2 linux-stable-8d765b881abfbb71eb7fa1480810aa85584a9ece.zip | |
s390/topology: call set_sched_topology early
commit 48e9a6c1f54695609b709bf674aac133794ada00 upstream.
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.
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'arch/s390/kernel')
| -rw-r--r-- | arch/s390/kernel/topology.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c index 355a16c55702..b93bed76ea94 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); |