diff options
| author | Olof Johansson <olof@lixom.net> | 2015-10-26 03:44:48 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-10-26 03:44:48 +0300 |
| commit | 44024ce036e9b837b63f84004f1e63f2a277378a (patch) | |
| tree | 975a61b8753f002f9a10211479bb6dbd6a8a69b9 /arch | |
| parent | fa54cda779ce6df60ab5cfcb2088567945c76906 (diff) | |
| parent | 5fcf8d1a0e84792b2bc44922c5d833dab96a9c1e (diff) | |
| download | linux-44024ce036e9b837b63f84004f1e63f2a277378a.tar.xz | |
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: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-at91/pm_suspend.S | 2 |
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} |