Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 822b4b6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents ae75d84f 68be0b1a

crypto/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -823,6 +823,7 @@ config CRYPTO_BLOWFISH_X86_64 
config CRYPTO_BLOWFISH_AVX2_X86_64

	tristate "Blowfish cipher algorithm (x86_64/AVX2)"

	depends on X86 && 64BIT

	depends on BROKEN

	select CRYPTO_ALGAPI

	select CRYPTO_CRYPTD

	select CRYPTO_ABLK_HELPER_X86
@@ -1299,6 +1300,7 @@ config CRYPTO_TWOFISH_AVX_X86_64 
config CRYPTO_TWOFISH_AVX2_X86_64

	tristate "Twofish cipher algorithm (x86_64/AVX2)"

	depends on X86 && 64BIT

	depends on BROKEN

	select CRYPTO_ALGAPI

	select CRYPTO_CRYPTD

	select CRYPTO_ABLK_HELPER_X86

drivers/crypto/sahara.c

+1 −1
Original line number Diff line number Diff line
@@ -863,7 +863,7 @@ static struct of_device_id sahara_dt_ids[] = { 
	{ .compatible = "fsl,imx27-sahara" },

	{ /* sentinel */ }

};

MODULE_DEVICE_TABLE(platform, sahara_dt_ids);

MODULE_DEVICE_TABLE(of, sahara_dt_ids);



static int sahara_probe(struct platform_device *pdev)

{