diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2011-08-19 16:11:23 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-11-11 09:44:47 -0800 |
| commit | 48384756ccd3b787829007c48a29b8fada46beb8 (patch) | |
| tree | 6a412fd198bd17f09e24b8ef9365dadf6d64a5c4 | |
| parent | ca9b9d7bf6fc89a8a72c6aa37c683d02b7782b0b (diff) | |
| download | linux-stable-48384756ccd3b787829007c48a29b8fada46beb8.tar.gz linux-stable-48384756ccd3b787829007c48a29b8fada46beb8.tar.bz2 linux-stable-48384756ccd3b787829007c48a29b8fada46beb8.zip | |
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>
| -rw-r--r-- | crypto/cryptd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/cryptd.c b/crypto/cryptd.c index e46d21ae26bc..671d4d6d14df 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"); |