summaryrefslogtreecommitdiffstats
path: root/arch/s390
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2016-12-03 09:50:16 +0100
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2016-12-07 07:22:59 +0100
commitebb299a51059017ec253bd30781a83d1f6e11b24 (patch)
tree6f520e06f442a2b96d03836a7dd2fe93426a8bf5 /arch/s390
parent5423145f8c4e885c640d12adc35c421127ed015f (diff)
downloadop-kernel-dev-ebb299a51059017ec253bd30781a83d1f6e11b24.zip
op-kernel-dev-ebb299a51059017ec253bd30781a83d1f6e11b24.tar.gz
s390/topology: always use s390 specific sched_domain_topology_level
The s390 specific sched_domain_topology_level should always be used, not only if the machine provides topology information. Luckily this odd behaviour, that was by accident introduced with git commit d05d15da18f5 ("s390/topology: delay initialization of topology cpu masks") has currently no side effect. Fixes: d05d15da18f5 ("s390/topology: delay initialization of topology cpumasks") Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
-rw-r--r--arch/s390/kernel/topology.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index e959c02..8705ee6 100644
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -448,6 +448,7 @@ static int __init s390_topology_init(void)
struct sysinfo_15_1_x *info;
int i;
+ set_sched_topology(s390_topology);
if (!MACHINE_HAS_TOPOLOGY)
return 0;
tl_info = (struct sysinfo_15_1_x *)__get_free_page(GFP_KERNEL);
@@ -460,7 +461,6 @@ static int __init s390_topology_init(void)
alloc_masks(info, &socket_info, 1);
alloc_masks(info, &book_info, 2);
alloc_masks(info, &drawer_info, 3);
- set_sched_topology(s390_topology);
return 0;
}
early_initcall(s390_topology_init);
OpenPOWER on IntegriCloud