* [PATCH] ARM: socfpga: hide unused functions
@ 2016-02-23 14:08 Arnd Bergmann
2016-02-23 15:22 ` Dinh Nguyen
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2016-02-23 14:08 UTC (permalink / raw)
To: Dinh Nguyen; +Cc: linux-arm-kernel, Arnd Bergmann, linux-kernel
The cpu_die and cpu_kill callbacks are only used when CONFIG_HOTPLUG_CPU
is enabled, otherwise we get a warning about them:
arch/arm/mach-socfpga/platsmp.c:102:13: error: 'socfpga_cpu_die' defined but not used [-Werror=unused-function]
arch/arm/mach-socfpga/platsmp.c:115:12: error: 'socfpga_cpu_kill' defined but not used [-Werror=unused-function]
This adds the appropriate #ifdef.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/mach-socfpga/platsmp.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/mach-socfpga/platsmp.c b/arch/arm/mach-socfpga/platsmp.c
index cbb0a54df80a..07945748b571 100644
--- a/arch/arm/mach-socfpga/platsmp.c
+++ b/arch/arm/mach-socfpga/platsmp.c
@@ -94,6 +94,7 @@ static void __init socfpga_smp_prepare_cpus(unsigned int max_cpus)
scu_enable(socfpga_scu_base_addr);
}
+#ifdef CONFIG_HOTPLUG_CPU
/*
* platform-specific code to shutdown a CPU
*
@@ -116,6 +117,7 @@ static int socfpga_cpu_kill(unsigned int cpu)
{
return 1;
}
+#endif
static const struct smp_operations socfpga_smp_ops __initconst = {
.smp_prepare_cpus = socfpga_smp_prepare_cpus,
--
2.7.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ARM: socfpga: hide unused functions
2016-02-23 14:08 [PATCH] ARM: socfpga: hide unused functions Arnd Bergmann
@ 2016-02-23 15:22 ` Dinh Nguyen
2016-02-26 16:45 ` Arnd Bergmann
0 siblings, 1 reply; 3+ messages in thread
From: Dinh Nguyen @ 2016-02-23 15:22 UTC (permalink / raw)
To: Arnd Bergmann; +Cc: linux-arm-kernel, linux-kernel
On 02/23/2016 08:08 AM, Arnd Bergmann wrote:
> The cpu_die and cpu_kill callbacks are only used when CONFIG_HOTPLUG_CPU
> is enabled, otherwise we get a warning about them:
>
> arch/arm/mach-socfpga/platsmp.c:102:13: error: 'socfpga_cpu_die' defined but not used [-Werror=unused-function]
> arch/arm/mach-socfpga/platsmp.c:115:12: error: 'socfpga_cpu_kill' defined but not used [-Werror=unused-function]
>
> This adds the appropriate #ifdef.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> arch/arm/mach-socfpga/platsmp.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/arm/mach-socfpga/platsmp.c b/arch/arm/mach-socfpga/platsmp.c
> index cbb0a54df80a..07945748b571 100644
> --- a/arch/arm/mach-socfpga/platsmp.c
> +++ b/arch/arm/mach-socfpga/platsmp.c
> @@ -94,6 +94,7 @@ static void __init socfpga_smp_prepare_cpus(unsigned int max_cpus)
> scu_enable(socfpga_scu_base_addr);
> }
>
> +#ifdef CONFIG_HOTPLUG_CPU
> /*
> * platform-specific code to shutdown a CPU
> *
> @@ -116,6 +117,7 @@ static int socfpga_cpu_kill(unsigned int cpu)
> {
> return 1;
> }
> +#endif
>
> static const struct smp_operations socfpga_smp_ops __initconst = {
> .smp_prepare_cpus = socfpga_smp_prepare_cpus,
>
Acked-by: Dinh Nguyen <dinguyen@opensource.altera.com>
Dinh
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ARM: socfpga: hide unused functions
2016-02-23 15:22 ` Dinh Nguyen
@ 2016-02-26 16:45 ` Arnd Bergmann
0 siblings, 0 replies; 3+ messages in thread
From: Arnd Bergmann @ 2016-02-26 16:45 UTC (permalink / raw)
To: Dinh Nguyen; +Cc: linux-arm-kernel, linux-kernel
On Tuesday 23 February 2016 09:22:47 Dinh Nguyen wrote:
>
> On 02/23/2016 08:08 AM, Arnd Bergmann wrote:
> > The cpu_die and cpu_kill callbacks are only used when CONFIG_HOTPLUG_CPU
> > is enabled, otherwise we get a warning about them:
> >
> > arch/arm/mach-socfpga/platsmp.c:102:13: error: 'socfpga_cpu_die' defined but not used [-Werror=unused-function]
> > arch/arm/mach-socfpga/platsmp.c:115:12: error: 'socfpga_cpu_kill' defined but not used [-Werror=unused-function]
> >
> > This adds the appropriate #ifdef.
> >
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>
> Acked-by: Dinh Nguyen <dinguyen@opensource.altera.com>
Applied to next/fixes-non-critical, thanks!
Arnd
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-02-26 16:46 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-02-23 14:08 [PATCH] ARM: socfpga: hide unused functions Arnd Bergmann
2016-02-23 15:22 ` Dinh Nguyen
2016-02-26 16:45 ` Arnd Bergmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox