c3c2b77d29
Make XHCI builtin, add a patch to fix a race in the crypto framework
27 lines
891 B
Diff
27 lines
891 B
Diff
commit 9d4c522a113f6caa8b792ae829a25490fa87b1a2
|
|
Author: Herbert Xu <herbert@gondor.apana.org.au>
|
|
Date: Fri Aug 19 16:11:23 2011 +0800
|
|
|
|
crypto: cryptd - Use subsys_initcall to prevent races with aesni
|
|
|
|
As cryptd is depeneded on by other algorithms such as aesni-intel,
|
|
it needs to be registered before them. When everything is built
|
|
as modules, this occurs naturally. However, for this to work when
|
|
they are built-in, we need to use subsys_initcall in cryptd.
|
|
|
|
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
|
|
|
|
diff --git a/crypto/cryptd.c b/crypto/cryptd.c
|
|
index e46d21a..671d4d6 100644
|
|
--- a/crypto/cryptd.c
|
|
+++ b/crypto/cryptd.c
|
|
@@ -945,7 +945,7 @@ static void __exit cryptd_exit(void)
|
|
crypto_unregister_template(&cryptd_tmpl);
|
|
}
|
|
|
|
-module_init(cryptd_init);
|
|
+subsys_initcall(cryptd_init);
|
|
module_exit(cryptd_exit);
|
|
|
|
MODULE_LICENSE("GPL");
|