summary refs log tree commit diff
path: root/arch/arm/mach-at91
diff options
context:
space:
mode:
authorPatrick Doyle <pdoyle@irobot.com>2015-10-16 12:39:05 +0200
committerAlexandre Belloni <alexandre.belloni@free-electrons.com>2015-10-19 22:58:44 +0200
commit5fcf8d1a0e84792b2bc44922c5d833dab96a9c1e (patch)
tree70d57baea14729553f98ba940673d587bd87b3d8 /arch/arm/mach-at91
parent6f112a08c1ed717a015dae190e289d53085c1bc4 (diff)
downloadlinux-5fcf8d1a0e84792b2bc44922c5d833dab96a9c1e.tar.gz
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+
Diffstat (limited to 'arch/arm/mach-at91')
-rw-r--r--arch/arm/mach-at91/pm_suspend.S2
1 files changed, 2 insertions, 0 deletions
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}