mm, page_alloc: fix premature OOM when racing with cpuset mems update

[linux.git] / crypto / algboss.c

diff --git a/crypto/algboss.c b/crypto/algboss.c
index 6e39d9c05b98a532400f83d173ab9884cbb43a96..ccb85e1798f230fed80851e474996d20843b79ea 100644 (file)
--- a/crypto/algboss.c
+++ b/crypto/algboss.c
@@ -247,12 +247,8 @@ static int cryptomgr_schedule_test(struct crypto_alg *alg)
        memcpy(param->alg, alg->cra_name, sizeof(param->alg));
        type = alg->cra_flags;
 
-       /* This piece of crap needs to disappear into per-type test hooks. */
-       if (!((type ^ CRYPTO_ALG_TYPE_BLKCIPHER) &
-             CRYPTO_ALG_TYPE_BLKCIPHER_MASK) && !(type & CRYPTO_ALG_GENIV) &&
-           ((alg->cra_flags & CRYPTO_ALG_TYPE_MASK) ==
-            CRYPTO_ALG_TYPE_BLKCIPHER ? alg->cra_blkcipher.ivsize :
-                                        alg->cra_ablkcipher.ivsize))
+       /* Do not test internal algorithms. */
+       if (type & CRYPTO_ALG_INTERNAL)
                type |= CRYPTO_ALG_TESTED;
 
        param->type = type;