Commit 44024ce0 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'at91-ab-soc2' of...

Merge tag 'at91-ab-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/soc

More SoC changes for 4.4:
 - a great fix for PM/suspend/resume

* tag 'at91-ab-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: at91: pm: at91_pm_suspend_in_sram() must be 8-byte aligned
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents fa54cda7 5fcf8d1a
...@@ -80,6 +80,8 @@ tmp2 .req r5 ...@@ -80,6 +80,8 @@ tmp2 .req r5
* @r2: base address of second SDRAM Controller or 0 if not present * @r2: base address of second SDRAM Controller or 0 if not present
* @r3: pm information * @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) ENTRY(at91_pm_suspend_in_sram)
/* Save registers on stack */ /* Save registers on stack */
stmfd sp!, {r4 - r12, lr} stmfd sp!, {r4 - r12, lr}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment