Skip to contentSkip to conversation

ARM: mxs: Fix mxs_pm_init if CONFIG_PM undefined

PATCH New Marek Vasut 2 participants 3 messages Jul 1, 2013

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

Marek Vasut

author
#0 lore raw

PATCH 1/1 ARM: mxs: Fix mxs_pm_init if CONFIG_PM undefined

In case the CONFIG_PM is not defined, the mxs_pm_init() from pm.c is not compiled and therefore mxs_pm_init() is not available. Make sure that the kernel builds even if CONFIG_PM is not defined.

Signed-off-by Marek Vasut <[email protected]>
Cc Shawn Guo <[email protected]>
---
 arch/arm/mach-mxs/pm.h |    4 ++++
 1 file changed, 4 insertions(+)
arch/arm/mach-mxs/pm.h +4 -0
index f57e7cd..9f1dcf0 100644
@@ -9,6 +9,10 @@
 #ifndef __ARCH_MXS_PM_H
 #define __ARCH_MXS_PM_H
 
+#ifdef CONFIG_PM
 void mxs_pm_init(void);
+#else
+static inline void mxs_pm_init(void) {}
+#endif
 
 #endif
Signature · 1 line
1.7.10.4
reviewer
#1 lore raw

PATCH 1/1 ARM: mxs: Fix mxs_pm_init if CONFIG_PM undefined

Quoted 6 lines · Marek Vasut

In case the CONFIG_PM is not defined, the mxs_pm_init() from pm.c is not compiled and therefore mxs_pm_init() is not available. Make sure that the kernel builds even if CONFIG_PM is not defined.

Signed-off-by Marek Vasut <[email protected]>
Cc Shawn Guo <[email protected]>

Arnd has already sent a fix for this:
http://www.spinics.net/lists/arm-kernel/msg254288.html

author
#2 lore raw

PATCH 1/1 ARM: mxs: Fix mxs_pm_init if CONFIG_PM undefined

Dear Fabio Estevam,

Quoted 10 lines · Marek Vasut
Quoted 6 lines

In case the CONFIG_PM is not defined, the mxs_pm_init() from pm.c is not compiled and therefore mxs_pm_init() is not available. Make sure that the kernel builds even if CONFIG_PM is not defined.

Signed-off-by Marek Vasut <[email protected]>
Cc Shawn Guo <[email protected]>

Arnd has already sent a fix for this:
http://www.spinics.net/lists/arm-kernel/msg254288.html

Ok, thanks. Will this hit 3.10 in any subsequent update?

Best regards,
Marek Vasut