| From 48e9a6c1f54695609b709bf674aac133794ada00 Mon Sep 17 00:00:00 2001 |
| From: Martin Schwidefsky <schwidefsky@de.ibm.com> |
| Date: Wed, 24 Sep 2014 16:37:20 +0200 |
| Subject: s390/topology: call set_sched_topology early |
| |
| From: Martin Schwidefsky <schwidefsky@de.ibm.com> |
| |
| 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/s390/kernel/topology.c | 18 ++++++++++-------- |
| 1 file changed, 10 insertions(+), 8 deletions(-) |
| |
| --- a/arch/s390/kernel/topology.c |
| +++ b/arch/s390/kernel/topology.c |
| @@ -464,15 +464,17 @@ static struct sched_domain_topology_leve |
| |
| 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); |
