diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-07-11 11:08:35 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-07-11 11:08:35 -0400 |
| commit | 80c1834fc86c2bbacb54a8fc3c04a8b0066b0996 (patch) | |
| tree | 8200248706960af8b779e9144f5b51c670602228 /arch/x86/crypto/aesni-intel_asm.S | |
| parent | 22076c7712be29a602de45b1c573f31adbd428a9 (diff) | |
| parent | bd0a521e88aa7a06ae7aabaed7ae196ed4ad867a (diff) | |
Merge tag 'v3.5-rc6' into irqdomain/next
Linux 3.5-rc6
Diffstat (limited to 'arch/x86/crypto/aesni-intel_asm.S')
| -rw-r--r-- | arch/x86/crypto/aesni-intel_asm.S | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S index be6d9e365a80..3470624d7835 100644 --- a/arch/x86/crypto/aesni-intel_asm.S +++ b/arch/x86/crypto/aesni-intel_asm.S | |||
| @@ -2460,10 +2460,12 @@ ENTRY(aesni_cbc_dec) | |||
| 2460 | pxor IN3, STATE4 | 2460 | pxor IN3, STATE4 |
| 2461 | movaps IN4, IV | 2461 | movaps IN4, IV |
| 2462 | #else | 2462 | #else |
| 2463 | pxor (INP), STATE2 | ||
| 2464 | pxor 0x10(INP), STATE3 | ||
| 2465 | pxor IN1, STATE4 | 2463 | pxor IN1, STATE4 |
| 2466 | movaps IN2, IV | 2464 | movaps IN2, IV |
| 2465 | movups (INP), IN1 | ||
| 2466 | pxor IN1, STATE2 | ||
| 2467 | movups 0x10(INP), IN2 | ||
| 2468 | pxor IN2, STATE3 | ||
| 2467 | #endif | 2469 | #endif |
| 2468 | movups STATE1, (OUTP) | 2470 | movups STATE1, (OUTP) |
| 2469 | movups STATE2, 0x10(OUTP) | 2471 | movups STATE2, 0x10(OUTP) |