summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorHuang Ying <ying.huang@intel.com>2009-06-18 15:44:01 +0400
committerHerbert Xu <herbert@gondor.apana.org.au>2009-06-18 15:44:01 +0400
commitb6f34d44cb341ad32f08717d1a2c418e6053a031 (patch)
tree220c1cb09bf5a0610cd285c7f36d3cef2dc8e918 /arch
parent9251b64fb2d2326d28f0e0646a9e4fb8bbb51d8e (diff)
downloadlinux-b6f34d44cb341ad32f08717d1a2c418e6053a031.tar.xz
crypto: aes-ni - Remove CRYPTO_TFM_REQ_MAY_SLEEP from fpu template
kernel_fpu_begin/end used preempt_disable/enable, so sleep should be prevented between kernel_fpu_begin/end. Signed-off-by: Huang Ying <ying.huang@intel.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'arch')
-rw-r--r--arch/x86/crypto/fpu.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/crypto/fpu.c b/arch/x86/crypto/fpu.c
index 5f9781a3815f..daef6cd2b45d 100644
--- a/arch/x86/crypto/fpu.c
+++ b/arch/x86/crypto/fpu.c
@@ -48,7 +48,7 @@ static int crypto_fpu_encrypt(struct blkcipher_desc *desc_in,
struct blkcipher_desc desc = {
.tfm = child,
.info = desc_in->info,
- .flags = desc_in->flags,
+ .flags = desc_in->flags & ~CRYPTO_TFM_REQ_MAY_SLEEP,
};
kernel_fpu_begin();
@@ -67,7 +67,7 @@ static int crypto_fpu_decrypt(struct blkcipher_desc *desc_in,
struct blkcipher_desc desc = {
.tfm = child,
.info = desc_in->info,
- .flags = desc_in->flags,
+ .flags = desc_in->flags & ~CRYPTO_TFM_REQ_MAY_SLEEP,
};
kernel_fpu_begin();