diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-06-22 04:24:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-06-22 04:24:43 -0400 |
| commit | b7f797cb600fa88de04903be4df3c8a6cb1cb35c (patch) | |
| tree | fb34c6081f4184cf336d3df2bd0d1c5de98916c1 /arch/x86/crypto/aesni-intel_asm.S | |
| parent | 99bd0c0fc4b04da54cb311953ef9489931c19c63 (diff) | |
| parent | 0017c869ddcb73069905d09f9e98e68627466237 (diff) | |
Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu into x86/urgent
Diffstat (limited to 'arch/x86/crypto/aesni-intel_asm.S')
| -rw-r--r-- | arch/x86/crypto/aesni-intel_asm.S | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/crypto/aesni-intel_asm.S b/arch/x86/crypto/aesni-intel_asm.S index caba99601703..eb0566e83319 100644 --- a/arch/x86/crypto/aesni-intel_asm.S +++ b/arch/x86/crypto/aesni-intel_asm.S | |||
| @@ -845,7 +845,7 @@ ENTRY(aesni_cbc_enc) | |||
| 845 | */ | 845 | */ |
| 846 | ENTRY(aesni_cbc_dec) | 846 | ENTRY(aesni_cbc_dec) |
| 847 | cmp $16, LEN | 847 | cmp $16, LEN |
| 848 | jb .Lcbc_dec_ret | 848 | jb .Lcbc_dec_just_ret |
| 849 | mov 480(KEYP), KLEN | 849 | mov 480(KEYP), KLEN |
| 850 | add $240, KEYP | 850 | add $240, KEYP |
| 851 | movups (IVP), IV | 851 | movups (IVP), IV |
| @@ -891,6 +891,7 @@ ENTRY(aesni_cbc_dec) | |||
| 891 | add $16, OUTP | 891 | add $16, OUTP |
| 892 | cmp $16, LEN | 892 | cmp $16, LEN |
| 893 | jge .Lcbc_dec_loop1 | 893 | jge .Lcbc_dec_loop1 |
| 894 | movups IV, (IVP) | ||
| 895 | .Lcbc_dec_ret: | 894 | .Lcbc_dec_ret: |
| 895 | movups IV, (IVP) | ||
| 896 | .Lcbc_dec_just_ret: | ||
| 896 | ret | 897 | ret |