diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-10 16:25:50 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-10 16:25:50 -0400 |
commit | 822b4b6fe38bbe23f6bc036288ecd934eef30be5 (patch) | |
tree | 56a0b52b4cf0fc35927bdab91980ab648dd79862 | |
parent | ae75d84f3e29a1832b35cd342ac471bbf30bce4c (diff) | |
parent | 68be0b1ae355c6deb11326df6758f80154f44cf0 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"This fixes a build problem in sahara and temporarily disables two new
optimisations because of performance regressions until a permanent fix
is ready"
* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: sahara - fix building as module
crypto: blowfish - disable AVX2 implementation
crypto: twofish - disable AVX2 implementation
-rw-r--r-- | crypto/Kconfig | 2 | ||||
-rw-r--r-- | drivers/crypto/sahara.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/crypto/Kconfig b/crypto/Kconfig index 622d8a48cbe9..bf8148e74e73 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig | |||
@@ -823,6 +823,7 @@ config CRYPTO_BLOWFISH_X86_64 | |||
823 | config CRYPTO_BLOWFISH_AVX2_X86_64 | 823 | config CRYPTO_BLOWFISH_AVX2_X86_64 |
824 | tristate "Blowfish cipher algorithm (x86_64/AVX2)" | 824 | tristate "Blowfish cipher algorithm (x86_64/AVX2)" |
825 | depends on X86 && 64BIT | 825 | depends on X86 && 64BIT |
826 | depends on BROKEN | ||
826 | select CRYPTO_ALGAPI | 827 | select CRYPTO_ALGAPI |
827 | select CRYPTO_CRYPTD | 828 | select CRYPTO_CRYPTD |
828 | select CRYPTO_ABLK_HELPER_X86 | 829 | select CRYPTO_ABLK_HELPER_X86 |
@@ -1299,6 +1300,7 @@ config CRYPTO_TWOFISH_AVX_X86_64 | |||
1299 | config CRYPTO_TWOFISH_AVX2_X86_64 | 1300 | config CRYPTO_TWOFISH_AVX2_X86_64 |
1300 | tristate "Twofish cipher algorithm (x86_64/AVX2)" | 1301 | tristate "Twofish cipher algorithm (x86_64/AVX2)" |
1301 | depends on X86 && 64BIT | 1302 | depends on X86 && 64BIT |
1303 | depends on BROKEN | ||
1302 | select CRYPTO_ALGAPI | 1304 | select CRYPTO_ALGAPI |
1303 | select CRYPTO_CRYPTD | 1305 | select CRYPTO_CRYPTD |
1304 | select CRYPTO_ABLK_HELPER_X86 | 1306 | select CRYPTO_ABLK_HELPER_X86 |
diff --git a/drivers/crypto/sahara.c b/drivers/crypto/sahara.c index a97bb6c1596c..c3dc1c04a5df 100644 --- a/drivers/crypto/sahara.c +++ b/drivers/crypto/sahara.c | |||
@@ -863,7 +863,7 @@ static struct of_device_id sahara_dt_ids[] = { | |||
863 | { .compatible = "fsl,imx27-sahara" }, | 863 | { .compatible = "fsl,imx27-sahara" }, |
864 | { /* sentinel */ } | 864 | { /* sentinel */ } |
865 | }; | 865 | }; |
866 | MODULE_DEVICE_TABLE(platform, sahara_dt_ids); | 866 | MODULE_DEVICE_TABLE(of, sahara_dt_ids); |
867 | 867 | ||
868 | static int sahara_probe(struct platform_device *pdev) | 868 | static int sahara_probe(struct platform_device *pdev) |
869 | { | 869 | { |