summaryrefslogtreecommitdiffstats
path: root/arch/x86/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2015-05-28 11:16:41 +0800
committerHerbert Xu <herbert@gondor.apana.org.au>2015-05-28 11:16:41 +0800
commit6d7e3d89954af773c70948a54cfa2aaa15907c1c (patch)
tree6908f5e0e1af7294c00dc4e06ed583ef62f594df /arch/x86/crypto
parentd725332208ef13241fc435eece790c9d0ea16a4e (diff)
parentf858c7bcca8c20761a20593439fe998b4b67e86b (diff)
downloadop-kernel-dev-6d7e3d89954af773c70948a54cfa2aaa15907c1c.zip
op-kernel-dev-6d7e3d89954af773c70948a54cfa2aaa15907c1c.tar.gz
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')
-rw-r--r--arch/x86/crypto/sha512-avx2-asm.S2
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 a4771dc..1f20b35 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
OpenPOWER on IntegriCloud