Patch "s390/topology: fix compile error in file arch/s390/kernel/smp.c" has been added to the 4.14-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
s390/topology: fix compile error in file arch/s390/kernel/smp.c
to the 4.14-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-fix-compile-error-in-file-arch-s390-kernel-smp.c.patch
and it can be found in the queue-4.14 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 foo@baz Thu Feb 1 13:45:42 CET 2018
From: Thomas Richter <[email protected]>
Date: Thu, 16 Nov 2017 14:26:36 +0100
Subject: s390/topology: fix compile error in file arch/s390/kernel/smp.c
From: Thomas Richter <[email protected]>
[ Upstream commit 38389ec84e835fa31a59b7dabb18343106a6d0d5 ]
Commit 1887aa07b676
("s390/topology: add detection of dedicated vs shared CPUs") introduced following compiler error when CONFIG_SCHED_TOPOLOGY is not set.
CC arch/s390/kernel/smp.o
...arch/s390/kernel/smp.c: In function ‘smp_start_secondary’:arch/s390/kernel/smp.c:812:6: error: implicit declaration of function
‘topology_cpu_dedicated’; did you mean ‘topology_cpu_init’?
This patch fixes the compiler error by adding function topology_cpu_dedicated() to return false when this config option is not defined.
--- arch/s390/include/asm/topology.h | 1 + arch/s390/kernel/smp.c | 1 + 2 files changed, 2 insertions(+)
arch/s390/include/asm/topology.h +1 -0
@@ -51,6 +51,7 @@ const struct cpumask *cpu_coregroup_maskstatic inline void topology_init_early (void ) { }static inline void topology_schedule_update (void ) { }static inline int topology_cpu_init (struct cpu *cpu) {return 0 ; } +static inline int topology_cpu_dedicated (int cpu_nr) {return 0 ; }static inline void topology_expect_change (void ) { }#endif /* CONFIG_SCHED_TOPOLOGY */
arch/s390/kernel/smp.c +1 -0
@@ -54,6 +54,7 @@#include <asm/sigp.h> #include <asm/idle.h> #include <asm/nmi.h> +#include <asm/topology.h> #include "entry.h" enum {
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/s390-topology-fix-compile-error-in-file-arch-s390-kernel-smp.c.patch