Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs...

[net-next-2.6.git] / crypto / algboss.c

diff --git a/crypto/algboss.c b/crypto/algboss.c
index c3c196b5823a2e12c790cce27b9ae8439c20d445..791d194958fa18ac0fb8006e5d565f789c1e4f92 100644 (file)
--- a/crypto/algboss.c
+++ b/crypto/algboss.c
@@ -212,6 +212,10 @@ static int cryptomgr_test(void *data)
        u32 type = param->type;
        int err = 0;
 
+#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
+       goto skiptest;
+#endif
+
        if (type & CRYPTO_ALG_TESTED)
                goto skiptest;