Merge branch 'stable-3.16' of git://git.infradead.org/users/pcmoore/selinux into...

[firefly-linux-kernel-4.4.55.git] / include / linux / security.h

diff --git a/include/linux/security.h b/include/linux/security.h
index 794be735ff4ba7e3aad3dcdb473d86bb7b48f43c..59820f8782a1184e01b31644f8680068ef284e83 100644 (file)
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -1711,7 +1711,7 @@ struct security_operations {
        void (*key_free) (struct key *key);
        int (*key_permission) (key_ref_t key_ref,
                               const struct cred *cred,
-                              key_perm_t perm);
+                              unsigned perm);
        int (*key_getsecurity)(struct key *key, char **_buffer);
 #endif /* CONFIG_KEYS */
 
@@ -3037,7 +3037,7 @@ static inline int security_path_chroot(struct path *path)
 int security_key_alloc(struct key *key, const struct cred *cred, unsigned long flags);
 void security_key_free(struct key *key);
 int security_key_permission(key_ref_t key_ref,
-                           const struct cred *cred, key_perm_t perm);
+                           const struct cred *cred, unsigned perm);
 int security_key_getsecurity(struct key *key, char **_buffer);
 
 #else
@@ -3055,7 +3055,7 @@ static inline void security_key_free(struct key *key)
 
 static inline int security_key_permission(key_ref_t key_ref,
                                          const struct cred *cred,
-                                         key_perm_t perm)
+                                         unsigned perm)
 {
        return 0;
 }