diff options
author | Josh Boyer <jwboyer@redhat.com> | 2011-08-19 08:32:04 -0400 |
---|---|---|
committer | Josh Boyer <jwboyer@redhat.com> | 2011-08-19 08:32:04 -0400 |
commit | c3c2b77d29fe2057cb4647f2810b6415ff55fadb (patch) | |
tree | 0e670b7f53fedfda92998b01e5eb30c4636c0704 /crypto-register-cryptd-first.patch | |
parent | 02587b4efa279dbcc9d7f80fd7636074bb905012 (diff) | |
download | kernel-c3c2b77d29fe2057cb4647f2810b6415ff55fadb.tar.gz kernel-c3c2b77d29fe2057cb4647f2810b6415ff55fadb.tar.xz kernel-c3c2b77d29fe2057cb4647f2810b6415ff55fadb.zip |
3.1-rc2-git5 snapshot
Make XHCI builtin, add a patch to fix a race in the crypto framework
Diffstat (limited to 'crypto-register-cryptd-first.patch')
-rw-r--r-- | crypto-register-cryptd-first.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/crypto-register-cryptd-first.patch b/crypto-register-cryptd-first.patch new file mode 100644 index 000000000..0cd55d6fc --- /dev/null +++ b/crypto-register-cryptd-first.patch @@ -0,0 +1,26 @@ +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"); |