Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar...

[sfrench/cifs-2.6.git] / security / integrity / digsig.c

diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c
index ceb10553a6ba64a093a747bf1f5f1605ba9fecf6..f9f3c8ffe7864e1f9b6441f0e6c1aa3cabdfc322 100644 (file)
--- a/security/integrity/digsig.c
+++ b/security/integrity/digsig.c
@@ -70,8 +70,9 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen,
        return -EOPNOTSUPP;
 }
 
-static int __integrity_init_keyring(const unsigned int id, struct key_acl *acl,
-                                   struct key_restriction *restriction)
+static int __init __integrity_init_keyring(const unsigned int id,
+                                          struct key_acl *acl,
+                                          struct key_restriction *restriction)
 {
        const struct cred *cred = current_cred();
        int err = 0;