Skip to contentSkip to conversation

Patch "s390/topology: always use s390 specific sched_domain_topology_level" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jan 9, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

s390/topology: always use s390 specific sched_domain_topology_level

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
s390-topology-always-use-s390-specific-sched_domain_topology_level.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From ebb299a51059017ec253bd30781a83d1f6e11b24 Mon Sep 17 00:00:00 2001

From: Heiko Carstens <[email protected]>
Date: Sat, 3 Dec 2016 09:50:16 +0100
Subject: s390/topology: always use s390 specific sched_domain_topology_level

From: Heiko Carstens <[email protected]>

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

Fixes d05d15da18f5 ("s390/topology: delay initialization of topology cpumasks")
---
 arch/s390/kernel/topology.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/kernel/topology.c +1 -1
@@ -448,6 +448,7 @@ static int __init s390_topology_init(voi
 	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(voi
 	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);

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/s390-topology-always-use-s390-specific-sched_domain_topology_level.patch