diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-09 01:34:53 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-09 01:34:53 -0400 |
| commit | 38a4671cad3f0d277cf48445b49e42a475ebfb6a (patch) | |
| tree | 7348f3dd5f4e1bec39758dcff748a9dcbbf3430c /arch/x86/crypto/sha256-avx-asm.S | |
| parent | d652f7022b359afd5d34fc9fffd71df118521ead (diff) | |
| parent | 317ddd256b9c24b0d78fa8018f80f1e495481a10 (diff) | |
Merge 3.10-rc5 into char-misc-next
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 | |||
| 118 | 118 | ||
| 119 | _INP_END_SIZE = 8 | 119 | _INP_END_SIZE = 8 |
| 120 | _INP_SIZE = 8 | 120 | _INP_SIZE = 8 |
| 121 | _XFER_SIZE = 8 | 121 | _XFER_SIZE = 16 |
| 122 | _XMM_SAVE_SIZE = 0 | 122 | _XMM_SAVE_SIZE = 0 |
| 123 | 123 | ||
| 124 | _INP_END = 0 | 124 | _INP_END = 0 |