diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2015-05-28 05:16:41 +0200 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2015-05-28 05:16:41 +0200 |
| commit | 6d7e3d89954af773c70948a54cfa2aaa15907c1c (patch) | |
| tree | 6908f5e0e1af7294c00dc4e06ed583ef62f594df /arch/x86/crypto/sha512-avx2-asm.S | |
| parent | crypto: ccp - Remove unused structure field (diff) | |
| parent | crypto: algif_aead - Disable AEAD user-space for now (diff) | |
| download | linux-6d7e3d89954af773c70948a54cfa2aaa15907c1c.tar.xz linux-6d7e3d89954af773c70948a54cfa2aaa15907c1c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Merge the crypto tree for 4.1 to pull in the changeset that disables
algif_aead.
Diffstat (limited to 'arch/x86/crypto/sha512-avx2-asm.S')
| -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 |