Skip to content

Commit 2951d21

Browse files
herbertxgregkh
authored andcommitted
crypto: api - Move cryptomgr soft dependency into algapi
commit c6ce9c5 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: 8ab23d5 ("crypto: api - Add softdep on cryptomgr") Reported-by: Jan Beulich <jbeulich@suse.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Tested-by: Jan Beulich <jbeulich@suse.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent b62267b commit 2951d21

2 files changed

Lines changed: 1 addition & 1 deletion

File tree

crypto/algapi.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,3 +1295,4 @@ module_exit(crypto_algapi_exit);
12951295

12961296
MODULE_LICENSE("GPL");
12971297
MODULE_DESCRIPTION("Cryptographic algorithms API");
1298+
MODULE_SOFTDEP("pre: cryptomgr");

crypto/api.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -603,4 +603,3 @@ EXPORT_SYMBOL_GPL(crypto_req_done);
603603

604604
MODULE_DESCRIPTION("Cryptographic core API");
605605
MODULE_LICENSE("GPL");
606-
MODULE_SOFTDEP("pre: cryptomgr");

0 commit comments

Comments
 (0)