| From foo@baz Sun Jun 17 12:07:34 CEST 2018 |
| From: Michael Ellerman <mpe@ellerman.id.au> |
| Date: Tue, 8 May 2018 14:59:56 +1000 |
| Subject: powerpc/pseries: Fix CONFIG_NUMA=n build |
| |
| From: Michael Ellerman <mpe@ellerman.id.au> |
| |
| [ Upstream commit 6c0a8f6b5a45ac892a763b6299bd3c5324fc5e02 ] |
| |
| The build is failing with CONFIG_NUMA=n and some compiler versions: |
| |
| arch/powerpc/platforms/pseries/hotplug-cpu.o: In function `dlpar_online_cpu': |
| hotplug-cpu.c:(.text+0x12c): undefined reference to `timed_topology_update' |
| arch/powerpc/platforms/pseries/hotplug-cpu.o: In function `dlpar_cpu_remove': |
| hotplug-cpu.c:(.text+0x400): undefined reference to `timed_topology_update' |
| |
| Fix it by moving the empty version of timed_topology_update() into the |
| existing #ifdef block, which has the right guard of SPLPAR && NUMA. |
| |
| Fixes: cee5405da402 ("powerpc/hotplug: Improve responsiveness of hotplug change") |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/powerpc/include/asm/topology.h | 13 +++++-------- |
| 1 file changed, 5 insertions(+), 8 deletions(-) |
| |
| --- a/arch/powerpc/include/asm/topology.h |
| +++ b/arch/powerpc/include/asm/topology.h |
| @@ -91,6 +91,7 @@ extern int start_topology_update(void); |
| extern int stop_topology_update(void); |
| extern int prrn_is_enabled(void); |
| extern int find_and_online_cpu_nid(int cpu); |
| +extern int timed_topology_update(int nsecs); |
| #else |
| static inline int start_topology_update(void) |
| { |
| @@ -108,16 +109,12 @@ static inline int find_and_online_cpu_ni |
| { |
| return 0; |
| } |
| +static inline int timed_topology_update(int nsecs) |
| +{ |
| + return 0; |
| +} |
| #endif /* CONFIG_NUMA && CONFIG_PPC_SPLPAR */ |
| |
| -#if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_NEED_MULTIPLE_NODES) |
| -#if defined(CONFIG_PPC_SPLPAR) |
| -extern int timed_topology_update(int nsecs); |
| -#else |
| -#define timed_topology_update(nsecs) |
| -#endif /* CONFIG_PPC_SPLPAR */ |
| -#endif /* CONFIG_HOTPLUG_CPU || CONFIG_NEED_MULTIPLE_NODES */ |
| - |
| #include <asm-generic/topology.h> |
| |
| #ifdef CONFIG_SMP |