treewide: Convert typedef match_table_t to struct match_token, use const

index 856e9c3..cce6350 100644
@@ -662,7 +662,7 @@ enum {
 	Opt_uid, Opt_gid, Opt_mode, Opt_debug, Opt_err,
 };
 
-static const match_table_t spufs_tokens = {
+static const struct match_token spufs_tokens[] = {
 	{ Opt_uid,   "uid=%d" },
 	{ Opt_gid,   "gid=%d" },
 	{ Opt_mode,  "mode=%o" },

index 6fe874f..788ad70 100644
@@ -221,7 +221,7 @@ static int hypfs_release(struct inode *inode, struct file *filp)
 
 enum { opt_uid, opt_gid, opt_err };
 
-static const match_table_t hypfs_tokens = {
+static const struct match_token hypfs_tokens[] = {
 	{opt_uid, "uid=%u"},
 	{opt_gid, "gid=%u"},
 	{opt_err, NULL}

index 16dc364..2e6b155 100644
@@ -295,7 +295,7 @@ enum {
 	/* string args above */
 };
 
-static match_table_t rbdopt_tokens = {
+static const struct match_token rbdopt_tokens[] = {
 	{Opt_notify_timeout, "notify_timeout=%d"},
 	/* int args above */
 	/* string args above */

index 376d640..9cd404a 100644
@@ -1922,7 +1922,7 @@ enum {
 				   SRP_OPT_SERVICE_ID),
 };
 
-static const match_table_t srp_opt_tokens = {
+static const struct match_token srp_opt_tokens[] = {
 	{ SRP_OPT_ID_EXT,		"id_ext=%s" 		},
 	{ SRP_OPT_IOC_GUID,		"ioc_guid=%s" 		},
 	{ SRP_OPT_DGID,			"dgid=%s" 		},

index a5f44a6..427d98c 100644
@@ -1428,7 +1428,7 @@ enum {
 	Opt_target_node, Opt_tpgt, Opt_port_rtpi, Opt_target_lun, Opt_err
 };
 
-static match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_initiator_fabric, "initiator_fabric=%s"},
 	{Opt_initiator_node, "initiator_node=%s"},
 	{Opt_initiator_sid, "initiator_sid=%s"},

index 150c430..80186b8 100644
@@ -511,7 +511,7 @@ enum {
 	Opt_fd_dev_name, Opt_fd_dev_size, Opt_fd_buffered_io, Opt_err
 };
 
-static match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_fd_dev_name, "fd_dev_name=%s"},
 	{Opt_fd_dev_size, "fd_dev_size=%s"},
 	{Opt_fd_buffered_io, "fd_buffered_io=%d"},

index 8663900..0983975 100644
@@ -457,7 +457,7 @@ enum {
 	Opt_udev_path, Opt_force, Opt_err
 };
 
-static match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_udev_path, "udev_path=%s"},
 	{Opt_force, "force=%d"},
 	{Opt_err, NULL}

index 7ff6a35..13079a2 100644
@@ -940,7 +940,7 @@ enum {
 	Opt_scsi_lun_id, Opt_err
 };
 
-static match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_scsi_host_id, "scsi_host_id=%d"},
 	{Opt_scsi_channel_id, "scsi_channel_id=%d"},
 	{Opt_scsi_target_id, "scsi_target_id=%d"},

index 7837dd3..b3926fb 100644
@@ -925,7 +925,7 @@ enum {
 	Opt_rd_pages, Opt_err
 };
 
-static match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_rd_pages, "rd_pages=%d"},
 	{Opt_err, NULL}
 };

index 1b125c2..e29c57f 100644
@@ -96,7 +96,7 @@ enum {
 	Opt_err,
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_devuid, "devuid=%u"},
 	{Opt_devgid, "devgid=%u"},
 	{Opt_devmode, "devmode=%o"},

index c82b017..2387686 100644
@@ -61,7 +61,7 @@ enum {
 	Opt_err
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_debug, "debug=%x"},
 	{Opt_dfltuid, "dfltuid=%u"},
 	{Opt_dfltgid, "dfltgid=%u"},

index c8bf36a..8f581f3 100644
@@ -146,7 +146,7 @@ static int adfs_show_options(struct seq_file *seq, struct vfsmount *mnt)
 
 enum {Opt_uid, Opt_gid, Opt_ownmask, Opt_othmask, Opt_ftsuffix, Opt_err};
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_uid, "uid=%u"},
 	{Opt_gid, "gid=%u"},
 	{Opt_ownmask, "ownmask=%o"},

index b31507d..db45d2d 100644
@@ -152,7 +152,7 @@ enum {
 	Opt_verbose, Opt_volume, Opt_ignore, Opt_err,
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_bs, "bs=%u"},
 	{Opt_mode, "mode=%o"},
 	{Opt_mufs, "mufs"},

index fb240e8..423f4c4 100644
@@ -65,7 +65,7 @@ enum {
 	afs_opt_autocell,
 };
 
-static const match_table_t afs_options_list = {
+static const struct match_token afs_options_list[] = {
 	{ afs_opt_cell,		"cell=%s"	},
 	{ afs_opt_rwpath,	"rwpath"	},
 	{ afs_opt_vol,		"vol=%s"	},

index 180fa24..59d8119 100644
@@ -113,7 +113,7 @@ static const struct super_operations autofs4_sops = {
 enum {Opt_err, Opt_fd, Opt_uid, Opt_gid, Opt_pgrp, Opt_minproto, Opt_maxproto,
 	Opt_indirect, Opt_direct, Opt_offset};
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_fd, "fd=%u"},
 	{Opt_uid, "uid=%u"},
 	{Opt_gid, "gid=%u"},

index 54b8c28..ef606f0 100644
@@ -656,7 +656,7 @@ enum {
 	Opt_uid, Opt_gid, Opt_charset, Opt_debug, Opt_err,
 };
 
-static const match_table_t befs_tokens = {
+static const struct match_token befs_tokens[] = {
 	{Opt_uid, "uid=%d"},
 	{Opt_gid, "gid=%d"},
 	{Opt_charset, "iocharset=%s"},

index d3e542c..6b3cd45 100644
@@ -163,7 +163,7 @@ enum {
 	Opt_enospc_debug, Opt_err,
 };
 
-static match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_degraded, "degraded"},
 	{Opt_subvol, "subvol=%s"},
 	{Opt_subvolid, "subvolid=%d"},

index f2f77fd..d44d706 100644
@@ -134,7 +134,7 @@ enum {
 	Opt_ino32,
 };
 
-static match_table_t fsopt_tokens = {
+static const struct match_token fsopt_tokens[] = {
 	{Opt_wsize, "wsize=%d"},
 	{Opt_rsize, "rsize=%d"},
 	{Opt_caps_wanted_delay_min, "caps_wanted_delay_min=%d"},

index 2f27e57..cd2049f 100644
@@ -56,7 +56,7 @@ enum {
 	Opt_err
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_uid, "uid=%u"},
 	{Opt_gid, "gid=%u"},
 	{Opt_mode, "mode=%o"},

index 89b93389..b84029b 100644
@@ -246,7 +246,7 @@ enum { ecryptfs_opt_sig, ecryptfs_opt_ecryptfs_sig,
        ecryptfs_opt_unlink_sigs, ecryptfs_opt_mount_auth_tok_only,
        ecryptfs_opt_err };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{ecryptfs_opt_sig, "sig=%s"},
 	{ecryptfs_opt_ecryptfs_sig, "ecryptfs_sig=%s"},
 	{ecryptfs_opt_cipher, "cipher=%s"},

index 06065bd..3266988 100644
@@ -64,7 +64,7 @@ enum { Opt_name, Opt_pid, Opt_to, Opt_err };
  * kernel's parsing functions do not currently support that.  32-bit should be
  * sufficient for most applications now.
  */
-static match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_name, "osdname=%s"},
 	{Opt_pid, "pid=%u"},
 	{Opt_to, "to=%u"},

index 0a78dae..7b59ced 100644
@@ -397,7 +397,7 @@ enum {
 	Opt_usrquota, Opt_grpquota, Opt_reservation, Opt_noreservation
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_bsd_df, "bsddf"},
 	{Opt_minix_df, "minixdf"},
 	{Opt_grpid, "grpid"},

index aad153e..fdb022e 100644
@@ -824,7 +824,7 @@ enum {
 	Opt_resize, Opt_usrquota, Opt_grpquota
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_bsd_df, "bsddf"},
 	{Opt_minix_df, "minixdf"},
 	{Opt_grpid, "grpid"},

index 5147647..821c24e 100644
@@ -1280,7 +1280,7 @@ enum {
 	Opt_init_inode_table, Opt_noinit_inode_table,
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_bsd_df, "bsddf"},
 	{Opt_minix_df, "minixdf"},
 	{Opt_grpid, "grpid"},

index cb8d839..0aaaa89 100644
@@ -900,7 +900,7 @@ enum {
 	Opt_err_panic, Opt_err_ro, Opt_discard, Opt_err,
 };
 
-static const match_table_t fat_tokens = {
+static const struct match_token fat_tokens[] = {
 	{Opt_check_r, "check=relaxed"},
 	{Opt_check_s, "check=strict"},
 	{Opt_check_n, "check=normal"},

@@ -939,14 +939,14 @@ static const match_table_t fat_tokens = {
 	{Opt_obsolate, "posix"},
 	{Opt_err, NULL},
 };
-static const match_table_t msdos_tokens = {
+static const struct match_token msdos_tokens[] = {
 	{Opt_nodots, "nodots"},
 	{Opt_nodots, "dotsOK=no"},
 	{Opt_dots, "dots"},
 	{Opt_dots, "dotsOK=yes"},
 	{Opt_err, NULL}
 };
-static const match_table_t vfat_tokens = {
+static const struct match_token vfat_tokens[] = {
 	{Opt_charset, "iocharset=%s"},
 	{Opt_shortname_lower, "shortname=lower"},
 	{Opt_shortname_win95, "shortname=win95"},

index cc6ec4b..3e7f9fe 100644
@@ -408,7 +408,7 @@ enum {
 	OPT_ERR
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{OPT_FD,			"fd=%u"},
 	{OPT_ROOTMODE,			"rootmode=%o"},
 	{OPT_USER_ID,			"user_id=%u"},

index 6b2f757..d72c1d2 100644
@@ -122,7 +122,7 @@ struct lm_lockops {
 	int (*lm_lock) (struct gfs2_glock *gl, unsigned int req_state,
 			unsigned int flags);
 	void (*lm_cancel) (struct gfs2_glock *gl);
-	const match_table_t *lm_tokens;
+	const struct match_token *lm_tokens;
 };
 
 extern struct workqueue_struct *gfs2_delete_workqueue;

index 98c80d8..a300e88 100644
@@ -215,7 +215,7 @@ static void gdlm_unmount(struct gfs2_sbd *sdp)
 	}
 }
 
-static const match_table_t dlm_tokens = {
+static const struct match_token dlm_tokens[] = {
 	{ Opt_jid, "jid=%d"},
 	{ Opt_id, "id=%d"},
 	{ Opt_first, "first=%d"},

@@ -230,6 +230,6 @@ const struct lm_lockops gfs2_dlm_ops = {
 	.lm_put_lock = gdlm_put_lock,
 	.lm_lock = gdlm_lock,
 	.lm_cancel = gdlm_cancel,
-	.lm_tokens = &dlm_tokens,
+	.lm_tokens = dlm_tokens,
 };
 

index d3c69eb..bbb5d11 100644
@@ -924,7 +924,7 @@ fail:
 	return error;
 }
 
-static const match_table_t nolock_tokens = {
+static const struct match_token nolock_tokens[] = {
 	{ Opt_jid, "jid=%d\n", },
 	{ Opt_err, NULL },
 };

@@ -932,7 +932,7 @@ static const match_table_t nolock_tokens = {
 static const struct lm_lockops nolock_ops = {
 	.lm_proto_name = "lock_nolock",
 	.lm_put_lock = gfs2_glock_free,
-	.lm_tokens = &nolock_tokens,
+	.lm_tokens = nolock_tokens,
 };
 
 /**

@@ -979,7 +979,7 @@ static int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent)
 		if (!o || !*o)
 			continue;
 
-		token = match_token(o, *lm->lm_tokens, tmp);
+		token = match_token(o, lm->lm_tokens, tmp);
 		switch (token) {
 		case Opt_jid:
 			ret = match_int(&tmp[0], &option);

index 215c37b..0d39152 100644
@@ -80,7 +80,7 @@ enum {
 	Opt_error,
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_lockproto, "lockproto=%s"},
 	{Opt_locktable, "locktable=%s"},
 	{Opt_hostdata, "hostdata=%s"},

index 1b55f70..0941098 100644
@@ -199,7 +199,7 @@ enum {
 	opt_err
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{ opt_uid, "uid=%u" },
 	{ opt_gid, "gid=%u" },
 	{ opt_umask, "umask=%o" },

index bb62a5882..4f582cb 100644
@@ -27,7 +27,7 @@ enum {
 	opt_force, opt_err
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{ opt_creator, "creator=%s" },
 	{ opt_type, "type=%s" },
 	{ opt_umask, "umask=%o" },

index c89b408..7b2bb4c 100644
@@ -226,7 +226,7 @@ enum {
 	Opt_timeshift, Opt_err,
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_help, "help"},
 	{Opt_uid, "uid=%u"},
 	{Opt_gid, "gid=%u"},

index b9eeb1c..318da41 100644
@@ -56,7 +56,7 @@ enum {
 	Opt_err,
 };
 
-static const match_table_t tokens = {
+static const const struct match_token tokens[] = {
 	{Opt_size,	"size=%s"},
 	{Opt_nr_inodes,	"nr_inodes=%s"},
 	{Opt_mode,	"mode=%o"},

index 3db5ba4..bbb9834 100644
@@ -327,7 +327,7 @@ enum {
 	Opt_nocompress, Opt_hide, Opt_showassoc, Opt_dmode, Opt_overriderockperm,
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_norock, "norock"},
 	{Opt_nojoliet, "nojoliet"},
 	{Opt_unhide, "unhide"},

index 06c8a67..f4ff63e 100644
@@ -201,7 +201,7 @@ enum {
 	Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_integrity, "integrity"},
 	{Opt_nointegrity, "nointegrity"},
 	{Opt_iocharset, "iocharset=%s"},

index 75bcc3f..d88ccbe 100644
@@ -113,7 +113,7 @@ enum {
 	Opt_err
 };
 
-static const match_table_t nfs_mount_option_tokens = {
+static const struct match_token nfs_mount_option_tokens[] = {
 	{ Opt_userspace, "bg" },
 	{ Opt_userspace, "fg" },
 	{ Opt_userspace, "retry=%s" },

@@ -188,7 +188,7 @@ enum {
 	Opt_xprt_err
 };
 
-static const match_table_t nfs_xprt_protocol_tokens = {
+static const struct match_token nfs_xprt_protocol_tokens[] = {
 	{ Opt_xprt_udp, "udp" },
 	{ Opt_xprt_udp6, "udp6" },
 	{ Opt_xprt_tcp, "tcp" },

@@ -207,7 +207,7 @@ enum {
 	Opt_sec_err
 };
 
-static const match_table_t nfs_secflavor_tokens = {
+static const struct match_token nfs_secflavor_tokens[] = {
 	{ Opt_sec_none, "none" },
 	{ Opt_sec_none, "null" },
 	{ Opt_sec_sys, "sys" },

@@ -234,7 +234,7 @@ enum {
 	Opt_lookupcache_err
 };
 
-static match_table_t nfs_lookupcache_tokens = {
+static const struct match_token nfs_lookupcache_tokens[] = {
 	{ Opt_lookupcache_all, "all" },
 	{ Opt_lookupcache_positive, "pos" },
 	{ Opt_lookupcache_positive, "positive" },

@@ -250,7 +250,7 @@ enum {
 	Opt_local_lock_err
 };
 
-static match_table_t nfs_local_lock_tokens = {
+static const struct match_token nfs_local_lock_tokens[] = {
 	{ Opt_local_lock_all, "all" },
 	{ Opt_local_lock_flock, "flock" },
 	{ Opt_local_lock_posix, "posix" },

index 062cca0..fa73d6e 100644
@@ -572,7 +572,7 @@ enum {
 	Opt_discard, Opt_nodiscard, Opt_err,
 };
 
-static match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_err_cont, "errors=continue"},
 	{Opt_err_panic, "errors=panic"},
 	{Opt_err_ro, "errors=remount-ro"},

index 4129fb6..dfcd111 100644
@@ -187,7 +187,7 @@ enum {
 	Opt_err,
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_barrier, "barrier=%u"},
 	{Opt_err_panic, "errors=panic"},
 	{Opt_err_ro, "errors=remount-ro"},

index e043c4c..be5f8ef 100644
@@ -364,7 +364,7 @@ enum {
 	Opt_uid, Opt_gid, Opt_umask, Opt_dmask, Opt_fmask
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_uid, "uid=%u"},
 	{Opt_gid, "gid=%u"},
 	{Opt_umask, "umask=%o"},

index 977ed27..443e14e 100644
@@ -117,7 +117,7 @@ enum {
 	Opt_kmsg_bytes, Opt_err
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_kmsg_bytes, "kmsg_bytes=%u"},
 	{Opt_err, NULL}
 };

index eacb166..0df1654 100644
@@ -166,7 +166,7 @@ enum {
 	Opt_err
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_mode, "mode=%o"},
 	{Opt_err, NULL}
 };

index c75f613..d384238 100644
@@ -948,7 +948,7 @@ enum {
 	Opt_err,
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_fast_unmount, "fast_unmount"},
 	{Opt_norm_unmount, "norm_unmount"},
 	{Opt_bulk_read, "bulk_read"},

index 7b27b06..9b89053 100644
@@ -374,7 +374,7 @@ enum {
 	Opt_fmode, Opt_dmode
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_novrs,	"novrs"},
 	{Opt_nostrict,	"nostrict"},
 	{Opt_bs,	"bs=%u"},

index 3915ade..2d9e546 100644
@@ -378,7 +378,7 @@ enum {
        Opt_err
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_type_old, "ufstype=old"},
 	{Opt_type_sunx86, "ufstype=sunx86"},
 	{Opt_type_sun, "ufstype=sun"},

index b38e58d..a648692 100644
@@ -123,7 +123,7 @@ enum {
 	Opt_barrier, Opt_nobarrier, Opt_err
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_barrier, "barrier"},
 	{Opt_nobarrier, "nobarrier"},
 	{Opt_err, NULL}

index ea2281e..48a2514 100644
@@ -25,7 +25,7 @@ typedef struct {
 	char *to;
 } substring_t;
 
-int match_token(char *, const match_table_t table, substring_t args[]);
+int match_token(char *, const struct match_token *table, substring_t args[]);
 int match_int(substring_t *, int *result);
 int match_octal(substring_t *, int *result);
 int match_hex(substring_t *, int *result);

index dcbaaef..a1dc87e 100644
@@ -92,9 +92,9 @@ static int match_one(char *s, const char *p, substring_t args[])
 /**
  * match_token: - Find a token (and optional args) in a string
  * @s: the string to examine for token/argument pairs
- * @table: match_table_t describing the set of allowed option tokens and the
- * arguments that may be associated with them. Must be terminated with a
- * &struct match_token whose pattern is set to the NULL pointer.
+ * @table: the set of allowed option tokens (const struct match_token *)
+ * and the arguments that may be associated with them. Must be terminated
+ * by an entry with pattern set to the NULL pointer.
  * @args: array of %MAX_OPT_ARGS &substring_t elements. Used to return match
  * locations.
  *

@@ -103,7 +103,7 @@ static int match_one(char *s, const char *p, substring_t args[])
  * format identifiers which will be taken into account when matching the
  * tokens, and whose locations will be returned in the @args array.
  */
-int match_token(char *s, const match_table_t table, substring_t args[])
+int match_token(char *s, const struct match_token *table, substring_t args[])
 {
 	const struct match_token *p;
 

index 3723c09..9ee0914 100644
@@ -51,7 +51,7 @@ enum {
 	Opt_err,
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_msize, "msize=%u"},
 	{Opt_legacy, "noextend"},
 	{Opt_trans, "trans=%s"},

index aa5672b..aa7960b 100644
@@ -87,7 +87,7 @@ enum {
 	Opt_port, Opt_rfdno, Opt_wfdno, Opt_err,
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_port, "port=%u"},
 	{Opt_rfdno, "rfdno=%u"},
 	{Opt_wfdno, "wfdno=%u"},

index 150e0c4..4034835 100644
@@ -146,7 +146,7 @@ enum {
 	Opt_port, Opt_rq_depth, Opt_sq_depth, Opt_timeout, Opt_err,
 };
 
-static match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_port, "port=%u"},
 	{Opt_sq_depth, "sq=%u"},
 	{Opt_rq_depth, "rq=%u"},

index 132963a..1576fb3 100644
@@ -207,7 +207,7 @@ enum {
 	Opt_nocrc,
 };
 
-static match_table_t opt_tokens = {
+static const struct match_token opt_tokens[] = {
 	{Opt_osdtimeout, "osdtimeout=%d"},
 	{Opt_osdkeepalivetimeout, "osdkeepalive=%d"},
 	{Opt_mount_timeout, "mount_timeout=%d"},

index d661afb..c98963d 100644
@@ -225,7 +225,7 @@ enum {
 	Opt_func, Opt_mask, Opt_fsmagic, Opt_uid
 };
 
-static match_table_t policy_tokens = {
+static const struct match_token policy_tokens[] = {
 	{Opt_measure, "measure"},
 	{Opt_dont_measure, "dont_measure"},
 	{Opt_obj_user, "obj_user=%s"},

index 69907a5..f41a74d 100644
@@ -58,7 +58,7 @@ enum {
 	Opt_err = -1, Opt_new, Opt_load, Opt_update
 };
 
-static const match_table_t key_tokens = {
+static const struct match_token key_tokens[] = {
 	{Opt_new, "new"},
 	{Opt_load, "load"},
 	{Opt_update, "update"},

index c99b936..b15e1ed 100644
@@ -745,7 +745,7 @@ enum {
 	Opt_pcrinfo, Opt_pcrlock, Opt_migratable
 };
 
-static const match_table_t key_tokens = {
+static const struct match_token key_tokens[] = {
 	{Opt_new, "new"},
 	{Opt_load, "load"},
 	{Opt_update, "update"},

index f9c3764..aa9f978 100644
@@ -310,7 +310,7 @@ enum {
 	Opt_labelsupport = 5,
 };
 
-static const match_table_t tokens = {
+static const struct match_token tokens[] = {
 	{Opt_context, CONTEXT_STR "%s"},
 	{Opt_fscontext, FSCONTEXT_STR "%s"},
 	{Opt_defcontext, DEFCONTEXT_STR "%s"},