From 4dec3a8bc8f07b39e76572f93d3788745e257954 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Wed, 19 Dec 2012 15:44:31 -0800 Subject: [PATCH] --- yaml --- r: 347343 b: refs/heads/master c: 62ba63dc892cf836ecb9ce4fdb7644d45c95070b h: refs/heads/master i: 347341: a12447789ff796f6f7cd05ca003491fe863b863c 347339: e6814e229ec84a7406d00694b7f4700c69c7e084 347335: 08766f67ae2d78b7ad959bea01e97d1c0a6104a6 347327: 021a0c37d9435056c150f0834f249e29eca2a830 v: v3 --- [refs] | 2 +- trunk/arch/sparc/crypto/camellia_glue.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9727aac7a962..e7d8537eacb9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b3a37947074fa0a488d6c7ede58125b2278ab4e8 +refs/heads/master: 62ba63dc892cf836ecb9ce4fdb7644d45c95070b diff --git a/trunk/arch/sparc/crypto/camellia_glue.c b/trunk/arch/sparc/crypto/camellia_glue.c index 62c89af3fd3f..888f6260b4ec 100644 --- a/trunk/arch/sparc/crypto/camellia_glue.c +++ b/trunk/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);