crypto: aes-ni - Remove CRYPTO_TFM_REQ_MAY_SLEEP from fpu template
authorHuang Ying <ying.huang@intel.com>
Thu, 18 Jun 2009 11:44:01 +0000 (19:44 +0800)
committerHerbert Xu <herbert@gondor.apana.org.au>
Thu, 18 Jun 2009 11:44:01 +0000 (19:44 +0800)
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>
arch/x86/crypto/fpu.c

index 5f9781a..daef6cd 100644 (file)
@@ -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();