diff options
| author | David S. Miller <davem@davemloft.net> | 2012-12-19 15:44:31 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-12-19 15:44:31 -0800 |
| commit | 62ba63dc892cf836ecb9ce4fdb7644d45c95070b (patch) | |
| tree | 19e67570300545d337d7f3aead6557ef8f194457 /arch/sparc/crypto | |
| parent | b3a37947074fa0a488d6c7ede58125b2278ab4e8 (diff) | |
| download | linux-62ba63dc892cf836ecb9ce4fdb7644d45c95070b.tar.gz linux-62ba63dc892cf836ecb9ce4fdb7644d45c95070b.tar.bz2 linux-62ba63dc892cf836ecb9ce4fdb7644d45c95070b.zip | |
sparc64: Set CRYPTO_TFM_REQ_MAY_SLEEP consistently in CAMELLIA code.
We use the FPU and therefore cannot sleep during the crypto
loops.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/crypto')
| -rw-r--r-- | arch/sparc/crypto/camellia_glue.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/sparc/crypto/camellia_glue.c b/arch/sparc/crypto/camellia_glue.c index 62c89af3fd3f..888f6260b4ec 100644 --- a/arch/sparc/crypto/camellia_glue.c +++ b/arch/sparc/crypto/camellia_glue.c @@ -98,6 +98,7 @@ static int __ecb_crypt(struct blkcipher_desc *desc, blkcipher_walk_init(&walk, dst, src, nbytes); err = blkcipher_walk_virt(desc, &walk); + desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; if (encrypt) key = &ctx->encrypt_key[0]; @@ -160,6 +161,7 @@ static int cbc_encrypt(struct blkcipher_desc *desc, blkcipher_walk_init(&walk, dst, src, nbytes); err = blkcipher_walk_virt(desc, &walk); + desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; key = &ctx->encrypt_key[0]; camellia_sparc64_load_keys(key, ctx->key_len); @@ -198,6 +200,7 @@ static int cbc_decrypt(struct blkcipher_desc *desc, blkcipher_walk_init(&walk, dst, src, nbytes); err = blkcipher_walk_virt(desc, &walk); + desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP; key = &ctx->decrypt_key[0]; camellia_sparc64_load_keys(key, ctx->key_len); |