Fix initialization order bug

diff --git a/include/linux/module.h b/include/linux/module.h
index 3d988c187ec8b30c1aba6e2839e24788f94706f1..812aa35050e58e96865c29ff30ecfc075c970bf5 100644 (file)
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -9,7 +9,7 @@
 struct module;
 
 #define module_init(initfn)                                    \
-       __attribute__((constructor(109)))                       \
+       __attribute__((constructor(120)))                       \
        static void __call_##initfn(void) { BUG_ON(initfn()); }
 
 #if 0

diff --git a/linux/crypto/sha1_generic.c b/linux/crypto/sha1_generic.c
index b0b9cd15b6aeca09fccdf48a749efd2c7ba6b766..31b5d12eb5e018ee3899fb0b1fa0cc397eff765e 100644 (file)
--- a/linux/crypto/sha1_generic.c
+++ b/linux/crypto/sha1_generic.c
@@ -78,15 +78,8 @@ static struct shash_alg alg = {
        }
 };
 
+__attribute__((constructor(110)))
 static int __init sha1_generic_mod_init(void)
 {
        return crypto_register_shash(&alg);
 }
-
-static void __exit sha1_generic_mod_fini(void)
-{
-       crypto_unregister_shash(&alg);
-}
-
-module_init(sha1_generic_mod_init);
-module_exit(sha1_generic_mod_fini);