p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Linus Torvalds 2015-04-26 13:51:05 -07:00
parent 78d4256772 8c98ebd7a6
commit d89b3e19ef
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/crypto/sha512-avx2-asm.S
View File

@ -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

3
drivers/crypto/Kconfig
View File

@ -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