diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-26 13:51:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-26 13:51:05 -0700 |
| commit | d89b3e19ef98a8d3b81a9f8a62c6ac89fd00412e (patch) | |
| tree | 0cb5687b3b32f0e08e42ed8b4a9b55fffdf96c30 /arch | |
| parent | 78d425677217b655ed36c492a070b5002832fc73 (diff) | |
| parent | 8c98ebd7a6ff6ef352bb4c5516a8849b40b5ef6b (diff) | |
| download | blackbird-obmc-linux-d89b3e19ef98a8d3b81a9f8a62c6ac89fd00412e.tar.gz blackbird-obmc-linux-d89b3e19ef98a8d3b81a9f8a62c6ac89fd00412e.zip | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/crypto/sha512-avx2-asm.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/crypto/sha512-avx2-asm.S b/arch/x86/crypto/sha512-avx2-asm.S index a4771dcd1fcf..1f20b35d8573 100644 --- a/arch/x86/crypto/sha512-avx2-asm.S +++ b/arch/x86/crypto/sha512-avx2-asm.S @@ -79,7 +79,7 @@ NUM_BLKS = %rdx c = %rcx d = %r8 e = %rdx -y3 = %rdi +y3 = %rsi TBL = %rbp |
