iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s390/topology: always use s390 specific sched_domain_topology_level

Browse Source 
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>
This commit is contained in:
Heiko Carstens 2016-12-03 09:50:16 +01:00 committed by Martin Schwidefsky
parent 5423145f8c
commit ebb299a510
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/s390/kernel/topology.c
View File

@ -448,6 +448,7 @@ static int __init s390_topology_init(void)
struct sysinfo_15_1_x *info; struct sysinfo_15_1_x *info;
int i; int i;
set_sched_topology(s390_topology);
if (!MACHINE_HAS_TOPOLOGY) if (!MACHINE_HAS_TOPOLOGY)
return 0; return 0;
tl_info = (struct sysinfo_15_1_x *)__get_free_page(GFP_KERNEL); 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, &socket_info, 1);
alloc_masks(info, &book_info, 2); alloc_masks(info, &book_info, 2);
alloc_masks(info, &drawer_info, 3); alloc_masks(info, &drawer_info, 3);
set_sched_topology(s390_topology);
return 0; return 0;
} }
early_initcall(s390_topology_init); early_initcall(s390_topology_init);