From: Patrick Doyle <pdoyle@irobot.com>
Date: Fri, 16 Oct 2015 10:39:05 +0000 (+0200)
Subject: ARM: at91: pm: at91_pm_suspend_in_sram() must be 8-byte aligned
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5fcf8d1a0e84792b2bc44922c5d833dab96a9c1e;p=openwrt%2Fstaging%2Fblogic.git

ARM: at91: pm: at91_pm_suspend_in_sram() must be 8-byte aligned

fncpy() requires that the source and the destination are both 8-byte
aligned.

Signed-off-by: Patrick Doyle <pdoyle@irobot.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Fixes: d94e688cae56 ("ARM: at91/pm: move the copying the sram function to the sram initialization phase")
Cc: <stable@vger.kernel.org> # 4.1+
---

diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S
index 0d95f488b47a..a25defda3d22 100644
--- a/arch/arm/mach-at91/pm_suspend.S
+++ b/arch/arm/mach-at91/pm_suspend.S
@@ -80,6 +80,8 @@ tmp2	.req	r5
  *	@r2: base address of second SDRAM Controller or 0 if not present
  *	@r3: pm information
  */
+/* at91_pm_suspend_in_sram must be 8-byte aligned per the requirements of fncpy() */
+	.align 3
 ENTRY(at91_pm_suspend_in_sram)
 	/* Save registers on stack */
 	stmfd	sp!, {r4 - r12, lr}