diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-11 09:28:13 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-11 09:28:13 -0800 |
| commit | a6b6e6165057f55c4cd35780520275d3c46e4c82 (patch) | |
| tree | 37dee7c89b8428fa5ba439d7990324dd645e7f76 /arch | |
| parent | 807b93e995d1f44dd94b4ec50d3a864e72296416 (diff) | |
| parent | 07825f0acd85dd8b7481d5ef0eb024b05364d892 (diff) | |
| download | linux-a6b6e6165057f55c4cd35780520275d3c46e4c82.tar.gz linux-a6b6e6165057f55c4cd35780520275d3c46e4c82.tar.bz2 linux-a6b6e6165057f55c4cd35780520275d3c46e4c82.zip | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fix from Herbert Xu:
"This fixes a regression in aesni that renders it useless if it's
built-in with a modular pcbc configuration"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: aesni - Fix failure when built-in with modular pcbc
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/crypto/aesni-intel_glue.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c index 31c34ee131f3..6ef688a1ef3e 100644 --- a/arch/x86/crypto/aesni-intel_glue.c +++ b/arch/x86/crypto/aesni-intel_glue.c @@ -1020,7 +1020,8 @@ struct { const char *basename; struct simd_skcipher_alg *simd; } aesni_simd_skciphers2[] = { -#if IS_ENABLED(CONFIG_CRYPTO_PCBC) +#if (defined(MODULE) && IS_ENABLED(CONFIG_CRYPTO_PCBC)) || \ + IS_BUILTIN(CONFIG_CRYPTO_PCBC) { .algname = "pcbc(aes)", .drvname = "pcbc-aes-aesni", |