crypto: api - Disable boot-test-finished if algapi is a module

The boot-test-finished toggle is only necessary if algapi
is built into the kernel.  Do not include this code if it is a module.

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

diff --git a/crypto/algapi.c b/crypto/algapi.c
index 85bc279b4233fa3ab55026ded7bf75d7ea392517..122cd910c4e1c1981ca7479cfe4fb8be892c3be9 100644 (file)
--- a/crypto/algapi.c
+++ b/crypto/algapi.c
@@ -1056,6 +1056,9 @@ EXPORT_SYMBOL_GPL(crypto_type_has_alg);
 
 static void __init crypto_start_tests(void)
 {
+       if (!IS_BUILTIN(CONFIG_CRYPTO_ALGAPI))
+               return;
+
        if (IS_ENABLED(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS))
                return;
 

diff --git a/crypto/api.c b/crypto/api.c
index 6aa5a3b4ed5e6a276a30bc0cafb19d65259c06cb..22556907b3bcd34f28b186a19d393d5205fc10cb 100644 (file)
--- a/crypto/api.c
+++ b/crypto/api.c
@@ -31,9 +31,9 @@ EXPORT_SYMBOL_GPL(crypto_alg_sem);
 BLOCKING_NOTIFIER_HEAD(crypto_chain);
 EXPORT_SYMBOL_GPL(crypto_chain);
 
-#ifndef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
+#if IS_BUILTIN(CONFIG_CRYPTO_ALGAPI) && \
+    !IS_ENABLED(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS)
 DEFINE_STATIC_KEY_FALSE(__crypto_boot_test_finished);
-EXPORT_SYMBOL_GPL(__crypto_boot_test_finished);
 #endif
 
 static struct crypto_alg *crypto_larval_wait(struct crypto_alg *alg);

diff --git a/crypto/internal.h b/crypto/internal.h
index 63e59240d5fbf4fb17d7ce1bd87009a0519c8643..aee31319be2e6fdd984fed701072f7ec50d87f56 100644 (file)
--- a/crypto/internal.h
+++ b/crypto/internal.h
@@ -66,7 +66,8 @@ extern struct blocking_notifier_head crypto_chain;
 
 int alg_test(const char *driver, const char *alg, u32 type, u32 mask);
 
-#ifdef CONFIG_CRYPTO_MANAGER_DISABLE_TESTS
+#if !IS_BUILTIN(CONFIG_CRYPTO_ALGAPI) || \
+    IS_ENABLED(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS)
 static inline bool crypto_boot_test_finished(void)
 {
        return true;
@@ -84,7 +85,9 @@ static inline void set_crypto_boot_test_finished(void)
 {
        static_branch_enable(&__crypto_boot_test_finished);
 }
-#endif /* !CONFIG_CRYPTO_MANAGER_DISABLE_TESTS */
+#endif /* !IS_BUILTIN(CONFIG_CRYPTO_ALGAPI) ||
+       * IS_ENABLED(CONFIG_CRYPTO_MANAGER_DISABLE_TESTS)
+       */
 
 #ifdef CONFIG_PROC_FS
 void __init crypto_init_proc(void);