Commit dae9151a authored by Heiko Carstens's avatar Heiko Carstens Committed by Greg Kroah-Hartman

s390/topology: always use s390 specific sched_domain_topology_level

commit ebb299a5 upstream.

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
d05d15da ("s390/topology: delay initialization of topology cpu
masks") has currently no side effect.

Fixes: d05d15da ("s390/topology: delay initialization of topology cpumasks")
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b3539f81
......@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment