Merge tag 'v5.3-rc1' into docs-next

[linux.git] / security / integrity / integrity.h

diff --git a/security/integrity/integrity.h b/security/integrity/integrity.h
index 875c6a7a5af1a63113e838d86caa7112274cd77a..ed12d8e13d043c164425d0dff5be161a7143881f 100644 (file)
--- a/security/integrity/integrity.h
+++ b/security/integrity/integrity.h
@@ -12,8 +12,6 @@
 #include <linux/key.h>
 #include <linux/audit.h>
 
-struct key_acl;
-
 /* iint action cache flags */
 #define IMA_MEASURE            0x00000001
 #define IMA_MEASURED           0x00000002
@@ -157,7 +155,7 @@ int integrity_digsig_verify(const unsigned int id, const char *sig, int siglen,
 int __init integrity_init_keyring(const unsigned int id);
 int __init integrity_load_x509(const unsigned int id, const char *path);
 int __init integrity_load_cert(const unsigned int id, const char *source,
-                              const void *data, size_t len, struct key_acl *acl);
+                              const void *data, size_t len, key_perm_t perm);
 #else
 
 static inline int integrity_digsig_verify(const unsigned int id,
@@ -175,7 +173,7 @@ static inline int integrity_init_keyring(const unsigned int id)
 static inline int __init integrity_load_cert(const unsigned int id,
                                             const char *source,
                                             const void *data, size_t len,
-                                            struct key_acl *acl)
+                                            key_perm_t perm)
 {
        return 0;
 }