summaryrefslogtreecommitdiffstats
path: root/security/capability.c
diff options
context:
space:
mode:
authorPaul Moore <pmoore@redhat.com>2013-11-08 19:56:38 +0100
committerPaul Moore <pmoore@redhat.com>2013-11-08 19:56:38 +0100
commit94851b18d4eb94f8bbf0d9176f7429bd8e371f62 (patch)
treec3c743ac6323e1caf9e987d6946cc4b2333a8256 /security/capability.c
parentselinux: correct locking in selinux_netlbl_socket_connect) (diff)
parentLinux 3.12 (diff)
downloadlinux-94851b18d4eb94f8bbf0d9176f7429bd8e371f62.tar.xz
linux-94851b18d4eb94f8bbf0d9176f7429bd8e371f62.zip
Merge tag 'v3.12'
Linux 3.12
Diffstat (limited to 'security/capability.c')
-rw-r--r--security/capability.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/capability.c b/security/capability.c
index b6d779b6aa25..8b4f24ae4338 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;