Patchwork ARM: mxs: stub out mxs_pm_init for !CONFIG_PM

login
register
mail settings
Submitter Arnd Bergmann
Date June 21, 2013, 11:30 p.m.
Message ID <2964094.prhBouhISv@wuerfel>
Download mbox | patch
Permalink /patch/253324/
State New
Headers show

Comments

Arnd Bergmann - June 21, 2013, 11:30 p.m.
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>
Shawn Guo - June 24, 2013, 7:04 a.m.
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
>
Marek Vasut - Sept. 29, 2013, 10:50 p.m.
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
Fabio Estevam - Sept. 30, 2013, 1:26 a.m.
Hi Marek,

On Sun, Sep 29, 2013 at 7:50 PM, Marek Vasut <marex@denx.de> wrote:

> 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!

Just send the patch following this document so that it can be included
in stable:
Documentation/stable_kernel_rules.txt

Regards,

Fabio Estevam
Marek Vasut - Oct. 1, 2013, 4:14 a.m.
Dear Fabio Estevam,

> Hi Marek,
> 
> On Sun, Sep 29, 2013 at 7:50 PM, Marek Vasut <marex@denx.de> wrote:
> > 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/arc
> > h/arm/mach- mxs/pm.h?id=7a9caf59f60e55a8caf96f856713bd0ef0cc25a7
> > 
> > Thank you!
> 
> Just send the patch following this document so that it can be included
> in stable:
> Documentation/stable_kernel_rules.txt

Fixed now (I hope). Thanks!

Best regards,
Marek Vasut

Patch

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