Merge tag 'v3.16' into next

Linux 3.16

1 files changed, 1 insertions, 1 deletions

diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 39bc8c94b969..b0e940497e23 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -5736,7 +5736,7 @@ static void selinux_key_free(struct key *k)
 
 static int selinux_key_permission(key_ref_t key_ref,
                                   const struct cred *cred,
-                                  key_perm_t perm)
+                                  unsigned perm)
 {
         struct key *key;
         struct key_security_struct *ksec;