diff --git a/[refs] b/[refs]
index 9d99ec338570..64b61c472aaf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b024d2446474c6a7c47573af5a35db83f557ce3
+refs/heads/master: e1c9b23adbe86c725738402857397d7a29f9d6ef
diff --git a/trunk/include/linux/evm.h b/trunk/include/linux/evm.h
index db5556dcdd27..62deb6557d37 100644
--- a/trunk/include/linux/evm.h
+++ b/trunk/include/linux/evm.h
@@ -45,7 +45,7 @@ static inline enum integrity_status evm_verifyxattr(struct dentry *dentry,
 }
 #endif
 
-static int evm_inode_setattr(struct dentry *dentry, struct iattr *attr)
+static inline int evm_inode_setattr(struct dentry *dentry, struct iattr *attr)
 {
 	return 0;
 }
diff --git a/trunk/include/linux/security.h b/trunk/include/linux/security.h
index 1c528b19a329..f399cf10e2a8 100644
--- a/trunk/include/linux/security.h
+++ b/trunk/include/linux/security.h
@@ -2048,6 +2048,13 @@ static inline int security_inode_init_security(struct inode *inode,
 	return -EOPNOTSUPP;
 }
 
+int security_old_inode_init_security(struct inode *inode, struct inode *dir,
+				     const struct qstr *qstr, char **name,
+				     void **value, size_t *len)
+{
+	return -EOPNOTSUPP;
+}
+
 static inline int security_inode_create(struct inode *dir,
 					 struct dentry *dentry,
 					 int mode)