Rename duplicate fields in templates

7 files changed, 44 insertions, 45 deletions

diff --git a/sys/fuse.txt b/sys/fuse.txt
index 64f9accc9..c78b5b745 100644
--- a/sys/fuse.txt
+++ b/sys/fuse.txt
@@ -91,13 +91,13 @@ fuse_notify_poll_wakeup_out {
 }
 
 fuse_notify_inval_inode_out {
-	len	len[parent, int32]
+	len1	len[parent, int32]
 	err	int32
 	unique	const[0, int64]
 
 	ino	int64
 	off	int64
-	len	int16
+	len2	int16
 }
 
 fuse_notify_inval_entry_out {
@@ -105,7 +105,7 @@ fuse_notify_inval_entry_out {
 	err	int32
 	unique	const[0, int64]
 
-	parent	int64
+	par	int64
 	namelen	int32
 }
 
@@ -114,7 +114,7 @@ fuse_notify_delete_out {
 	err	int32
 	unique	const[0, int64]
 
-	parent	int64
+	par	int64
 	child	int64
 	namelen	int32
 }
@@ -132,9 +132,9 @@ fuse_notify_store_out {
 fuse_notify_retrieve_out {
 	len	len[parent, int32]
 	err	int32
-	unique	const[0, int64]
+	unique1	const[0, int64]
 
-	unique	int64
+	unique2	int64
 	nodeid	int64
 	off	int64
 	size	int32
diff --git a/sys/kdbus.txt b/sys/kdbus.txt
index 4c3caa427..5d40b8625 100644
--- a/sys/kdbus.txt
+++ b/sys/kdbus.txt
@@ -51,10 +51,10 @@ kdbus_cmd_ep_update {
 kdbus_cmd_hello {
 	size	len[parent, int64]
 	flags	flags[kdbus_hello_flags, int64]
-	rflags	const[0, int64]
+	rflags1	const[0, int64]
 
 	sflags	flags[kdbus_attach_flags, int64]
-	rflags	flags[kdbus_attach_flags, int64]
+	rflags2	flags[kdbus_attach_flags, int64]
 	bflags	int64
 	id	int64
 	poolsz	int64
@@ -248,32 +248,32 @@ kdbus_pids_parameter {
 	size	len[parent, int64]
 	type	const[KDBUS_ITEM_PIDS, int64]
 	pid	pid
-	pad	const[0, int32]
+	pad1	const[0, int32]
 	tid	pid
-	pad	const[0, int32]
+	pad2	const[0, int32]
 	ppid	pid
-	pad	const[0, int32]
+	pad3	const[0, int32]
 }
 
 kdbus_creds_parameter {
 	size	len[parent, int64]
 	type	const[KDBUS_ITEM_CREDS, int64]
 	uid	uid
-	pad	const[0, int32]
+	pad1	const[0, int32]
 	euid	uid
-	pad	const[0, int32]
+	pad2	const[0, int32]
 	suid	uid
-	pad	const[0, int32]
+	pad3	const[0, int32]
 	fsuid	uid
-	pad	const[0, int32]
+	pad4	const[0, int32]
 	gid	uid
-	pad	const[0, int32]
+	pad5	const[0, int32]
 	egid	uid
-	pad	const[0, int32]
+	pad6	const[0, int32]
 	sgid	uid
-	pad	const[0, int32]
+	pad7	const[0, int32]
 	fsgid	uid
-	pad	const[0, int32]
+	pad8	const[0, int32]
 }
 
 kdbus_seclabel_parameter {
@@ -284,17 +284,17 @@ kdbus_seclabel_parameter {
 }
 
 kdbus_payload_vec {
-	size	len[parent, int64]
+	size1	len[parent, int64]
 	type	const[KDBUS_ITEM_PAYLOAD_VEC, int64]
-	size	len[data, int64]
+	size2	len[data, int64]
 	data	buffer[in]
 }
 
 kdbus_payload_memfd {
-	size	len[parent, int64]
+	size1	len[parent, int64]
 	type	const[KDBUS_ITEM_PAYLOAD_MEMFD, int64]
 	start	int64
-	size	int64
+	size2	int64
 	fd	fd
 }
 
diff --git a/sys/kvm.txt b/sys/kvm.txt
index eed748626..b80f4ce72 100644
--- a/sys/kvm.txt
+++ b/sys/kvm.txt
@@ -315,7 +315,7 @@ kvm_vcpu_events {
 	exinjec	int8
 	exnr	int8
 	exhec	int8
-	pad	const[0, int8]
+	pad1	const[0, int8]
 	exec	int32
 
 	ininjec	int8
@@ -326,7 +326,7 @@ kvm_vcpu_events {
 	nmiinj	int8
 	nmipend	int8
 	nmimask	int8
-	pad	const[0, int8]
+	pad2	const[0, int8]
 
 	sipi	int32
 	flags	int32
diff --git a/sys/sndcontrol.txt b/sys/sndcontrol.txt
index a209c1796..20d5cc320 100644
--- a/sys/sndcontrol.txt
+++ b/sys/sndcontrol.txt
@@ -63,9 +63,9 @@ snd_ctl_elem_info {
 	name	array[int8, 64]
 	nameptr	string
 	namelen	len[nameptr, int32]
-	pad	array[const[0, int8], 44]
+	pad1	array[const[0, int8], 44]
 	d	array[int16, 4]
-	pad	array[const[0, int8], 56]
+	pad2	array[const[0, int8], 56]
 }
 
 snd_ctl_elem_value {
diff --git a/sys/sndseq.txt b/sys/sndseq.txt
index cffc3ae93..62a844ed7 100644
--- a/sys/sndseq.txt
+++ b/sys/sndseq.txt
@@ -65,8 +65,8 @@ snd_seq_running_info {
 	client	int8
 	bigend	int8
 	cpumode	int8
-	pad	const[0, int8]
-	pad	array[const[0, int8], 12]
+	pad1	const[0, int8]
+	pad2	array[const[0, int8], 12]
 }
 
 snd_seq_client_info {
@@ -105,8 +105,8 @@ snd_seq_port_subscribe {
 	voices	int32
 	flags	flags[snd_seq_sub_flags, int32]
 	queue	int8
-	pad	array[const[0, int8], 3]
-	pad	array[const[0, int8], 64]
+	pad1	array[const[0, int8], 3]
+	pad2	array[const[0, int8], 64]
 }
 
 snd_seq_queue_info {
diff --git a/sys/sndtimer.txt b/sys/sndtimer.txt
index bddfa1a22..67e0a13a8 100644
--- a/sys/sndtimer.txt
+++ b/sys/sndtimer.txt
@@ -32,12 +32,12 @@ snd_timer_ginfo {
 # TODO: the following two fields should be a fixed-size embeded string.
 	id	array[int8, 64]
 	name	array[int8, 80]
-	pad	const[0, intptr]
+	pad1	const[0, intptr]
 	res	intptr
 	resmin	intptr
 	resmax	intptr
 	clients	int32
-	pad	array[const[0, int8], 32]
+	pad2	array[const[0, int8], 32]
 }
 
 snd_timer_gparams {
@@ -64,7 +64,7 @@ snd_timer_params {
 	flags	flags[snd_timer_flags, int32]
 	ticks	int32
 	qsize	int32
-	pad	const[0, int32]
+	pad1	const[0, int32]
 	filter	flags[snd_timer_filter, int32]
-	pad	array[const[0, int8], 60]
+	pad2	array[const[0, int8], 60]
 }
diff --git a/sys/sys.txt b/sys/sys.txt
index 89e21ca90..be0d10860 100644
--- a/sys/sys.txt
+++ b/sys/sys.txt
@@ -224,7 +224,7 @@ prctl$setname(option const[PR_SET_NAME], name string)
 prctl$getname(option const[PR_GET_NAME], name buffer[out])
 prctl$setptracer(option const[PR_SET_PTRACER], pid pid)
 prctl$seccomp(option const[PR_SET_SECCOMP], mode flags[prctl_seccomp_mode], prog ptr[in, sock_fprog])
-prctl$setmm(option const[PR_SET_MM], option flags[prctl_mm_option], val vma)
+prctl$setmm(option1 const[PR_SET_MM], option2 flags[prctl_mm_option], val vma)
 
 arch_prctl(code flags[arch_prctl_code], addr buffer[in])
 seccomp(op flags[seccomp_op], flags flags[seccomp_flags], prog ptr[in, sock_fprog])
@@ -315,7 +315,7 @@ inotify_init1(flags flags[inotify_flags]) fd_inotify
 inotify_add_watch(fd fd_inotify, file filename, mask flags[inotify_mask]) inotifydesc
 inotify_rm_watch(fd fd_inotify, wd inotifydesc)
 fanotify_init(flags flags[fanotify_flags], events flags[fanotify_events]) fd_fanotify
-fanotify_mark(fd fd_fanotify, flags flags[fanotify_mark], mask flags[fanotify_mask], fd fd_dir, path filename)
+fanotify_mark(fd fd_fanotify, flags flags[fanotify_mark], mask flags[fanotify_mask], fddir fd_dir, path filename)
 
 link(old filename, new filename)
 linkat(oldfd fd_dir, old filename, newfd fd_dir, new filename, flags flags[linkat_flags])
@@ -548,8 +548,8 @@ stat {
 	mnsec	int32
 	ctime	int32
 	cnsec	int32
-	pad	int32
-	pad	int32
+	pad1	int32
+	pad2	int32
 }
 
 pollfd {
@@ -705,7 +705,6 @@ shmid_ds {
 	seq	int16
 	segsz	intptr
 	atime	intptr
-	atime	intptr
 	dtime	intptr
 	ctime	intptr
 	cpid	pid
@@ -1038,12 +1037,12 @@ fiemap_extent {
 	logical	int64
 	phys	int64
 	len	int64
-	pad	const[0, int64]
-	pad	const[0, int64]
+	pad1	const[0, int64]
+	pad2	const[0, int64]
 	flags	flags[fiemap_extent_flags, int32]
-	pad	const[0, int32]
-	pad	const[0, int32]
-	pad	const[0, int32]
+	pad3	const[0, int32]
+	pad4	const[0, int32]
+	pad5	const[0, int32]
 }
 
 uffdio_api {