diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-19 20:31:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-19 20:31:02 -0800 |
| commit | f01af9f85855e38fbd601e033a8eac204cc4cc1c (patch) | |
| tree | 106b1b24dd17a0c6cb9fdda35a249f429310b025 /arch/sparc/crypto/des_asm.S | |
| parent | 9eb127cc04c4005c8c0708ce92146d91da862b42 (diff) | |
| parent | 62ba63dc892cf836ecb9ce4fdb7644d45c95070b (diff) | |
| download | talos-op-linux-f01af9f85855e38fbd601e033a8eac204cc4cc1c.tar.gz talos-op-linux-f01af9f85855e38fbd601e033a8eac204cc4cc1c.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc
Pull sparc fixes from David Miller:
"Please pull to get these sparc AES/DES/CAMELLIA crypto bug fixes as
well as an addition of a pte_accessible() define for sparc64 and a
hugetlb fix from Dave Kleikamp."
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in CAMELLIA code.
sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in DES code.
sparc64: Fix ECB looping constructs in AES code.
sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in AES code.
sparc64: Fix AES ctr mode block size.
sparc64: Fix unrolled AES 256-bit key loops.
sparc64: Define pte_accessible()
sparc: huge_ptep_set_* functions need to call set_huge_pte_at()
Diffstat (limited to 'arch/sparc/crypto/des_asm.S')
| -rw-r--r-- | arch/sparc/crypto/des_asm.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc/crypto/des_asm.S b/arch/sparc/crypto/des_asm.S index 30b6e90b28b2..b5c8fc269b5f 100644 --- a/arch/sparc/crypto/des_asm.S +++ b/arch/sparc/crypto/des_asm.S @@ -376,6 +376,7 @@ ENTRY(des3_ede_sparc64_ecb_crypt) 1: ldd [%o1 + 0x00], %f60 DES3_LOOP_BODY(60) std %f60, [%o2 + 0x00] + add %o1, 0x08, %o1 subcc %o3, 0x08, %o3 bne,pt %icc, 1b add %o2, 0x08, %o2 |
