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

Commit d89b3e19 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 push fixes a build problem with img-hash under non-standard
  configurations and a serious regression with sha512_ssse3 which can
  lead to boot failures"

* git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
  crypto: img-hash - CRYPTO_DEV_IMGTEC_HASH should depend on HAS_DMA
  crypto: x86/sha512_ssse3 - fixup for asm function prototype change
parents 78d42567 8c98ebd7

arch/x86/crypto/sha512-avx2-asm.S

+1 −1
Original line number Original line Diff line number Diff line
@@ -79,7 +79,7 @@ NUM_BLKS = %rdx 
c           = %rcx

c           = %rcx

d           = %r8

d           = %r8

e           = %rdx

e           = %rdx

y3          = %rdi

y3          = %rsi





TBL   = %rbp

TBL   = %rbp

drivers/crypto/Kconfig

+2 −1
Original line number Original line Diff line number Diff line
@@ -446,8 +446,9 @@ config CRYPTO_DEV_VMX 
source "drivers/crypto/vmx/Kconfig"

source "drivers/crypto/vmx/Kconfig"





config CRYPTO_DEV_IMGTEC_HASH

config CRYPTO_DEV_IMGTEC_HASH

	depends on MIPS || COMPILE_TEST

	tristate "Imagination Technologies hardware hash accelerator"

	tristate "Imagination Technologies hardware hash accelerator"

	depends on MIPS || COMPILE_TEST

	depends on HAS_DMA

	select CRYPTO_ALGAPI

	select CRYPTO_ALGAPI

	select CRYPTO_MD5

	select CRYPTO_MD5

	select CRYPTO_SHA1

	select CRYPTO_SHA1