crypto: testmgr - Fix test disabling option

This patch fixes a serious bug in the test disabling patch where
it can cause an spurious load of the cryptomgr module even when
it's compiled in.

It also negates the test disabling option so that its absence
causes tests to be enabled.

The Kconfig option is also now behind EMBEDDED.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

1 files changed, 5 insertions, 6 deletions

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 1cd497d7a15a..6f5c50fdbbdd 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -101,13 +101,12 @@ config CRYPTO_MANAGER2
         select CRYPTO_BLKCIPHER2
         select CRYPTO_PCOMP2
 
-config CRYPTO_MANAGER_TESTS
-        bool "Run algolithms' self-tests"
-        default y
-        depends on CRYPTO_MANAGER2
+config CRYPTO_MANAGER_DISABLE_TESTS
+        bool "Disable run-time self tests"
+        depends on CRYPTO_MANAGER2 && EMBEDDED
         help
-          Run cryptomanager's tests for the new crypto algorithms being
-          registered.
+          Disable run-time self tests that normally take place at
+          algorithm registration.
 
 config CRYPTO_GF128MUL
         tristate "GF(2^128) multiplication functions (EXPERIMENTAL)"