aboutsummaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorAndy Lutomirski <luto@mit.edu>2011-05-16 15:12:47 +1000
committerHerbert Xu <herbert@gondor.apana.org.au>2011-05-16 15:12:47 +1000
commitb23b64516500df6b70fcafb820970f18538252cf (patch)
treeaba2a9ac7384c4d4b64601bd1969dca703b43b52 /crypto
parent6ef84509f3d439ed2d43ea40080643efec37f54f (diff)
downloadkernel_samsung_espresso10-b23b64516500df6b70fcafb820970f18538252cf.zip
kernel_samsung_espresso10-b23b64516500df6b70fcafb820970f18538252cf.tar.gz
kernel_samsung_espresso10-b23b64516500df6b70fcafb820970f18538252cf.tar.bz2
crypto: aesni-intel - Merge with fpu.ko
Loading fpu without aesni-intel does nothing. Loading aesni-intel without fpu causes modes like xts to fail. (Unloading aesni-intel will restore those modes.) One solution would be to make aesni-intel depend on fpu, but it seems cleaner to just combine the modules. This is probably responsible for bugs like: https://bugzilla.redhat.com/show_bug.cgi?id=589390 Signed-off-by: Andy Lutomirski <luto@mit.edu> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/Kconfig6
1 files changed, 0 insertions, 6 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig
index 4b7cb0e..87b22ca 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -264,11 +264,6 @@ config CRYPTO_XTS
key size 256, 384 or 512 bits. This implementation currently
can't handle a sectorsize which is not a multiple of 16 bytes.
-config CRYPTO_FPU
- tristate
- select CRYPTO_BLKCIPHER
- select CRYPTO_MANAGER
-
comment "Hash modes"
config CRYPTO_HMAC
@@ -543,7 +538,6 @@ config CRYPTO_AES_NI_INTEL
select CRYPTO_AES_586 if !64BIT
select CRYPTO_CRYPTD
select CRYPTO_ALGAPI
- select CRYPTO_FPU
help
Use Intel AES-NI instructions for AES algorithm.