@@ -96,10 +96,12 @@ int imx_cpu_kill(unsigned int cpu);
void imx53_suspend(void __iomem *ocram_vbase);
extern const u32 imx53_suspend_sz;
void imx6_suspend(void __iomem *ocram_vbase);
+extern const u32 imx6_suspend_sz;
#else
static inline void imx53_suspend(void __iomem *ocram_vbase) {}
static const u32 imx53_suspend_sz;
static inline void imx6_suspend(void __iomem *ocram_vbase) {}
+static const u32 imx6_suspend_sz;
#endif
void v7_cpu_resume(void);
@@ -570,7 +570,7 @@ static int __init imx6q_suspend_init(const struct imx6_pm_socdata *socdata)
imx6_suspend_in_ocram_fn = fncpy(
suspend_ocram_base + sizeof(*pm_info),
&imx6_suspend,
- MX6Q_SUSPEND_OCRAM_SIZE - sizeof(*pm_info));
+ imx6_suspend_sz);
__arm_iomem_set_ro(suspend_ocram_base, MX6Q_SUSPEND_OCRAM_SIZE);
@@ -328,3 +328,6 @@ resume:
ret lr
ENDPROC(imx6_suspend)
+
+ENTRY(imx6_suspend_sz)
+ .word . - imx6_suspend
Use the size of the imx6_suspend() function for fncpy() instead of the hard coded size of 'MX6Q_SUSPEND_OCRAM_SIZE - sizeof(*pm_info)'. Only need to copy the size of the imx6_suspend() function and not extra code space beyond the function. Cc: Russell King <linux@armlinux.org.uk> Cc: Shawn Guo <shawnguo@kernel.org> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Pengutronix Kernel Team <kernel@pengutronix.de> Cc: Fabio Estevam <festevam@gmail.com> Cc: NXP Linux Team <linux-imx@nxp.com> Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org Fixes: df595746fa69 ("ARM: imx: add suspend in ocram support for i.mx6q") Signed-off-by: Dean Gehnert <deang@tpi.com> --- arch/arm/mach-imx/common.h | 2 ++ arch/arm/mach-imx/pm-imx6.c | 2 +- arch/arm/mach-imx/suspend-imx6.S | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-)