Commit 38389ec8 authored Nov 16, 2017 by Thomas Richter Committed by Martin Schwidefsky Nov 20, 2017

s390/topology: fix compile error in file arch/s390/kernel/smp.c



Commit 1887aa07
("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.

Signed-off-by: Thomas Richter <tmricht@linux.vnet.ibm.com>
Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

parent c8a0739b

arch/s390/include/asm/topology.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ const struct cpumask *cpu_coregroup_mask(int cpu);
		static 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

Original line number	Diff line number	Diff line
		@@ -55,6 +55,7 @@
		#include <asm/sigp.h>
		#include <asm/idle.h>
		#include <asm/nmi.h>
		#include <asm/topology.h>
		#include "entry.h"

		enum {

Admin message