diff options
| author | David S. Miller <davem@davemloft.net> | 2013-06-06 00:56:43 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-06-06 01:37:30 +0200 |
| commit | 6bc19fb82d4c05a9eee19d6d2aab2ce26e499ec2 (patch) | |
| tree | 8b049ef383307f5dae91b5c9cf78dbfb9b74a4d1 /arch/x86/crypto/sha256-avx-asm.S | |
| parent | net: sun4i-emac: Staticize local symbols (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-6bc19fb82d4c05a9eee19d6d2aab2ce26e499ec2.tar.xz linux-6bc19fb82d4c05a9eee19d6d2aab2ce26e499ec2.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Merge 'net' bug fixes into 'net-next' as we have patches
that will build on top of them.
This merge commit includes a change from Emil Goode
(emilgoode@gmail.com) that fixes a warning that would
have been introduced by this merge. Specifically it
fixes the pingv6_ops method ipv6_chk_addr() to add a
"const" to the "struct net_device *dev" argument and
likewise update the dummy_ipv6_chk_addr() declaration.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/x86/crypto/sha256-avx-asm.S')
| -rw-r--r-- | arch/x86/crypto/sha256-avx-asm.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/crypto/sha256-avx-asm.S b/arch/x86/crypto/sha256-avx-asm.S index 56610c4bf31b..642f15687a0a 100644 --- a/arch/x86/crypto/sha256-avx-asm.S +++ b/arch/x86/crypto/sha256-avx-asm.S @@ -118,7 +118,7 @@ y2 = %r15d _INP_END_SIZE = 8 _INP_SIZE = 8 -_XFER_SIZE = 8 +_XFER_SIZE = 16 _XMM_SAVE_SIZE = 0 _INP_END = 0 |