Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b52783d authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] topology: fix cpu masks for topology=off case 



Fix cpu masks for 'topology=off' case. Folding of the scheduling domains
happen in such a way that everything belongs to the MC domain instead
of the CPU doimain.
This should fix a performance regression introduced with
eafd2b6d "[S390] topology: use default MC domain initializer" and also
makes sure we have the same behavious as if CONFIG_SCHED_MC was not
selected at all.

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 8d11e021

arch/s390/kernel/topology.c

+4 −2
Original line number Diff line number Diff line
@@ -53,8 +53,10 @@ static cpumask_t cpu_group_map(struct mask_info *info, unsigned int cpu) 
	cpumask_t mask;



	cpus_clear(mask);

	if (!topology_enabled || !MACHINE_HAS_TOPOLOGY)

		return cpu_possible_map;

	if (!topology_enabled || !MACHINE_HAS_TOPOLOGY) {

		cpumask_copy(&mask, cpumask_of(cpu));

		return mask;

	}

	while (info) {

		if (cpu_isset(cpu, info->mask)) {

			mask = info->mask;