Merge tag 'keys-20140314' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into next

1 files changed, 1 insertions, 1 deletions

diff --git a/security/security.c b/security/security.c
index 919cad93ac82..d91fec458e90 100644
--- a/security/security.c
+++ b/security/security.c
@@ -1407,7 +1407,7 @@ 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)
 {
         return security_ops->key_permission(key_ref, cred, perm);
 }