| Message ID | 1518474848-3158-2-git-send-email-linux@roeck-us.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 82343484a2d4c97a03bfd81303b5493c65f05c50 |
| Headers | show |
| Series | [1/2] powerpc/kdump: Add missing optional dummy functions | expand |
On 02/12/2018 02:34 PM, Guenter Roeck wrote: > Commit e67e02a544e9 ("powerpc/pseries: Fix cpu hotplug crash with > memoryless nodes") adds an unconditional call to find_and_online_cpu_nid(), > which is only declared if CONFIG_PPC_SPLPAR is enabled. This results in > the following build error if this is not the case. > > arch/powerpc/platforms/pseries/hotplug-cpu.o: In function `dlpar_online_cpu': > arch/powerpc/platforms/pseries/hotplug-cpu.c:369: > undefined reference to `.find_and_online_cpu_nid' > > Follow the guideline provided by similar functions and provide a dummy > function if CONFIG_PPC_SPLPAR is not enabled. This also moves the external > function declaration into an include file where it should be. > > Fixes: e67e02a544e9 ("powerpc/pseries: Fix cpu hotplug crash with ...") > Cc: Michael Bringmann <mwb@linux.vnet.ibm.com> > Cc: Michael Ellerman <mpe@ellerman.id.au> > Cc: Nathan Fontenot <nfont@linux.vnet.ibm.com> > Signed-off-by: Guenter Roeck <linux@roeck-us.net> Nathan already sent a patch on the 9th for this issue to the list. -Tyrel > --- > arch/powerpc/include/asm/topology.h | 5 +++++ > arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 -- > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h > index 88187c285c70..52815982436f 100644 > --- a/arch/powerpc/include/asm/topology.h > +++ b/arch/powerpc/include/asm/topology.h > @@ -82,6 +82,7 @@ static inline int numa_update_cpu_topology(bool cpus_locked) > 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); > #else > static inline int start_topology_update(void) > { > @@ -95,6 +96,10 @@ static inline int prrn_is_enabled(void) > { > return 0; > } > +static inline int find_and_online_cpu_nid(int cpu) > +{ > + return 0; > +} > #endif /* CONFIG_NUMA && CONFIG_PPC_SPLPAR */ > > #if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_NEED_MULTIPLE_NODES) > diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c > index dceb51454d8d..f5c6a8cd2926 100644 > --- a/arch/powerpc/platforms/pseries/hotplug-cpu.c > +++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c > @@ -340,8 +340,6 @@ static void pseries_remove_processor(struct device_node *np) > cpu_maps_update_done(); > } > > -extern int find_and_online_cpu_nid(int cpu); > - > static int dlpar_online_cpu(struct device_node *dn) > { > int rc = 0; >
On Mon, 2018-02-12 at 22:34:08 UTC, Guenter Roeck wrote: > Commit e67e02a544e9 ("powerpc/pseries: Fix cpu hotplug crash with > memoryless nodes") adds an unconditional call to find_and_online_cpu_nid(), > which is only declared if CONFIG_PPC_SPLPAR is enabled. This results in > the following build error if this is not the case. > > arch/powerpc/platforms/pseries/hotplug-cpu.o: In function `dlpar_online_cpu': > arch/powerpc/platforms/pseries/hotplug-cpu.c:369: > undefined reference to `.find_and_online_cpu_nid' > > Follow the guideline provided by similar functions and provide a dummy > function if CONFIG_PPC_SPLPAR is not enabled. This also moves the external > function declaration into an include file where it should be. > > Fixes: e67e02a544e9 ("powerpc/pseries: Fix cpu hotplug crash with ...") > Cc: Michael Bringmann <mwb@linux.vnet.ibm.com> > Cc: Michael Ellerman <mpe@ellerman.id.au> > Cc: Nathan Fontenot <nfont@linux.vnet.ibm.com> > Signed-off-by: Guenter Roeck <linux@roeck-us.net> Applied to powerpc fixes, thanks. https://git.kernel.org/powerpc/c/82343484a2d4c97a03bfd81303b549 cheers
diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h index 88187c285c70..52815982436f 100644 --- a/arch/powerpc/include/asm/topology.h +++ b/arch/powerpc/include/asm/topology.h @@ -82,6 +82,7 @@ static inline int numa_update_cpu_topology(bool cpus_locked) 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); #else static inline int start_topology_update(void) { @@ -95,6 +96,10 @@ static inline int prrn_is_enabled(void) { return 0; } +static inline int find_and_online_cpu_nid(int cpu) +{ + return 0; +} #endif /* CONFIG_NUMA && CONFIG_PPC_SPLPAR */ #if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_NEED_MULTIPLE_NODES) diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c index dceb51454d8d..f5c6a8cd2926 100644 --- a/arch/powerpc/platforms/pseries/hotplug-cpu.c +++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c @@ -340,8 +340,6 @@ static void pseries_remove_processor(struct device_node *np) cpu_maps_update_done(); } -extern int find_and_online_cpu_nid(int cpu); - static int dlpar_online_cpu(struct device_node *dn) { int rc = 0;
Commit e67e02a544e9 ("powerpc/pseries: Fix cpu hotplug crash with memoryless nodes") adds an unconditional call to find_and_online_cpu_nid(), which is only declared if CONFIG_PPC_SPLPAR is enabled. This results in the following build error if this is not the case. arch/powerpc/platforms/pseries/hotplug-cpu.o: In function `dlpar_online_cpu': arch/powerpc/platforms/pseries/hotplug-cpu.c:369: undefined reference to `.find_and_online_cpu_nid' Follow the guideline provided by similar functions and provide a dummy function if CONFIG_PPC_SPLPAR is not enabled. This also moves the external function declaration into an include file where it should be. Fixes: e67e02a544e9 ("powerpc/pseries: Fix cpu hotplug crash with ...") Cc: Michael Bringmann <mwb@linux.vnet.ibm.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Nathan Fontenot <nfont@linux.vnet.ibm.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> --- arch/powerpc/include/asm/topology.h | 5 +++++ arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-)