diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-10-29 10:39:03 +0100 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-10-29 10:39:03 +0100 |
| commit | 930df54af2c26330091a4cc8bc3f2d8c3c55255a (patch) | |
| tree | b7f43e12d94a0b1c4cfd589979d7be00bf5823de /arch/arm | |
| parent | 5ccea17e1ab306e5b4548074d545b7d8f93d8119 (diff) | |
| parent | 5fcf8d1a0e84792b2bc44922c5d833dab96a9c1e (diff) | |
Merge tag 'at91-ab-soc2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into at91-next
More SoC changes for 4.4:
- a great fix for PM/suspend/resume
Diffstat (limited to 'arch/arm')
| -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} |