Skip to contentSkip to conversation

ARM: mxs: stub out mxs_pm_init for !CONFIG_PM

PATCH New Arnd Bergmann 4 participants 5 messages Jun 21, 2013 – Oct 1, 2013

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm i.MX and Layerscape
lore
Share & tools
lore

Arnd Bergmann

author
#0 lore raw

PATCH 1/1 ARM: mxs: stub out mxs_pm_init for !CONFIG_PM

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 <[email protected]>
Cc Shawn Guo <[email protected]>
arch/arm/mach-mxs/pm.h +4 -0
index f57e7cd..09d77b0 100644
@@ -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
#1 lore raw

PATCH 1/1 ARM: mxs: stub out mxs_pm_init for !CONFIG_PM

Quoted 6 lines · Arnd Bergmann

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 <[email protected]>
Cc Shawn Guo <[email protected]>
Acked-by Shawn Guo <[email protected]>
Quoted 17 lines
arch/arm/mach-mxs/pm.h +4 -0
index f57e7cd..09d77b0 100644
@@ -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
#2 lore raw

PATCH 1/1 ARM: mxs: stub out mxs_pm_init for !CONFIG_PM

In reply to Arnd Bergmann

Hello Greg,

Quoted 12 lines

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 <[email protected]>
Cc Shawn Guo <[email protected]>
arch/arm/mach-mxs/pm.h +0 -0
index f57e7cd..09d77b0 100644

arch/arm/mach-mxs/pm.h line 18

Quoted 10 lines
arch/arm/mach-mxs/pm.h +4 -0
@@ -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

reviewer
#3 lore raw

PATCH 1/1 ARM: mxs: stub out mxs_pm_init for !CONFIG_PM

Hi Marek,

Quoted 10 lines · Marek Vasut

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

#4 lore raw

PATCH 1/1 ARM: mxs: stub out mxs_pm_init for !CONFIG_PM

Dear Fabio Estevam,

Quoted 12 lines

Hi Marek,

Quoted 9 lines · Marek Vasut

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

Quoted 5 lines
Quoted 1 line

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