diff --git a/[refs] b/[refs]
index fb8e692a7aee..7978522d2cda 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b340e8a57ef381e69c99a7a8ede61a6bf71a8014
+refs/heads/master: f9247273cb69ba101877e946d2d83044409cc8c5
diff --git a/trunk/fs/ufs/super.c b/trunk/fs/ufs/super.c
index 85b22b5977fa..506f724055c2 100644
--- a/trunk/fs/ufs/super.c
+++ b/trunk/fs/ufs/super.c
@@ -1232,7 +1232,7 @@ static int ufs_show_options(struct seq_file *seq, struct vfsmount *vfs)
 {
 	struct ufs_sb_info *sbi = UFS_SB(vfs->mnt_sb);
 	unsigned mval = sbi->s_mount_opt & UFS_MOUNT_UFSTYPE;
-	struct match_token *tp = tokens;
+	const struct match_token *tp = tokens;
 
 	while (tp->token != Opt_onerror_panic && tp->token != mval)
 		++tp;
diff --git a/trunk/include/linux/parser.h b/trunk/include/linux/parser.h
index 7dcd05075756..cc554ca8bc78 100644
--- a/trunk/include/linux/parser.h
+++ b/trunk/include/linux/parser.h
@@ -14,7 +14,7 @@ struct match_token {
 	const char *pattern;
 };
 
-typedef struct match_token match_table_t[];
+typedef const struct match_token match_table_t[];
 
 /* Maximum number of arguments that match_token will find in a pattern */
 enum {MAX_OPT_ARGS = 3};