提交 b9703254 编写于 作者: H Herbert Xu 提交者: Zheng Zengkai

crypto: api - Move cryptomgr soft dependency into algapi

stable inclusion
from stable-v5.10.100
commit 2951d21689762a2bb6b2a81e9d5ea49a1c396be4
bugzilla: https://gitee.com/openeuler/kernel/issues/I55O9Y

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2951d21689762a2bb6b2a81e9d5ea49a1c396be4

--------------------------------

commit c6ce9c58 upstream.

The soft dependency on cryptomgr is only needed in algapi because
if algapi isn't present then no algorithms can be loaded.  This
also fixes the case where api is built-in but algapi is built as
a module as the soft dependency would otherwise get lost.

Fixes: 8ab23d54 ("crypto: api - Add softdep on cryptomgr")
Reported-by: NJan Beulich <jbeulich@suse.com>
Signed-off-by: NHerbert Xu <herbert@gondor.apana.org.au>
Tested-by: NJan Beulich <jbeulich@suse.com>
Signed-off-by: NHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYu Liao <liaoyu15@huawei.com>
Reviewed-by: NWei Li <liwei391@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 9d53f7d4
...@@ -1295,3 +1295,4 @@ module_exit(crypto_algapi_exit); ...@@ -1295,3 +1295,4 @@ module_exit(crypto_algapi_exit);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Cryptographic algorithms API"); MODULE_DESCRIPTION("Cryptographic algorithms API");
MODULE_SOFTDEP("pre: cryptomgr");
...@@ -603,4 +603,3 @@ EXPORT_SYMBOL_GPL(crypto_req_done); ...@@ -603,4 +603,3 @@ EXPORT_SYMBOL_GPL(crypto_req_done);
MODULE_DESCRIPTION("Cryptographic core API"); MODULE_DESCRIPTION("Cryptographic core API");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_SOFTDEP("pre: cryptomgr");
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册