diff options
author | Josh Boyer <jwboyer@redhat.com> | 2011-11-01 15:13:32 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@redhat.com> | 2011-11-01 15:15:29 -0400 |
commit | 906f34d53bd601a61ff7567e00495c78aa5f62ef (patch) | |
tree | 27d7c0d99f19bb4c008204aec3a9e58595ac7b49 /crypto-register-cryptd-first.patch | |
parent | bf976a17c4b2c2b164f6413d52ffbdab09a26d1a (diff) | |
download | kernel-906f34d53bd601a61ff7567e00495c78aa5f62ef.tar.gz kernel-906f34d53bd601a61ff7567e00495c78aa5f62ef.tar.xz kernel-906f34d53bd601a61ff7567e00495c78aa5f62ef.zip |
Linux 3.1-git4 (upstream dc47d3810cdc)
Diffstat (limited to 'crypto-register-cryptd-first.patch')
-rw-r--r-- | crypto-register-cryptd-first.patch | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/crypto-register-cryptd-first.patch b/crypto-register-cryptd-first.patch deleted file mode 100644 index 0cd55d6fc..000000000 --- a/crypto-register-cryptd-first.patch +++ /dev/null @@ -1,26 +0,0 @@ -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"); |