diff --git a/[refs] b/[refs] index aaf9691a6f73..7e35fff29be6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af7ff2c2c45e6c6d533dd968709732da3d1d48f8 +refs/heads/master: 1933ca8771585d43d3d2099c0c9ba7ca6b96e303 diff --git a/trunk/include/linux/security.h b/trunk/include/linux/security.h index 19d8e04e1688..051d4e96cb1f 100644 --- a/trunk/include/linux/security.h +++ b/trunk/include/linux/security.h @@ -2044,7 +2044,7 @@ static inline void security_inode_free(struct inode *inode) static inline int security_inode_init_security(struct inode *inode, struct inode *dir, const struct qstr *qstr, - initxattrs initxattrs, + const initxattrs initxattrs, void *fs_data) { return 0;