* ARM: shmobile: fix shmobile_smp_apmu_suspend_init build failure for !SUSPEND
@ 2014-07-03 14:08 Arnd Bergmann
2014-07-06 14:32 ` Simon Horman
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2014-07-03 14:08 UTC (permalink / raw)
To: linux-arm-kernel
Patch d6d757c9a4e ("ARM: shmobile: APMU: Add Core-Standby-state for
Suspend to RAM") added both an inline wrapper for shmobile_smp_apmu_suspend_init
and an empty function in arch/arm/mach-shmobile/platsmp-apmu.c. We get a
build failure when both are present, so this patch removes the one in the .c
file and keeps the inline version.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
diff --git a/arch/arm/mach-shmobile/platsmp-apmu.c b/arch/arm/mach-shmobile/platsmp-apmu.c
index a05b16d..2c06810 100644
--- a/arch/arm/mach-shmobile/platsmp-apmu.c
+++ b/arch/arm/mach-shmobile/platsmp-apmu.c
@@ -244,6 +244,4 @@ void __init shmobile_smp_apmu_suspend_init(void)
{
shmobile_suspend_ops.enter = shmobile_smp_apmu_enter_suspend;
}
-#else
-void shmobile_smp_apmu_suspend_init(void) {}
#endif
^ permalink raw reply related [flat|nested] 2+ messages in thread
* ARM: shmobile: fix shmobile_smp_apmu_suspend_init build failure for !SUSPEND
2014-07-03 14:08 ARM: shmobile: fix shmobile_smp_apmu_suspend_init build failure for !SUSPEND Arnd Bergmann
@ 2014-07-06 14:32 ` Simon Horman
0 siblings, 0 replies; 2+ messages in thread
From: Simon Horman @ 2014-07-06 14:32 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, Jul 03, 2014 at 04:08:30PM +0200, Arnd Bergmann wrote:
> Patch d6d757c9a4e ("ARM: shmobile: APMU: Add Core-Standby-state for
> Suspend to RAM") added both an inline wrapper for shmobile_smp_apmu_suspend_init
> and an empty function in arch/arm/mach-shmobile/platsmp-apmu.c. We get a
> build failure when both are present, so this patch removes the one in the .c
> file and keeps the inline version.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Thanks Arnd, I will queue this up.
> diff --git a/arch/arm/mach-shmobile/platsmp-apmu.c b/arch/arm/mach-shmobile/platsmp-apmu.c
> index a05b16d..2c06810 100644
> --- a/arch/arm/mach-shmobile/platsmp-apmu.c
> +++ b/arch/arm/mach-shmobile/platsmp-apmu.c
> @@ -244,6 +244,4 @@ void __init shmobile_smp_apmu_suspend_init(void)
> {
> shmobile_suspend_ops.enter = shmobile_smp_apmu_enter_suspend;
> }
> -#else
> -void shmobile_smp_apmu_suspend_init(void) {}
> #endif
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-07-06 14:32 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-07-03 14:08 ARM: shmobile: fix shmobile_smp_apmu_suspend_init build failure for !SUSPEND Arnd Bergmann
2014-07-06 14:32 ` Simon Horman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).