VisionFive2 Linux kernel

author: Linus Torvalds <torvalds@linux-foundation.org> 2021-05-01 15:32:18 -0700 committer: Linus Torvalds <torvalds@linux-foundation.org> 2021-05-01 15:32:18 -0700 commit: e6f0bf09f0669b3c2cd77fa906830123279a0a21 parent: 10a3efd0fee5e881b1866cf45950808575cb0f24

Commit Summary:

Merge tag 'integrity-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity

Diffstat:

1 file changed, 6 insertions, 0 deletions

diff --git a/include/keys/system_keyring.h b/include/keys/system_keyring.h
index 875e002a4180..6acd3cf13a18 100644
--- a/include/keys/system_keyring.h
+++ b/include/keys/system_keyring.h
@@ -16,9 +16,16 @@ extern int restrict_link_by_builtin_trusted(struct key *keyring,
 					    const struct key_type *type,
 					    const union key_payload *payload,
 					    struct key *restriction_key);
+extern __init int load_module_cert(struct key *keyring);
 
 #else
 #define restrict_link_by_builtin_trusted restrict_link_reject
+
+static inline __init int load_module_cert(struct key *keyring)
+{
+	return 0;
+}
+
 #endif
 
 #ifdef CONFIG_SECONDARY_TRUSTED_KEYRING