aboutsummaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2011-08-19 16:11:23 +0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-11 09:37:17 -0800
commit6dd160db729a0c96cc640a848e6df88ca6c19d2a (patch)
tree219db04ff2445d1a721b5c8b353185956b07ab24 /crypto
parentf450df800450e9c7ec8c53bdb72d6c4ef5f17d4e (diff)
downloadkernel_samsung_smdk4412-6dd160db729a0c96cc640a848e6df88ca6c19d2a.zip
kernel_samsung_smdk4412-6dd160db729a0c96cc640a848e6df88ca6c19d2a.tar.gz
kernel_samsung_smdk4412-6dd160db729a0c96cc640a848e6df88ca6c19d2a.tar.bz2
crypto: cryptd - Use subsys_initcall to prevent races with aesni
commit b2bac6acf86d05d8af0499f37d91ecac15722803 upstream. 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. Tested-by: Josh Boyer <jwboyer@redhat.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Cc: Kerin Millar <kerframil@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/cryptd.c2
1 files changed, 1 insertions, 1 deletions
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");