Skip to content

Commit

Permalink
s390/topology: always use s390 specific sched_domain_topology_level
Browse files Browse the repository at this point in the history
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
d05d15d ("s390/topology: delay initialization of topology cpu
masks") has currently no side effect.

Fixes: d05d15d ("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>
  • Loading branch information
Heiko Carstens authored and Martin Schwidefsky committed Dec 7, 2016
1 parent 5423145 commit ebb299a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/s390/kernel/topology.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down

0 comments on commit ebb299a

Please sign in to comment.