Revert "crypto: run initcalls for generic implementations earlier"

This reverts commit c4741b23059794bd99beef0f700103b0d983b3fd.

Crypto API self-tests no longer run at registration time and now
occur either at late_initcall or upon the first use.

Therefore the premise of the above commit no longer exists.  Revert
it and subsequent additions of subsys_initcall and arch_initcall.

Note that lib/crypto calls will stay at subsys_initcall (or rather
downgraded from arch_initcall) because they may need to occur
before Crypto API registration.

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

diff --git a/arch/arm/crypto/aes-neonbs-glue.c b/arch/arm/crypto/aes-neonbs-glue.c
index 95418df97fb493303c97870164820e06fdb7062f..c60104dc15852965d37b89502061769e1271a007 100644 (file)
--- a/arch/arm/crypto/aes-neonbs-glue.c
+++ b/arch/arm/crypto/aes-neonbs-glue.c
@@ -407,5 +407,5 @@ static int __init aes_init(void)
        return crypto_register_skciphers(aes_algs, ARRAY_SIZE(aes_algs));
 }
 
-late_initcall(aes_init);
+module_init(aes_init);
 module_exit(aes_exit);

diff --git a/arch/arm/lib/crypto/chacha-glue.c b/arch/arm/lib/crypto/chacha-glue.c
index 12afb40cf1ff445cc8f5a008c0c9f100cfa457ad..1e28736834a00ecc14034dc3302efc25580e24d7 100644 (file)
--- a/arch/arm/lib/crypto/chacha-glue.c
+++ b/arch/arm/lib/crypto/chacha-glue.c
@@ -122,7 +122,7 @@ static int __init chacha_arm_mod_init(void)
        }
        return 0;
 }
-arch_initcall(chacha_arm_mod_init);
+subsys_initcall(chacha_arm_mod_init);
 
 static void __exit chacha_arm_mod_exit(void)
 {

diff --git a/arch/arm/lib/crypto/poly1305-glue.c b/arch/arm/lib/crypto/poly1305-glue.c
index 91da42b26d9cf718e99a927db7c260ce1b07e0ec..2603b0771f2c4c503543639c648f5d220b7e6d12 100644 (file)
--- a/arch/arm/lib/crypto/poly1305-glue.c
+++ b/arch/arm/lib/crypto/poly1305-glue.c
@@ -69,7 +69,7 @@ static int __init arm_poly1305_mod_init(void)
                static_branch_enable(&have_neon);
        return 0;
 }
-arch_initcall(arm_poly1305_mod_init);
+subsys_initcall(arm_poly1305_mod_init);
 
 static void __exit arm_poly1305_mod_exit(void)
 {

diff --git a/arch/arm/lib/crypto/sha256.c b/arch/arm/lib/crypto/sha256.c
index 3a8dfc304807a424dfc3a5af923a9285554c1caa..81612b7b9043fd6b88f1775c0684dddb25a6236e 100644 (file)
--- a/arch/arm/lib/crypto/sha256.c
+++ b/arch/arm/lib/crypto/sha256.c
@@ -53,7 +53,7 @@ static int __init sha256_arm_mod_init(void)
        }
        return 0;
 }
-arch_initcall(sha256_arm_mod_init);
+subsys_initcall(sha256_arm_mod_init);
 
 static void __exit sha256_arm_mod_exit(void)
 {

diff --git a/arch/arm64/lib/crypto/chacha-neon-glue.c b/arch/arm64/lib/crypto/chacha-neon-glue.c
index 14a2836eff611ee1ea0221684701da65cd1d3115..2b0de97a6dafaafd346f33fe228d8322362bf00f 100644 (file)
--- a/arch/arm64/lib/crypto/chacha-neon-glue.c
+++ b/arch/arm64/lib/crypto/chacha-neon-glue.c
@@ -104,7 +104,7 @@ static int __init chacha_simd_mod_init(void)
                static_branch_enable(&have_neon);
        return 0;
 }
-arch_initcall(chacha_simd_mod_init);
+subsys_initcall(chacha_simd_mod_init);
 
 static void __exit chacha_simd_mod_exit(void)
 {

diff --git a/arch/arm64/lib/crypto/poly1305-glue.c b/arch/arm64/lib/crypto/poly1305-glue.c
index 681c2655733673965fdb9e4aff55730566902020..6a661cf048213a053ccd51aa1a2018275068fb48 100644 (file)
--- a/arch/arm64/lib/crypto/poly1305-glue.c
+++ b/arch/arm64/lib/crypto/poly1305-glue.c
@@ -62,7 +62,7 @@ static int __init neon_poly1305_mod_init(void)
                static_branch_enable(&have_neon);
        return 0;
 }
-arch_initcall(neon_poly1305_mod_init);
+subsys_initcall(neon_poly1305_mod_init);
 
 static void __exit neon_poly1305_mod_exit(void)
 {

diff --git a/arch/arm64/lib/crypto/sha256.c b/arch/arm64/lib/crypto/sha256.c
index 2bd413c586d278747a872605637831505e8460f3..354fc402c6d3024898b3f0d193a27f8a44ac1d90 100644 (file)
--- a/arch/arm64/lib/crypto/sha256.c
+++ b/arch/arm64/lib/crypto/sha256.c
@@ -64,7 +64,7 @@ static int __init sha256_arm64_mod_init(void)
        }
        return 0;
 }
-arch_initcall(sha256_arm64_mod_init);
+subsys_initcall(sha256_arm64_mod_init);
 
 static void __exit sha256_arm64_mod_exit(void)
 {

diff --git a/arch/powerpc/lib/crypto/chacha-p10-glue.c b/arch/powerpc/lib/crypto/chacha-p10-glue.c
index 351ed409f9b21fb31c5cb227a61f76bfd414ffd0..51daeaf5d26e1697c499d1e63010ddf70f4b17d5 100644 (file)
--- a/arch/powerpc/lib/crypto/chacha-p10-glue.c
+++ b/arch/powerpc/lib/crypto/chacha-p10-glue.c
@@ -87,7 +87,7 @@ static int __init chacha_p10_init(void)
                static_branch_enable(&have_p10);
        return 0;
 }
-arch_initcall(chacha_p10_init);
+subsys_initcall(chacha_p10_init);
 
 static void __exit chacha_p10_exit(void)
 {

diff --git a/arch/powerpc/lib/crypto/poly1305-p10-glue.c b/arch/powerpc/lib/crypto/poly1305-p10-glue.c
index 50ac802220e0aa91a046fe97fb3b1232c0b8cc2f..16c2a831669633f8ee333da5d9dfc044d9e6e774 100644 (file)
--- a/arch/powerpc/lib/crypto/poly1305-p10-glue.c
+++ b/arch/powerpc/lib/crypto/poly1305-p10-glue.c
@@ -76,7 +76,7 @@ static int __init poly1305_p10_init(void)
                static_branch_enable(&have_p10);
        return 0;
 }
-arch_initcall(poly1305_p10_init);
+subsys_initcall(poly1305_p10_init);
 
 static void __exit poly1305_p10_exit(void)
 {

diff --git a/arch/riscv/lib/crypto/chacha-riscv64-glue.c b/arch/riscv/lib/crypto/chacha-riscv64-glue.c
index afc4e3be3cac2f274e69dae61a593f01646d53a0..1740e1ca3a94948776f9b623a24bf6dbd5e4b587 100644 (file)
--- a/arch/riscv/lib/crypto/chacha-riscv64-glue.c
+++ b/arch/riscv/lib/crypto/chacha-riscv64-glue.c
@@ -62,7 +62,7 @@ static int __init riscv64_chacha_mod_init(void)
                static_branch_enable(&use_zvkb);
        return 0;
 }
-arch_initcall(riscv64_chacha_mod_init);
+subsys_initcall(riscv64_chacha_mod_init);
 
 static void __exit riscv64_chacha_mod_exit(void)
 {

diff --git a/arch/riscv/lib/crypto/sha256.c b/arch/riscv/lib/crypto/sha256.c
index 18b84030f0b39bd60b959de8d9c8ab0f06dd879c..c8065c70337b58a71e97159bcd82ea9303288fe3 100644 (file)
--- a/arch/riscv/lib/crypto/sha256.c
+++ b/arch/riscv/lib/crypto/sha256.c
@@ -50,7 +50,7 @@ static int __init riscv64_sha256_mod_init(void)
                static_branch_enable(&have_extensions);
        return 0;
 }
-arch_initcall(riscv64_sha256_mod_init);
+subsys_initcall(riscv64_sha256_mod_init);
 
 static void __exit riscv64_sha256_mod_exit(void)
 {

diff --git a/arch/s390/lib/crypto/sha256.c b/arch/s390/lib/crypto/sha256.c
index 50c592ce7a5de3a70b9619849e08e778536831fb..f1d73ea1eef6e7a020d72b80464f92599ed430b7 100644 (file)
--- a/arch/s390/lib/crypto/sha256.c
+++ b/arch/s390/lib/crypto/sha256.c
@@ -36,7 +36,7 @@ static int __init sha256_s390_mod_init(void)
                static_branch_enable(&have_cpacf_sha256);
        return 0;
 }
-arch_initcall(sha256_s390_mod_init);
+subsys_initcall(sha256_s390_mod_init);
 
 static void __exit sha256_s390_mod_exit(void)
 {

diff --git a/arch/sparc/lib/crypto/sha256.c b/arch/sparc/lib/crypto/sha256.c
index 6f118a23d210aef5d5460607c6331c04050b66ef..0394c2b72f9e07e105f327c571099a2be737d42f 100644 (file)
--- a/arch/sparc/lib/crypto/sha256.c
+++ b/arch/sparc/lib/crypto/sha256.c
@@ -53,7 +53,7 @@ static int __init sha256_sparc64_mod_init(void)
        pr_info("Using sparc64 sha256 opcode optimized SHA-256/SHA-224 implementation\n");
        return 0;
 }
-arch_initcall(sha256_sparc64_mod_init);
+subsys_initcall(sha256_sparc64_mod_init);
 
 static void __exit sha256_sparc64_mod_exit(void)
 {

diff --git a/arch/x86/lib/crypto/chacha_glue.c b/arch/x86/lib/crypto/chacha_glue.c
index 59bf63c00072678e9d431e5896e61a5efee2fb95..94fcefbc8827c6b7a01112b8afd1571e42e8d051 100644 (file)
--- a/arch/x86/lib/crypto/chacha_glue.c
+++ b/arch/x86/lib/crypto/chacha_glue.c
@@ -174,7 +174,7 @@ static int __init chacha_simd_mod_init(void)
        }
        return 0;
 }
-arch_initcall(chacha_simd_mod_init);
+subsys_initcall(chacha_simd_mod_init);
 
 static void __exit chacha_simd_mod_exit(void)
 {

diff --git a/arch/x86/lib/crypto/poly1305_glue.c b/arch/x86/lib/crypto/poly1305_glue.c
index f799828c58094d453497b06d0bba01a717aa4b28..b7e78a583e07f7dce6f2eca63d9be7c444c07ef5 100644 (file)
--- a/arch/x86/lib/crypto/poly1305_glue.c
+++ b/arch/x86/lib/crypto/poly1305_glue.c
@@ -117,7 +117,7 @@ static int __init poly1305_simd_mod_init(void)
                static_branch_enable(&poly1305_use_avx512);
        return 0;
 }
-arch_initcall(poly1305_simd_mod_init);
+subsys_initcall(poly1305_simd_mod_init);
 
 static void __exit poly1305_simd_mod_exit(void)
 {

diff --git a/arch/x86/lib/crypto/sha256.c b/arch/x86/lib/crypto/sha256.c
index 47865b5cd94be4ab05e7d3e25adc1a95f611b8cd..ea17514cb0f392e2cbf00c0d5ee7f84fe8136347 100644 (file)
--- a/arch/x86/lib/crypto/sha256.c
+++ b/arch/x86/lib/crypto/sha256.c
@@ -63,7 +63,7 @@ static int __init sha256_x86_mod_init(void)
        static_branch_enable(&have_sha256_x86);
        return 0;
 }
-arch_initcall(sha256_x86_mod_init);
+subsys_initcall(sha256_x86_mod_init);
 
 static void __exit sha256_x86_mod_exit(void)
 {

diff --git a/crypto/842.c b/crypto/842.c
index 881945d44328f8713b482f9928fdb4667b5ee25b..8c257c40e2b901732dafd042ed2ac1a32a3f5ee0 100644 (file)
--- a/crypto/842.c
+++ b/crypto/842.c
@@ -70,7 +70,7 @@ static int __init crypto842_mod_init(void)
 {
        return crypto_register_scomp(&scomp);
 }
-subsys_initcall(crypto842_mod_init);
+module_init(crypto842_mod_init);
 
 static void __exit crypto842_mod_exit(void)
 {

diff --git a/crypto/adiantum.c b/crypto/adiantum.c
index c3ef583598b4f45ae26d9196dead59b5b928e257..a6bca877c3c739da72a3ddfaa654160780d5632c 100644 (file)
--- a/crypto/adiantum.c
+++ b/crypto/adiantum.c
@@ -639,7 +639,7 @@ static void __exit adiantum_module_exit(void)
        crypto_unregister_template(&adiantum_tmpl);
 }
 
-subsys_initcall(adiantum_module_init);
+module_init(adiantum_module_init);
 module_exit(adiantum_module_exit);
 
 MODULE_DESCRIPTION("Adiantum length-preserving encryption mode");

diff --git a/crypto/aegis128-core.c b/crypto/aegis128-core.c
index 72f6ee1345efffd902c57c46fc5c3e68850e5b25..ca80d861345db99db114570ccfac6f8f3b16e644 100644 (file)
--- a/crypto/aegis128-core.c
+++ b/crypto/aegis128-core.c
@@ -566,7 +566,7 @@ static void __exit crypto_aegis128_module_exit(void)
        crypto_unregister_aead(&crypto_aegis128_alg_generic);
 }
 
-subsys_initcall(crypto_aegis128_module_init);
+module_init(crypto_aegis128_module_init);
 module_exit(crypto_aegis128_module_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/aes_generic.c b/crypto/aes_generic.c
index 3c66d425c97b5d197c021bdb562a0e00cbbf1694..85d2e78c8ef2ca7e2ebef3cb7d38b16b402e91c4 100644 (file)
--- a/crypto/aes_generic.c
+++ b/crypto/aes_generic.c
@@ -1311,7 +1311,7 @@ static void __exit aes_fini(void)
        crypto_unregister_alg(&aes_alg);
 }
 
-subsys_initcall(aes_init);
+module_init(aes_init);
 module_exit(aes_fini);
 
 MODULE_DESCRIPTION("Rijndael (AES) Cipher Algorithm");

diff --git a/crypto/algboss.c b/crypto/algboss.c
index a20926bfd34e0c5d9b9d33dd031ab479612b4e22..ef5c73780fc78c15d45c90668e0c0d3a7b180b47 100644 (file)
--- a/crypto/algboss.c
+++ b/crypto/algboss.c
@@ -247,13 +247,7 @@ static void __exit cryptomgr_exit(void)
        BUG_ON(err);
 }
 
-/*
- * This is arch_initcall() so that the crypto self-tests are run on algorithms
- * registered early by subsys_initcall().  subsys_initcall() is needed for
- * generic implementations so that they're available for comparison tests when
- * other implementations are registered later by module_init().
- */
-arch_initcall(cryptomgr_init);
+module_init(cryptomgr_init);
 module_exit(cryptomgr_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/ansi_cprng.c b/crypto/ansi_cprng.c
index 64f57c4c4b06213443cf4831e112568d7cf4dd00..153523ce607646c0db641ded85832cf175757c4c 100644 (file)
--- a/crypto/ansi_cprng.c
+++ b/crypto/ansi_cprng.c
@@ -467,7 +467,7 @@ MODULE_DESCRIPTION("Software Pseudo Random Number Generator");
 MODULE_AUTHOR("Neil Horman <nhorman@tuxdriver.com>");
 module_param(dbg, int, 0);
 MODULE_PARM_DESC(dbg, "Boolean to enable debugging (0/1 == off/on)");
-subsys_initcall(prng_mod_init);
+module_init(prng_mod_init);
 module_exit(prng_mod_fini);
 MODULE_ALIAS_CRYPTO("stdrng");
 MODULE_ALIAS_CRYPTO("ansi_cprng");

diff --git a/crypto/anubis.c b/crypto/anubis.c
index 886e7c91368864eeab7a435081041e11c96e9594..4268c3833baa7438b1d9ec5e344959ee06f5933d 100644 (file)
--- a/crypto/anubis.c
+++ b/crypto/anubis.c
@@ -694,7 +694,7 @@ static void __exit anubis_mod_fini(void)
        crypto_unregister_alg(&anubis_alg);
 }
 
-subsys_initcall(anubis_mod_init);
+module_init(anubis_mod_init);
 module_exit(anubis_mod_fini);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/arc4.c b/crypto/arc4.c
index 1a4825c97c5ae19e4092c2df63730edafdadbf0c..1608018111d031e4e3e5dd58ee2b49d44f79bfe1 100644 (file)
--- a/crypto/arc4.c
+++ b/crypto/arc4.c
@@ -73,7 +73,7 @@ static void __exit arc4_exit(void)
        crypto_unregister_lskcipher(&arc4_alg);
 }
 
-subsys_initcall(arc4_init);
+module_init(arc4_init);
 module_exit(arc4_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/aria_generic.c b/crypto/aria_generic.c
index bd359d3313c22dc5615e6da57482f45f49991207..faa7900383f6eba52dafbf0a39535060270e9ba2 100644 (file)
--- a/crypto/aria_generic.c
+++ b/crypto/aria_generic.c
@@ -304,7 +304,7 @@ static void __exit aria_fini(void)
        crypto_unregister_alg(&aria_alg);
 }
 
-subsys_initcall(aria_init);
+module_init(aria_init);
 module_exit(aria_fini);
 
 MODULE_DESCRIPTION("ARIA Cipher Algorithm");

diff --git a/crypto/authenc.c b/crypto/authenc.c
index 3aaf3ab4e360fa6754fbecde6043e499adde98c0..9521ae2f112ee4233ac21944ee994ef3cfb71612 100644 (file)
--- a/crypto/authenc.c
+++ b/crypto/authenc.c
@@ -451,7 +451,7 @@ static void __exit crypto_authenc_module_exit(void)
        crypto_unregister_template(&crypto_authenc_tmpl);
 }
 
-subsys_initcall(crypto_authenc_module_init);
+module_init(crypto_authenc_module_init);
 module_exit(crypto_authenc_module_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/authencesn.c b/crypto/authencesn.c
index 2cc933e2f79011076be98ed53354b3363b3d0fb8..b1c78313cbc14bdff73a8241146b78011cbff144 100644 (file)
--- a/crypto/authencesn.c
+++ b/crypto/authencesn.c
@@ -465,7 +465,7 @@ static void __exit crypto_authenc_esn_module_exit(void)
        crypto_unregister_template(&crypto_authenc_esn_tmpl);
 }
 
-subsys_initcall(crypto_authenc_esn_module_init);
+module_init(crypto_authenc_esn_module_init);
 module_exit(crypto_authenc_esn_module_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/blake2b_generic.c b/crypto/blake2b_generic.c
index 6fa38965a4934c50ca7cf45d85b3b41443754c7c..60f056217510428a741ebc002c4ddb65e7d7436e 100644 (file)
--- a/crypto/blake2b_generic.c
+++ b/crypto/blake2b_generic.c
@@ -176,7 +176,7 @@ static void __exit blake2b_mod_fini(void)
        crypto_unregister_shashes(blake2b_algs, ARRAY_SIZE(blake2b_algs));
 }
 
-subsys_initcall(blake2b_mod_init);
+module_init(blake2b_mod_init);
 module_exit(blake2b_mod_fini);
 
 MODULE_AUTHOR("David Sterba <kdave@kernel.org>");

diff --git a/crypto/blowfish_generic.c b/crypto/blowfish_generic.c
index 0146bc762c09a4ea5f2c914f46815e2568dae694..f3c5f9b09850a4e008085b47d3299066b548189b 100644 (file)
--- a/crypto/blowfish_generic.c
+++ b/crypto/blowfish_generic.c
@@ -124,7 +124,7 @@ static void __exit blowfish_mod_fini(void)
        crypto_unregister_alg(&alg);
 }
 
-subsys_initcall(blowfish_mod_init);
+module_init(blowfish_mod_init);
 module_exit(blowfish_mod_fini);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/camellia_generic.c b/crypto/camellia_generic.c
index 197fcf3abc892154f831085a21d10add177e10a9..ee4336a04b9372182544dd50475b258c6bd59df7 100644 (file)
--- a/crypto/camellia_generic.c
+++ b/crypto/camellia_generic.c
@@ -1064,7 +1064,7 @@ static void __exit camellia_fini(void)
        crypto_unregister_alg(&camellia_alg);
 }
 
-subsys_initcall(camellia_init);
+module_init(camellia_init);
 module_exit(camellia_fini);
 
 MODULE_DESCRIPTION("Camellia Cipher Algorithm");

diff --git a/crypto/cast5_generic.c b/crypto/cast5_generic.c
index f3e57775fa02ead8269e1fbd2be747057e2ef38a..f68330793e0c9fb26a3a5925bf45cb68d86cb31c 100644 (file)
--- a/crypto/cast5_generic.c
+++ b/crypto/cast5_generic.c
@@ -531,7 +531,7 @@ static void __exit cast5_mod_fini(void)
        crypto_unregister_alg(&alg);
 }
 
-subsys_initcall(cast5_mod_init);
+module_init(cast5_mod_init);
 module_exit(cast5_mod_fini);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/cast6_generic.c b/crypto/cast6_generic.c
index 11b725b12f27418c196a047609b465dd46d6114b..4c08c42646f0d2946afc019f9bb89ce308a29b7c 100644 (file)
--- a/crypto/cast6_generic.c
+++ b/crypto/cast6_generic.c
@@ -271,7 +271,7 @@ static void __exit cast6_mod_fini(void)
        crypto_unregister_alg(&alg);
 }
 
-subsys_initcall(cast6_mod_init);
+module_init(cast6_mod_init);
 module_exit(cast6_mod_fini);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/cbc.c b/crypto/cbc.c
index e81918ca68b782c881bf6f868b441281e249e7f4..ed3df624676522735c35a6022a185c1b371d5ffb 100644 (file)
--- a/crypto/cbc.c
+++ b/crypto/cbc.c
@@ -179,7 +179,7 @@ static void __exit crypto_cbc_module_exit(void)
        crypto_unregister_template(&crypto_cbc_tmpl);
 }
 
-subsys_initcall(crypto_cbc_module_init);
+module_init(crypto_cbc_module_init);
 module_exit(crypto_cbc_module_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/ccm.c b/crypto/ccm.c
index f3f455e4908b8632a413cf53731847338c643877..2ae929ffdef8e632e609c35816a2ba809d68e91f 100644 (file)
--- a/crypto/ccm.c
+++ b/crypto/ccm.c
@@ -929,7 +929,7 @@ static void __exit crypto_ccm_module_exit(void)
                                    ARRAY_SIZE(crypto_ccm_tmpls));
 }
 
-subsys_initcall(crypto_ccm_module_init);
+module_init(crypto_ccm_module_init);
 module_exit(crypto_ccm_module_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/chacha.c b/crypto/chacha.c
index 5103bc0b2881fb9b218fcd8aa1afe2aa0406e942..28a8ad6197ab7c674855dcadee1cb64cf2e92771 100644 (file)
--- a/crypto/chacha.c
+++ b/crypto/chacha.c
@@ -243,7 +243,7 @@ static void __exit crypto_chacha_mod_fini(void)
        crypto_unregister_skciphers(algs, num_algs);
 }
 
-subsys_initcall(crypto_chacha_mod_init);
+module_init(crypto_chacha_mod_init);
 module_exit(crypto_chacha_mod_fini);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/chacha20poly1305.c b/crypto/chacha20poly1305.c
index b29f66ba1e2f00a56e8e724c0cc556691c4d3323..b4b5a7198d841297c31444dded63954d547d9aa7 100644 (file)
--- a/crypto/chacha20poly1305.c
+++ b/crypto/chacha20poly1305.c
@@ -476,7 +476,7 @@ static void __exit chacha20poly1305_module_exit(void)
                                    ARRAY_SIZE(rfc7539_tmpls));
 }
 
-subsys_initcall(chacha20poly1305_module_init);
+module_init(chacha20poly1305_module_init);
 module_exit(chacha20poly1305_module_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/cmac.c b/crypto/cmac.c
index f297042a324bebe627bfed4c3c25e084e8d29dab..1b03964abe0079a0f67632a47e83d4dbb733f654 100644 (file)
--- a/crypto/cmac.c
+++ b/crypto/cmac.c
@@ -251,7 +251,7 @@ static void __exit crypto_cmac_module_exit(void)
        crypto_unregister_template(&crypto_cmac_tmpl);
 }
 
-subsys_initcall(crypto_cmac_module_init);
+module_init(crypto_cmac_module_init);
 module_exit(crypto_cmac_module_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/crc32_generic.c b/crypto/crc32_generic.c
index 783a30b27398f5a9ffaa418b3fe9bd939db52ce2..cc371d42601fda164c23ce4c63d328d687ff5b65 100644 (file)
--- a/crypto/crc32_generic.c
+++ b/crypto/crc32_generic.c
@@ -172,7 +172,7 @@ static void __exit crc32_mod_fini(void)
        crypto_unregister_shashes(algs, num_algs);
 }
 
-subsys_initcall(crc32_mod_init);
+module_init(crc32_mod_init);
 module_exit(crc32_mod_fini);
 
 MODULE_AUTHOR("Alexander Boyko <alexander_boyko@xyratex.com>");

diff --git a/crypto/crc32c_generic.c b/crypto/crc32c_generic.c
index b1a36d32dc50cdab9511212f0cf12326ddcb19d3..e5377898414a2cbfc34b72ca5be579efe0a0eb17 100644 (file)
--- a/crypto/crc32c_generic.c
+++ b/crypto/crc32c_generic.c
@@ -212,7 +212,7 @@ static void __exit crc32c_mod_fini(void)
        crypto_unregister_shashes(algs, num_algs);
 }
 
-subsys_initcall(crc32c_mod_init);
+module_init(crc32c_mod_init);
 module_exit(crc32c_mod_fini);
 
 MODULE_AUTHOR("Clay Haapala <chaapala@cisco.com>");

diff --git a/crypto/cryptd.c b/crypto/cryptd.c
index 31d022d47f7a063181d05a54435d4385b0695183..5bb6f8d88cc2ec93a0caa8e452f9c9313b022b41 100644 (file)
--- a/crypto/cryptd.c
+++ b/crypto/cryptd.c
@@ -1138,7 +1138,7 @@ static void __exit cryptd_exit(void)
        crypto_unregister_template(&cryptd_tmpl);
 }
 
-subsys_initcall(cryptd_init);
+module_init(cryptd_init);
 module_exit(cryptd_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/crypto_null.c b/crypto/crypto_null.c
index ced90f88ee07d9c7b4c565295a74758debea2b24..5822753b0995c116ea2657a42d652312592ef7ad 100644 (file)
--- a/crypto/crypto_null.c
+++ b/crypto/crypto_null.c
@@ -210,7 +210,7 @@ static void __exit crypto_null_mod_fini(void)
        crypto_unregister_skcipher(&skcipher_null);
 }
 
-subsys_initcall(crypto_null_mod_init);
+module_init(crypto_null_mod_init);
 module_exit(crypto_null_mod_fini);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/ctr.c b/crypto/ctr.c
index 97a947b0a8761730afc988244f991dd8de39478e..a388f0ceb3a00b478b9b6959ee696524092b44be 100644 (file)
--- a/crypto/ctr.c
+++ b/crypto/ctr.c
@@ -350,7 +350,7 @@ static void __exit crypto_ctr_module_exit(void)
                                    ARRAY_SIZE(crypto_ctr_tmpls));
 }
 
-subsys_initcall(crypto_ctr_module_init);
+module_init(crypto_ctr_module_init);
 module_exit(crypto_ctr_module_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/cts.c b/crypto/cts.c
index f5b42156b6c724a4e9b5bd3f50bfc3f37949da41..48898d5e24ffaa11bfa236d45245d0e20717290b 100644 (file)
--- a/crypto/cts.c
+++ b/crypto/cts.c
@@ -402,7 +402,7 @@ static void __exit crypto_cts_module_exit(void)
        crypto_unregister_template(&crypto_cts_tmpl);
 }
 
-subsys_initcall(crypto_cts_module_init);
+module_init(crypto_cts_module_init);
 module_exit(crypto_cts_module_exit);
 
 MODULE_LICENSE("Dual BSD/GPL");

diff --git a/crypto/curve25519-generic.c b/crypto/curve25519-generic.c
index 68a673262e041b3823947ae0e0d132b441d355a1..f3e56e73c66ca25b34ab836ef092e1034e1dcc38 100644 (file)
--- a/crypto/curve25519-generic.c
+++ b/crypto/curve25519-generic.c
@@ -82,7 +82,7 @@ static void __exit curve25519_exit(void)
        crypto_unregister_kpp(&curve25519_alg);
 }
 
-subsys_initcall(curve25519_init);
+module_init(curve25519_init);
 module_exit(curve25519_exit);
 
 MODULE_ALIAS_CRYPTO("curve25519");

diff --git a/crypto/deflate.c b/crypto/deflate.c
index 0d2b64d96d6ea23409272d72a7f974229a2ab86a..7eb1a5c44ee0a700a1f940eb5091f75020b94d8e 100644 (file)
--- a/crypto/deflate.c
+++ b/crypto/deflate.c
@@ -243,7 +243,7 @@ static void __exit deflate_mod_fini(void)
        crypto_acomp_free_streams(&deflate_streams);
 }
 
-subsys_initcall(deflate_mod_init);
+module_init(deflate_mod_init);
 module_exit(deflate_mod_fini);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/des_generic.c b/crypto/des_generic.c
index 1274e18d3eb901500e92d09cbf232170eb1da07a..fce341400914518b15b189aca15fc3516d5d6e0a 100644 (file)
--- a/crypto/des_generic.c
+++ b/crypto/des_generic.c
@@ -122,7 +122,7 @@ static void __exit des_generic_mod_fini(void)
        crypto_unregister_algs(des_algs, ARRAY_SIZE(des_algs));
 }
 
-subsys_initcall(des_generic_mod_init);
+module_init(des_generic_mod_init);
 module_exit(des_generic_mod_fini);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/dh.c b/crypto/dh.c
index afc0fd84776138d8d1aa405b07e08dd56ce9b3da..8250eeeebd0fe87155da38a6e4b95a46ee3958a2 100644 (file)
--- a/crypto/dh.c
+++ b/crypto/dh.c
@@ -920,7 +920,7 @@ static void __exit dh_exit(void)
        crypto_unregister_kpp(&dh);
 }
 
-subsys_initcall(dh_init);
+module_init(dh_init);
 module_exit(dh_exit);
 MODULE_ALIAS_CRYPTO("dh");
 MODULE_LICENSE("GPL");

diff --git a/crypto/drbg.c b/crypto/drbg.c
index f28dfc2511a2b919c9e31bfb378ee5e207f0c8cf..dbe4c8bb5ceb73ba4a9d49066b926dee2e429e26 100644 (file)
--- a/crypto/drbg.c
+++ b/crypto/drbg.c
@@ -2132,7 +2132,7 @@ static void __exit drbg_exit(void)
        crypto_unregister_rngs(drbg_algs, (ARRAY_SIZE(drbg_cores) * 2));
 }
 
-subsys_initcall(drbg_init);
+module_init(drbg_init);
 module_exit(drbg_exit);
 #ifndef CRYPTO_DRBG_HASH_STRING
 #define CRYPTO_DRBG_HASH_STRING ""

diff --git a/crypto/ecb.c b/crypto/ecb.c
index 95d7e972865a86195428e3daa41f784fcdeab76b..cd1b20456dad2f8e95d79f2ea21a0521697d2cd8 100644 (file)
--- a/crypto/ecb.c
+++ b/crypto/ecb.c
@@ -219,7 +219,7 @@ static void __exit crypto_ecb_module_exit(void)
        crypto_unregister_template(&crypto_ecb_tmpl);
 }
 
-subsys_initcall(crypto_ecb_module_init);
+module_init(crypto_ecb_module_init);
 module_exit(crypto_ecb_module_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/ecdh.c b/crypto/ecdh.c
index 72cfd159015632cb34bad1d9375d5a1e6b204099..9f0b93b3166d853c06119633b6d137d85eca8cd0 100644 (file)
--- a/crypto/ecdh.c
+++ b/crypto/ecdh.c
@@ -240,7 +240,7 @@ static void __exit ecdh_exit(void)
        crypto_unregister_kpp(&ecdh_nist_p384);
 }
 
-subsys_initcall(ecdh_init);
+module_init(ecdh_init);
 module_exit(ecdh_exit);
 MODULE_ALIAS_CRYPTO("ecdh");
 MODULE_LICENSE("GPL");

diff --git a/crypto/ecdsa.c b/crypto/ecdsa.c
index a70b60a90a3c76ebae1ac056902eabf45ccc6c83..ce8e4364842ff416b3ab8055f8bf6d31a262f549 100644 (file)
--- a/crypto/ecdsa.c
+++ b/crypto/ecdsa.c
@@ -334,7 +334,7 @@ static void __exit ecdsa_exit(void)
        crypto_unregister_sig(&ecdsa_nist_p521);
 }
 
-subsys_initcall(ecdsa_init);
+module_init(ecdsa_init);
 module_exit(ecdsa_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/echainiv.c b/crypto/echainiv.c
index 69686668625e17852d3cc058d967f3aa310a91c0..1913be8dfbbad58bd546139e64f3af0aa2b7e94f 100644 (file)
--- a/crypto/echainiv.c
+++ b/crypto/echainiv.c
@@ -157,7 +157,7 @@ static void __exit echainiv_module_exit(void)
        crypto_unregister_template(&echainiv_tmpl);
 }
 
-subsys_initcall(echainiv_module_init);
+module_init(echainiv_module_init);
 module_exit(echainiv_module_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/essiv.c b/crypto/essiv.c
index cfce8ef7ab1fa83ae81c71926d7ffba9521a4e09..d003b78fcd855a1c04e27fb6f750738ea42353e1 100644 (file)
--- a/crypto/essiv.c
+++ b/crypto/essiv.c
@@ -641,7 +641,7 @@ static void __exit essiv_module_exit(void)
        crypto_unregister_template(&essiv_tmpl);
 }
 
-subsys_initcall(essiv_module_init);
+module_init(essiv_module_init);
 module_exit(essiv_module_exit);
 
 MODULE_DESCRIPTION("ESSIV skcipher/aead wrapper for block encryption");

diff --git a/crypto/fcrypt.c b/crypto/fcrypt.c
index 95a16e88899bafbe6a86417a4274561e8ed2f3eb..80036835cec5d9c780bada2dab8b2bfb6e1b0b27 100644 (file)
--- a/crypto/fcrypt.c
+++ b/crypto/fcrypt.c
@@ -411,7 +411,7 @@ static void __exit fcrypt_mod_fini(void)
        crypto_unregister_alg(&fcrypt_alg);
 }
 
-subsys_initcall(fcrypt_mod_init);
+module_init(fcrypt_mod_init);
 module_exit(fcrypt_mod_fini);
 
 MODULE_LICENSE("Dual BSD/GPL");

diff --git a/crypto/fips.c b/crypto/fips.c
index 2fa3a9ee61a150db35370aec689d4790140fa24f..e88a604cb42b5913167adfb01a55367ef3a3e3fc 100644 (file)
--- a/crypto/fips.c
+++ b/crypto/fips.c
@@ -95,5 +95,5 @@ static void __exit fips_exit(void)
        crypto_proc_fips_exit();
 }
 
-subsys_initcall(fips_init);
+module_init(fips_init);
 module_exit(fips_exit);

diff --git a/crypto/gcm.c b/crypto/gcm.c
index 84f7c23d14e48354c953f21cda4e7423e21932f2..54ca9faf0e0cc5ee2c91d633c6ebc8f6c6147a5e 100644 (file)
--- a/crypto/gcm.c
+++ b/crypto/gcm.c
@@ -1152,7 +1152,7 @@ static void __exit crypto_gcm_module_exit(void)
                                    ARRAY_SIZE(crypto_gcm_tmpls));
 }
 
-subsys_initcall(crypto_gcm_module_init);
+module_init(crypto_gcm_module_init);
 module_exit(crypto_gcm_module_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/ghash-generic.c b/crypto/ghash-generic.c
index b5fc20a0dafc7b56e7a97c7c053eff258ef808e8..e5803c249c1212a4b54c2c71dbd950ad416e3af1 100644 (file)
--- a/crypto/ghash-generic.c
+++ b/crypto/ghash-generic.c
@@ -153,7 +153,7 @@ static void __exit ghash_mod_exit(void)
        crypto_unregister_shash(&ghash_alg);
 }
 
-subsys_initcall(ghash_mod_init);
+module_init(ghash_mod_init);
 module_exit(ghash_mod_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/hctr2.c b/crypto/hctr2.c
index cbcd673be481f9e8d37594176830662869fcd31c..c8932777bba8d61d36842efd529e7ac6444db0d1 100644 (file)
--- a/crypto/hctr2.c
+++ b/crypto/hctr2.c
@@ -570,7 +570,7 @@ static void __exit hctr2_module_exit(void)
                                           ARRAY_SIZE(hctr2_tmpls));
 }
 
-subsys_initcall(hctr2_module_init);
+module_init(hctr2_module_init);
 module_exit(hctr2_module_exit);
 
 MODULE_DESCRIPTION("HCTR2 length-preserving encryption mode");

diff --git a/crypto/hmac.c b/crypto/hmac.c
index dfb153511865f96bd81e89a2cc4538dc28742b4e..ba36ddf50037189e1855459d917ba9fd75dd80e1 100644 (file)
--- a/crypto/hmac.c
+++ b/crypto/hmac.c
@@ -257,7 +257,7 @@ static void __exit hmac_module_exit(void)
        crypto_unregister_template(&hmac_tmpl);
 }
 
-subsys_initcall(hmac_module_init);
+module_init(hmac_module_init);
 module_exit(hmac_module_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/khazad.c b/crypto/khazad.c
index 7ad338ca2c18fca6408e605af9a435fa49fc84b4..024264ee9cd185ff6cf656663c46269ef2708dff 100644 (file)
--- a/crypto/khazad.c
+++ b/crypto/khazad.c
@@ -871,7 +871,7 @@ static void __exit khazad_mod_fini(void)
 }
 
 
-subsys_initcall(khazad_mod_init);
+module_init(khazad_mod_init);
 module_exit(khazad_mod_fini);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/krb5enc.c b/crypto/krb5enc.c
index d07769bf149e52f239aa3a31806bc81eddd7a127..a1de55994d922beeeaa5d6d560aed75f3e534d21 100644 (file)
--- a/crypto/krb5enc.c
+++ b/crypto/krb5enc.c
@@ -496,7 +496,7 @@ static void __exit crypto_krb5enc_module_exit(void)
        crypto_unregister_template(&crypto_krb5enc_tmpl);
 }
 
-subsys_initcall(crypto_krb5enc_module_init);
+module_init(crypto_krb5enc_module_init);
 module_exit(crypto_krb5enc_module_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/lrw.c b/crypto/lrw.c
index 391ae0f7641ff90ffe4ac29fc25f836b716e2a32..e7f0368f8c97818dd6083be436f38ca98dbc9bb7 100644 (file)
--- a/crypto/lrw.c
+++ b/crypto/lrw.c
@@ -420,7 +420,7 @@ static void __exit lrw_module_exit(void)
        crypto_unregister_template(&lrw_tmpl);
 }
 
-subsys_initcall(lrw_module_init);
+module_init(lrw_module_init);
 module_exit(lrw_module_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/lz4.c b/crypto/lz4.c
index 9661ed01692feaca27665911b12849dff0798caf..7a984ae5ae52ea3d6d44bdf780c3affd6697abea 100644 (file)
--- a/crypto/lz4.c
+++ b/crypto/lz4.c
@@ -89,7 +89,7 @@ static void __exit lz4_mod_fini(void)
        crypto_unregister_scomp(&scomp);
 }
 
-subsys_initcall(lz4_mod_init);
+module_init(lz4_mod_init);
 module_exit(lz4_mod_fini);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/lz4hc.c b/crypto/lz4hc.c
index a637fddc1ccd89a28bc115667aa5171c1618fe03..9c61d05b621429e8e7af3ff94909079c500d7383 100644 (file)
--- a/crypto/lz4hc.c
+++ b/crypto/lz4hc.c
@@ -87,7 +87,7 @@ static void __exit lz4hc_mod_fini(void)
        crypto_unregister_scomp(&scomp);
 }
 
-subsys_initcall(lz4hc_mod_init);
+module_init(lz4hc_mod_init);
 module_exit(lz4hc_mod_fini);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/lzo-rle.c b/crypto/lzo-rle.c
index e7efcf107179908d5e68b9709c339c41a6e374a2..ba013f2d5090d534fcb00d04777764bcaf052906 100644 (file)
--- a/crypto/lzo-rle.c
+++ b/crypto/lzo-rle.c
@@ -91,7 +91,7 @@ static void __exit lzorle_mod_fini(void)
        crypto_unregister_scomp(&scomp);
 }
 
-subsys_initcall(lzorle_mod_init);
+module_init(lzorle_mod_init);
 module_exit(lzorle_mod_fini);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/lzo.c b/crypto/lzo.c
index f1b36a1ca6f6bcd1a173f5360e7815df56165f10..7867e2c67c4ed1307addbf16c518bec223994bea 100644 (file)
--- a/crypto/lzo.c
+++ b/crypto/lzo.c
@@ -91,7 +91,7 @@ static void __exit lzo_mod_fini(void)
        crypto_unregister_scomp(&scomp);
 }
 
-subsys_initcall(lzo_mod_init);
+module_init(lzo_mod_init);
 module_exit(lzo_mod_fini);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/md4.c b/crypto/md4.c
index 2e7f2f319f95037a97b8cc978da8873cdf27ab6e..55bf47e23c13dad27dae33f061634325ebce5670 100644 (file)
--- a/crypto/md4.c
+++ b/crypto/md4.c
@@ -233,7 +233,7 @@ static void __exit md4_mod_fini(void)
        crypto_unregister_shash(&alg);
 }
 
-subsys_initcall(md4_mod_init);
+module_init(md4_mod_init);
 module_exit(md4_mod_fini);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/md5.c b/crypto/md5.c
index 994005cd977d130ef5b6d42c79e98d6c2ce371ee..32c0819f51185890ebad0cfa5281a11e49d275b6 100644 (file)
--- a/crypto/md5.c
+++ b/crypto/md5.c
@@ -216,7 +216,7 @@ static void __exit md5_mod_fini(void)
        crypto_unregister_shash(&alg);
 }
 
-subsys_initcall(md5_mod_init);
+module_init(md5_mod_init);
 module_exit(md5_mod_fini);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/michael_mic.c b/crypto/michael_mic.c
index 0d14e980d4d6135cdc08a411b4e4bdfca2506730..69ad35f524d7bc8bd95d13ff81683bdb9f405941 100644 (file)
--- a/crypto/michael_mic.c
+++ b/crypto/michael_mic.c
@@ -167,7 +167,7 @@ static void __exit michael_mic_exit(void)
 }
 
 
-subsys_initcall(michael_mic_init);
+module_init(michael_mic_init);
 module_exit(michael_mic_exit);
 
 MODULE_LICENSE("GPL v2");

diff --git a/crypto/nhpoly1305.c b/crypto/nhpoly1305.c
index a661d4f667cde54199fd120d196f21d64f5c1dfb..2b648615b5ec0129b7a5e7c3c3b940dfc235addf 100644 (file)
--- a/crypto/nhpoly1305.c
+++ b/crypto/nhpoly1305.c
@@ -245,7 +245,7 @@ static void __exit nhpoly1305_mod_exit(void)
        crypto_unregister_shash(&nhpoly1305_alg);
 }
 
-subsys_initcall(nhpoly1305_mod_init);
+module_init(nhpoly1305_mod_init);
 module_exit(nhpoly1305_mod_exit);
 
 MODULE_DESCRIPTION("NHPoly1305 ε-almost-∆-universal hash function");

diff --git a/crypto/pcbc.c b/crypto/pcbc.c
index 9d2e56d6744a99dde37fba7446a95ee9082d4b08..d092717ea4fc29ad3711b1c809029ed46dc4fe28 100644 (file)
--- a/crypto/pcbc.c
+++ b/crypto/pcbc.c
@@ -186,7 +186,7 @@ static void __exit crypto_pcbc_module_exit(void)
        crypto_unregister_template(&crypto_pcbc_tmpl);
 }
 
-subsys_initcall(crypto_pcbc_module_init);
+module_init(crypto_pcbc_module_init);
 module_exit(crypto_pcbc_module_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/pcrypt.c b/crypto/pcrypt.c
index 7fc79e7dce44a91fc0ac11fd96d0b46aac2c40fd..c33d29a523e0206d0fa19d065d03ad5ff1814b45 100644 (file)
--- a/crypto/pcrypt.c
+++ b/crypto/pcrypt.c
@@ -381,7 +381,7 @@ static void __exit pcrypt_exit(void)
        kset_unregister(pcrypt_kset);
 }
 
-subsys_initcall(pcrypt_init);
+module_init(pcrypt_init);
 module_exit(pcrypt_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/polyval-generic.c b/crypto/polyval-generic.c
index ffd174e75420be20eb0f1514c7705b092faa6425..db8adb56e4cac45ffd16e680f1a5a32f590e88bd 100644 (file)
--- a/crypto/polyval-generic.c
+++ b/crypto/polyval-generic.c
@@ -196,7 +196,7 @@ static void __exit polyval_mod_exit(void)
        crypto_unregister_shash(&polyval_alg);
 }
 
-subsys_initcall(polyval_mod_init);
+module_init(polyval_mod_init);
 module_exit(polyval_mod_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/rmd160.c b/crypto/rmd160.c
index 890d29e46a76c6d9b66c77ee94554f93af399a4f..9860b60c9be470d6d7221197191adbb8bae7fe32 100644 (file)
--- a/crypto/rmd160.c
+++ b/crypto/rmd160.c
@@ -342,7 +342,7 @@ static void __exit rmd160_mod_fini(void)
        crypto_unregister_shash(&alg);
 }
 
-subsys_initcall(rmd160_mod_init);
+module_init(rmd160_mod_init);
 module_exit(rmd160_mod_fini);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/rsa.c b/crypto/rsa.c
index b7d21529c552299614e4d4b789e53456d96f731e..6c7734083c986af7890ddf346675fdedfa9f64f5 100644 (file)
--- a/crypto/rsa.c
+++ b/crypto/rsa.c
@@ -430,7 +430,7 @@ static void __exit rsa_exit(void)
        crypto_unregister_akcipher(&rsa);
 }
 
-subsys_initcall(rsa_init);
+module_init(rsa_init);
 module_exit(rsa_exit);
 MODULE_ALIAS_CRYPTO("rsa");
 MODULE_LICENSE("GPL");

diff --git a/crypto/seed.c b/crypto/seed.c
index d05d8ed909fa7639b4c3f076462cd243691ce44c..815391f213de6de9f68f8cecadc7b67054686dbe 100644 (file)
--- a/crypto/seed.c
+++ b/crypto/seed.c
@@ -460,7 +460,7 @@ static void __exit seed_fini(void)
        crypto_unregister_alg(&seed_alg);
 }
 
-subsys_initcall(seed_init);
+module_init(seed_init);
 module_exit(seed_fini);
 
 MODULE_DESCRIPTION("SEED Cipher Algorithm");

diff --git a/crypto/seqiv.c b/crypto/seqiv.c
index 17e11d51ddc36370265f4b2a6e3bf3933895c005..a17ef51843989ee35267200269de3723ee4b712e 100644 (file)
--- a/crypto/seqiv.c
+++ b/crypto/seqiv.c
@@ -179,7 +179,7 @@ static void __exit seqiv_module_exit(void)
        crypto_unregister_template(&seqiv_tmpl);
 }
 
-subsys_initcall(seqiv_module_init);
+module_init(seqiv_module_init);
 module_exit(seqiv_module_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/serpent_generic.c b/crypto/serpent_generic.c
index f6ef187be6fe7a715a994e2c62fb155ee836bcb1..b21e7606c65296f2d90ced65305af3c9f5cc6ab8 100644 (file)
--- a/crypto/serpent_generic.c
+++ b/crypto/serpent_generic.c
@@ -599,7 +599,7 @@ static void __exit serpent_mod_fini(void)
        crypto_unregister_alg(&srp_alg);
 }
 
-subsys_initcall(serpent_mod_init);
+module_init(serpent_mod_init);
 module_exit(serpent_mod_fini);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/sha1_generic.c b/crypto/sha1_generic.c
index 7a3c837923b5acab5e250625acdea34f600f9da0..024e8043bab0249af2b4e5d672c87e5aa526fe2b 100644 (file)
--- a/crypto/sha1_generic.c
+++ b/crypto/sha1_generic.c
@@ -77,7 +77,7 @@ static void __exit sha1_generic_mod_fini(void)
        crypto_unregister_shash(&alg);
 }
 
-subsys_initcall(sha1_generic_mod_init);
+module_init(sha1_generic_mod_init);
 module_exit(sha1_generic_mod_fini);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/sha256.c b/crypto/sha256.c
index c2588d08ee3ed273fecd9b5bb07c33d11eb2edec..47ad7e4cc55f710658d1350a86bdef2225f6eae9 100644 (file)
--- a/crypto/sha256.c
+++ b/crypto/sha256.c
@@ -224,7 +224,7 @@ static int __init crypto_sha256_mod_init(void)
                num_algs /= 2;
        return crypto_register_shashes(algs, ARRAY_SIZE(algs));
 }
-subsys_initcall(crypto_sha256_mod_init);
+module_init(crypto_sha256_mod_init);
 
 static void __exit crypto_sha256_mod_exit(void)
 {

diff --git a/crypto/sha512_generic.c b/crypto/sha512_generic.c
index bfea65f4181cf379dfeb6baecbae3ac0a28c1dfb..7368173f545eb2c947c10f87e4602fd33a758868 100644 (file)
--- a/crypto/sha512_generic.c
+++ b/crypto/sha512_generic.c
@@ -205,7 +205,7 @@ static void __exit sha512_generic_mod_fini(void)
        crypto_unregister_shashes(sha512_algs, ARRAY_SIZE(sha512_algs));
 }
 
-subsys_initcall(sha512_generic_mod_init);
+module_init(sha512_generic_mod_init);
 module_exit(sha512_generic_mod_fini);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/sm3_generic.c b/crypto/sm3_generic.c
index 4fb6957c2f0c9861bc08b1a6be2df157bef24192..7529139fcc966d1e27e4690a415c1eeca42b671e 100644 (file)
--- a/crypto/sm3_generic.c
+++ b/crypto/sm3_generic.c
@@ -62,7 +62,7 @@ static void __exit sm3_generic_mod_fini(void)
        crypto_unregister_shash(&sm3_alg);
 }
 
-subsys_initcall(sm3_generic_mod_init);
+module_init(sm3_generic_mod_init);
 module_exit(sm3_generic_mod_fini);
 
 MODULE_LICENSE("GPL v2");

diff --git a/crypto/sm4_generic.c b/crypto/sm4_generic.c
index 7df86369ac0091b11d0980925935b40749f2612f..d57444e8428cbf7f3d3ad04311eaa92d66309594 100644 (file)
--- a/crypto/sm4_generic.c
+++ b/crypto/sm4_generic.c
@@ -83,7 +83,7 @@ static void __exit sm4_fini(void)
        crypto_unregister_alg(&sm4_alg);
 }
 
-subsys_initcall(sm4_init);
+module_init(sm4_init);
 module_exit(sm4_fini);
 
 MODULE_DESCRIPTION("SM4 Cipher Algorithm");

diff --git a/crypto/streebog_generic.c b/crypto/streebog_generic.c
index 99c07e0c10baa6f4dc29b7da224eb08b7df05500..57bbf70f4c22774bbbe9544e7800e26af076ba66 100644 (file)
--- a/crypto/streebog_generic.c
+++ b/crypto/streebog_generic.c
@@ -1061,7 +1061,7 @@ static void __exit streebog_mod_fini(void)
        crypto_unregister_shashes(algs, ARRAY_SIZE(algs));
 }
 
-subsys_initcall(streebog_mod_init);
+module_init(streebog_mod_init);
 module_exit(streebog_mod_fini);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/tea.c b/crypto/tea.c
index b315da8c89ebca78d9ba89ad2d82f138c202a9e3..cb05140e3470cebf9f8fe0e7ee77ffa28af0f388 100644 (file)
--- a/crypto/tea.c
+++ b/crypto/tea.c
@@ -255,7 +255,7 @@ MODULE_ALIAS_CRYPTO("tea");
 MODULE_ALIAS_CRYPTO("xtea");
 MODULE_ALIAS_CRYPTO("xeta");
 
-subsys_initcall(tea_mod_init);
+module_init(tea_mod_init);
 module_exit(tea_mod_fini);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/twofish_generic.c b/crypto/twofish_generic.c
index 19f2b365e140b2a4c5ab0feb75bc5f01f982f42d..368018cfa9bfa48b4df4e23b829f374492c88ac6 100644 (file)
--- a/crypto/twofish_generic.c
+++ b/crypto/twofish_generic.c
@@ -187,7 +187,7 @@ static void __exit twofish_mod_fini(void)
        crypto_unregister_alg(&alg);
 }
 
-subsys_initcall(twofish_mod_init);
+module_init(twofish_mod_init);
 module_exit(twofish_mod_fini);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/wp512.c b/crypto/wp512.c
index 07994e5ebf4ef257b230f5b874c469cbdca694fd..41f13d49033390653c15d79c742ccfe7bbc1a5c8 100644 (file)
--- a/crypto/wp512.c
+++ b/crypto/wp512.c
@@ -1169,7 +1169,7 @@ MODULE_ALIAS_CRYPTO("wp512");
 MODULE_ALIAS_CRYPTO("wp384");
 MODULE_ALIAS_CRYPTO("wp256");
 
-subsys_initcall(wp512_mod_init);
+module_init(wp512_mod_init);
 module_exit(wp512_mod_fini);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/xcbc.c b/crypto/xcbc.c
index 970ff581dc5894702684014c6710ac8cb04bdcf6..6c5f6766fdd68a6fd7739cc90dc9670fd677f2c6 100644 (file)
--- a/crypto/xcbc.c
+++ b/crypto/xcbc.c
@@ -199,7 +199,7 @@ static void __exit crypto_xcbc_module_exit(void)
        crypto_unregister_template(&crypto_xcbc_tmpl);
 }
 
-subsys_initcall(crypto_xcbc_module_init);
+module_init(crypto_xcbc_module_init);
 module_exit(crypto_xcbc_module_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/xctr.c b/crypto/xctr.c
index 9c536ab6d2e5958d31288513880f96c489591b3b..607ab82cb19b0b63b0defaab36b4a6dfbc6d15e3 100644 (file)
--- a/crypto/xctr.c
+++ b/crypto/xctr.c
@@ -182,7 +182,7 @@ static void __exit crypto_xctr_module_exit(void)
        crypto_unregister_template(&crypto_xctr_tmpl);
 }
 
-subsys_initcall(crypto_xctr_module_init);
+module_init(crypto_xctr_module_init);
 module_exit(crypto_xctr_module_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/xts.c b/crypto/xts.c
index 31529c9ef08f8f16c4c7a0d0b38203dad5296748..1a9edd55a3a25c1a16fada15646eadfe692fe03f 100644 (file)
--- a/crypto/xts.c
+++ b/crypto/xts.c
@@ -466,7 +466,7 @@ static void __exit xts_module_exit(void)
        crypto_unregister_template(&xts_tmpl);
 }
 
-subsys_initcall(xts_module_init);
+module_init(xts_module_init);
 module_exit(xts_module_exit);
 
 MODULE_LICENSE("GPL");

diff --git a/crypto/xxhash_generic.c b/crypto/xxhash_generic.c
index ac206ad4184df1cd14a398a7e6f4be9639e5520c..175bb7ae0fcdad33d4b08520a03980d8a0b1c155 100644 (file)
--- a/crypto/xxhash_generic.c
+++ b/crypto/xxhash_generic.c
@@ -96,7 +96,7 @@ static void __exit xxhash_mod_fini(void)
        crypto_unregister_shash(&alg);
 }
 
-subsys_initcall(xxhash_mod_init);
+module_init(xxhash_mod_init);
 module_exit(xxhash_mod_fini);
 
 MODULE_AUTHOR("Nikolay Borisov <nborisov@suse.com>");

diff --git a/crypto/zstd.c b/crypto/zstd.c
index 90bb4f36f8467898bd845dd62a848c23c43d1437..7570e11b4ee60d0fee9e468bb1cea3251a8c96f4 100644 (file)
--- a/crypto/zstd.c
+++ b/crypto/zstd.c
@@ -196,7 +196,7 @@ static void __exit zstd_mod_fini(void)
        crypto_unregister_scomp(&scomp);
 }
 
-subsys_initcall(zstd_mod_init);
+module_init(zstd_mod_init);
 module_exit(zstd_mod_fini);
 
 MODULE_LICENSE("GPL");