* [PATCH] ARM: mxs: stub out mxs_pm_init for !CONFIG_PM
@ 2013-06-21 23:30 Arnd Bergmann
2013-06-24 7:04 ` Shawn Guo
2013-09-29 22:50 ` Marek Vasut
0 siblings, 2 replies; 5+ messages in thread
From: Arnd Bergmann @ 2013-06-21 23:30 UTC (permalink / raw)
To: linux-arm-kernel
When building a kernel without CONFIG_PM, we get a link
error from referencing mxs_pm_init in the machine
descriptor. This defines a macro to NULL for that case.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Shawn Guo <shawn.guo@linaro.org>
diff --git a/arch/arm/mach-mxs/pm.h b/arch/arm/mach-mxs/pm.h
index f57e7cd..09d77b0 100644
--- a/arch/arm/mach-mxs/pm.h
+++ b/arch/arm/mach-mxs/pm.h
@@ -9,6 +9,10 @@
#ifndef __ARCH_MXS_PM_H
#define __ARCH_MXS_PM_H
+#ifdef CONFIG_PM
void mxs_pm_init(void);
+#else
+#define mxs_pm_init NULL
+#endif
#endif
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] ARM: mxs: stub out mxs_pm_init for !CONFIG_PM
2013-06-21 23:30 [PATCH] ARM: mxs: stub out mxs_pm_init for !CONFIG_PM Arnd Bergmann
@ 2013-06-24 7:04 ` Shawn Guo
2013-09-29 22:50 ` Marek Vasut
1 sibling, 0 replies; 5+ messages in thread
From: Shawn Guo @ 2013-06-24 7:04 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Jun 22, 2013 at 01:30:17AM +0200, Arnd Bergmann wrote:
> When building a kernel without CONFIG_PM, we get a link
> error from referencing mxs_pm_init in the machine
> descriptor. This defines a macro to NULL for that case.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
>
> diff --git a/arch/arm/mach-mxs/pm.h b/arch/arm/mach-mxs/pm.h
> index f57e7cd..09d77b0 100644
> --- a/arch/arm/mach-mxs/pm.h
> +++ b/arch/arm/mach-mxs/pm.h
> @@ -9,6 +9,10 @@
> #ifndef __ARCH_MXS_PM_H
> #define __ARCH_MXS_PM_H
>
> +#ifdef CONFIG_PM
> void mxs_pm_init(void);
> +#else
> +#define mxs_pm_init NULL
> +#endif
>
> #endif
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] ARM: mxs: stub out mxs_pm_init for !CONFIG_PM
2013-06-21 23:30 [PATCH] ARM: mxs: stub out mxs_pm_init for !CONFIG_PM Arnd Bergmann
2013-06-24 7:04 ` Shawn Guo
@ 2013-09-29 22:50 ` Marek Vasut
2013-09-30 1:26 ` Fabio Estevam
1 sibling, 1 reply; 5+ messages in thread
From: Marek Vasut @ 2013-09-29 22:50 UTC (permalink / raw)
To: linux-arm-kernel
Hello Greg,
> When building a kernel without CONFIG_PM, we get a link
> error from referencing mxs_pm_init in the machine
> descriptor. This defines a macro to NULL for that case.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Shawn Guo <shawn.guo@linaro.org>
>
> diff --git a/arch/arm/mach-mxs/pm.h b/arch/arm/mach-mxs/pm.h
> index f57e7cd..09d77b0 100644
> --- a/arch/arm/mach-mxs/pm.h
> +++ b/arch/arm/mach-mxs/pm.h
> @@ -9,6 +9,10 @@
> #ifndef __ARCH_MXS_PM_H
> #define __ARCH_MXS_PM_H
>
> +#ifdef CONFIG_PM
> void mxs_pm_init(void);
> +#else
> +#define mxs_pm_init NULL
> +#endif
>
> #endif
Can you please pick this patch for 3.10 stable? It fixes a build issue on
i.MX23/i.MX28 in case CONFIG_PM is not enabled.
Patchwork link: http://patchwork.ozlabs.org/patch/253324/
Upstream GIT:
http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/arch/arm/mach-
mxs/pm.h?id=7a9caf59f60e55a8caf96f856713bd0ef0cc25a7
Thank you!
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-10-01 4:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-21 23:30 [PATCH] ARM: mxs: stub out mxs_pm_init for !CONFIG_PM Arnd Bergmann
2013-06-24 7:04 ` Shawn Guo
2013-09-29 22:50 ` Marek Vasut
2013-09-30 1:26 ` Fabio Estevam
2013-10-01 4:14 ` Marek Vasut
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).