Commit ebb299a5 authored Dec 03, 2016 by Heiko Carstens Committed by Martin Schwidefsky Dec 07, 2016

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
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: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

parent 5423145f

arch/s390/kernel/topology.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message