Merge tag 'v3.12'

[~andy/linux] / security / capability.c

diff --git a/security/capability.c b/security/capability.c
index b6d779b6aa25864e99557a77bbe2f06856d1f5ea..8b4f24ae43381de05af67271edd9a8ddd57c651f 100644 (file)
--- 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;