diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-08 11:29:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-08 11:29:14 -0700 |
| commit | 124b99fb8018a7ac45558d8ab249ed758e14e618 (patch) | |
| tree | 6f915acee23e1b0aaefd27755c63c083936e13ef /arch/arm | |
| parent | 70a2dc6abc8af028b0c71af6b3520574ee09e814 (diff) | |
| parent | 221e00d1fce976d8a04ff591a0150caf84e176f8 (diff) | |
| download | linux-124b99fb8018a7ac45558d8ab249ed758e14e618.tar.bz2 | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
- add missing RETs in x86 aegis/morus
- fix build error in arm speck
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: x86 - Add missing RETs
crypto: arm/speck - fix building in Thumb2 mode
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/crypto/speck-neon-core.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/crypto/speck-neon-core.S b/arch/arm/crypto/speck-neon-core.S index 3c1e203e53b9..57caa742016e 100644 --- a/arch/arm/crypto/speck-neon-core.S +++ b/arch/arm/crypto/speck-neon-core.S @@ -272,9 +272,11 @@ * Allocate stack space to store 128 bytes worth of tweaks. For * performance, this space is aligned to a 16-byte boundary so that we * can use the load/store instructions that declare 16-byte alignment. + * For Thumb2 compatibility, don't do the 'bic' directly on 'sp'. */ - sub sp, #128 - bic sp, #0xf + sub r12, sp, #128 + bic r12, #0xf + mov sp, r12 .if \n == 64 // Load first tweak |