diff --git a/[refs] b/[refs]
index 16a4b0caaaec..6806b832ddd1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c88d4c7b049e87998ac0a9f455aa545cc895ef92
+refs/heads/master: 4d6ec10bb4461fdc9a9ab94ef32934e13564e873
diff --git a/trunk/security/apparmor/lsm.c b/trunk/security/apparmor/lsm.c
index 7daf0d528037..8db33a8b50c4 100644
--- a/trunk/security/apparmor/lsm.c
+++ b/trunk/security/apparmor/lsm.c
@@ -278,8 +278,7 @@ static int apparmor_path_mknod(struct path *dir, struct dentry *dentry,
 	return common_perm_create(OP_MKNOD, dir, dentry, AA_MAY_CREATE, mode);
 }
 
-static int apparmor_path_truncate(struct path *path, loff_t length,
-				  unsigned int time_attrs)
+static int apparmor_path_truncate(struct path *path)
 {
 	struct path_cond cond = { path->dentry->d_inode->i_uid,
 				  path->dentry->d_inode->i_mode