summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authorTim Chen <tim.c.chen@linux.intel.com>2014-03-17 23:52:26 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-06-07 20:25:35 (GMT)
commitd2157c29092990941b82488a3653d95fc9e2cb7a (patch)
treeef0f55272d9b301d53d48a75f116537c90fd18d8 /crypto
parentb944e0e0b84a1f8871b09723a1d035d70368e298 (diff)
downloadlinux-3.10-d2157c29092990941b82488a3653d95fc9e2cb7a.zip
linux-3.10-d2157c29092990941b82488a3653d95fc9e2cb7a.tar.gz
linux-3.10-d2157c29092990941b82488a3653d95fc9e2cb7a.tar.bz2
crypto: crypto_wq - Fix late crypto work queue initialization
commit 130fa5bc81b44b6cc1fbdea3abf6db0da22964e0 upstream. The crypto algorithm modules utilizing the crypto daemon could be used early when the system start up. Using module_init does not guarantee that the daemon's work queue is initialized when the cypto alorithm depending on crypto_wq starts. It is necessary to initialize the crypto work queue earlier at the subsystem init time to make sure that it is initialized when used. Signed-off-by: Tim Chen <tim.c.chen@linux.intel.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/crypto_wq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/crypto_wq.c b/crypto/crypto_wq.c
index adad92a..2f1b8d1 100644
--- a/crypto/crypto_wq.c
+++ b/crypto/crypto_wq.c
@@ -33,7 +33,7 @@ static void __exit crypto_wq_exit(void)
destroy_workqueue(kcrypto_wq);
}
-module_init(crypto_wq_init);
+subsys_initcall(crypto_wq_init);
module_exit(crypto_wq_exit);
MODULE_LICENSE("GPL");