diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2020-06-30 12:07:51 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2020-06-30 12:07:51 +0200 |
commit | 775a75f3d61c6fc82bedc5b727784d3cb7089d81 (patch) | |
tree | b2869d8a2378b79448add1f41f01982b7fae82fb /crypto/Kconfig | |
parent | 3278a1722acf54316ac94db3f3a83aed32857edc (diff) | |
parent | d2868ae33ab257f2273d436b38cc390414a9384f (diff) | |
download | linux-crypto-775a75f3d61c6fc82bedc5b727784d3cb7089d81.tar.gz linux-crypto-775a75f3d61c6fc82bedc5b727784d3cb7089d81.zip |
Merge tag 'irqchip-fixes-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent
Pull irqchip fixes from Marc Zyngier:
- Fix atomicity of affinity update in the GIC driver
- Don't sleep in atomic when waiting for a GICv4.1 RD to respond
- Fix a couple of typos in user-visible messages
Diffstat (limited to '')
-rw-r--r-- | crypto/Kconfig | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index c24a4740..091c0a0b 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -316,7 +316,6 @@ config CRYPTO_AEGIS128 config CRYPTO_AEGIS128_SIMD bool "Support SIMD acceleration for AEGIS-128" depends on CRYPTO_AEGIS128 && ((ARM || ARM64) && KERNEL_MODE_NEON) - depends on !ARM || CC_IS_CLANG || GCC_VERSION >= 40800 default y config CRYPTO_AEGIS128_AESNI_SSE2 @@ -370,7 +369,6 @@ config CRYPTO_CFB config CRYPTO_CTR tristate "CTR support" select CRYPTO_SKCIPHER - select CRYPTO_SEQIV select CRYPTO_MANAGER help CTR: Counter mode @@ -1820,7 +1818,7 @@ config CRYPTO_DRBG_HASH config CRYPTO_DRBG_CTR bool "Enable CTR DRBG" select CRYPTO_AES - depends on CRYPTO_CTR + select CRYPTO_CTR help Enable the CTR DRBG variant as defined in NIST SP800-90A. |