diff options
author | Paul Moore <pmoore@redhat.com> | 2013-11-26 17:32:55 -0500 |
---|---|---|
committer | Paul Moore <pmoore@redhat.com> | 2013-11-26 17:32:55 -0500 |
commit | dd0a11815a339d6deeea8357574f8126a8404c92 (patch) | |
tree | c3c743ac6323e1caf9e987d6946cc4b2333a8256 /security/capability.c | |
parent | 42d64e1add3a1ce8a787116036163b8724362145 (diff) | |
parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) | |
download | op-kernel-dev-dd0a11815a339d6deeea8357574f8126a8404c92.zip op-kernel-dev-dd0a11815a339d6deeea8357574f8126a8404c92.tar.gz |
Merge tag 'v3.12'
Linux 3.12
Diffstat (limited to 'security/capability.c')
-rw-r--r-- | security/capability.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/capability.c b/security/capability.c index b6d779b..8b4f24a 100644 --- a/security/capability.c +++ b/security/capability.c @@ -129,7 +129,7 @@ static void cap_inode_free_security(struct inode *inode) } static int cap_inode_init_security(struct inode *inode, struct inode *dir, - const struct qstr *qstr, char **name, + const struct qstr *qstr, const char **name, void **value, size_t *len) { return -EOPNOTSUPP; |