projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'serge-next-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh...
[linux-2.6-block.git]
/
security
/
security.c
diff --git
a/security/security.c
b/security/security.c
index 8b774f362a3d4ed252f626c8e6de5634a5820148..31614e9e96e556883aa947fc1360e9e03127883d 100644
(file)
--- a/
security/security.c
+++ b/
security/security.c
@@
-1425,7
+1425,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);
}