diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-10 08:39:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-10-10 08:39:00 -0700 |
| commit | fb20da6af705597cefcf05fc99e48d5c066dbdff (patch) | |
| tree | c54f72c7000e48e2705a79ab7970c1aa28812e04 /arch | |
| parent | f8779876d4a79d243870a5b5d60009e4ec6f22f4 (diff) | |
| parent | f703964fc66804e6049f2670fc11045aa8359b1a (diff) | |
| download | linux-fb20da6af705597cefcf05fc99e48d5c066dbdff.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:
"Fix build issues in arm/aes-ce"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: arm/aes-ce - add dependency on AES library
crypto: arm/aes-ce - build for v8 architecture explicitly
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/crypto/Kconfig | 1 | ||||
| -rw-r--r-- | arch/arm/crypto/aes-ce-core.S | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/crypto/Kconfig b/arch/arm/crypto/Kconfig index b24df84a1d7a..043b0b18bf7e 100644 --- a/arch/arm/crypto/Kconfig +++ b/arch/arm/crypto/Kconfig @@ -98,6 +98,7 @@ config CRYPTO_AES_ARM_CE tristate "Accelerated AES using ARMv8 Crypto Extensions" depends on KERNEL_MODE_NEON select CRYPTO_BLKCIPHER + select CRYPTO_LIB_AES select CRYPTO_SIMD help Use an implementation of AES in CBC, CTR and XTS modes that uses diff --git a/arch/arm/crypto/aes-ce-core.S b/arch/arm/crypto/aes-ce-core.S index b978cdf133af..4d1707388d94 100644 --- a/arch/arm/crypto/aes-ce-core.S +++ b/arch/arm/crypto/aes-ce-core.S @@ -9,6 +9,7 @@ #include <asm/assembler.h> .text + .arch armv8-a .fpu crypto-neon-fp-armv8 .align 3 |