diff --git a/NEWS b/NEWS
index 186c351..0fae1ea 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,8 @@
   * Fixed decoding and dumping of readv syscall in case of short read.
   * Fixed dumping of recvmsg and recvmmsg syscalls in case of short read.
   * Fixed decoding of mincore syscall's last argument.
+  * Fixed remaining errors in mapping between syscall numbers and numbers
+    of syscall arguments.
 
 Noteworthy changes in release 4.11 (2015-12-21)
 ===============================================
diff --git a/linux/aarch64/syscallent.h b/linux/aarch64/syscallent.h
index 286e0cb..6b23f8c 100644
--- a/linux/aarch64/syscallent.h
+++ b/linux/aarch64/syscallent.h
@@ -62,7 +62,7 @@
 [1070] = { 2,	0,		SEN(ustat),		"ustat"		},
 [1071] = { 0,	TP,		SEN(vfork),		"vfork"		},
 [1072] = { 4,	TP,		SEN(wait4),		"wait4"		},
-[1073] = { 6,	TN,		SEN(recv),		"recv"		},
+[1073] = { 4,	TN,		SEN(recv),		"recv"		},
 [1074] = { 4,	TN,		SEN(send),		"send"		},
 [1075] = { 2,	0,		SEN(bdflush),		"bdflush"	},
 [1076] = { 1,	TF,		SEN(umount),		"umount"	},
diff --git a/linux/alpha/syscallent.h b/linux/alpha/syscallent.h
index 6cd81ea..1bddd24 100644
--- a/linux/alpha/syscallent.h
+++ b/linux/alpha/syscallent.h
@@ -235,7 +235,7 @@
 [229 ... 232] = { },
 [233] = { 1,	0,		SEN(getpgid),			"getpgid"		},
 [234] = { 1,	0,		SEN(getsid),			"getsid"		},
-[235] = { 5,	TS,		SEN(sigaltstack),		"sigaltstack"		},
+[235] = { 2,	TS,		SEN(sigaltstack),		"sigaltstack"		},
 [236] = { 5,	0,		SEN(printargs),			"osf_waitid"		}, /*not implemented */
 [237] = { 5,	0,		SEN(printargs),			"osf_priocntlset"	}, /*not implemented */
 [238] = { 5,	0,		SEN(printargs),			"osf_sigsendset"	}, /*not implemented */
@@ -270,7 +270,7 @@
 [304] = { 1,	TF,		SEN(swapoff),			"swapoff"		},
 [305] = { 3,	TD,		SEN(getdents),			"getdents"		},
 [306] = { 2,	0,		SEN(create_module),		"create_module"		},
-[307] = { 4,	0,		SEN(init_module),		"init_module"		},
+[307] = { 3,	0,		SEN(init_module),		"init_module"		},
 [308] = { 2,	0,		SEN(delete_module),		"delete_module"		},
 [309] = { 1,	0,		SEN(get_kernel_syms),		"get_kernel_syms"	},
 [310] = { 3,	0,		SEN(syslog),			"syslog"		},
@@ -296,7 +296,7 @@
 [330] = { 2,	0,		SEN(sched_setparam),		"sched_setparam"	},
 [331] = { 2,	0,		SEN(sched_getparam),		"sched_getparam"	},
 [332] = { 3,	0,		SEN(sched_setscheduler),	"sched_setscheduler"	},
-[333] = { 2,	0,		SEN(sched_getscheduler),	"sched_getscheduler"	},
+[333] = { 1,	0,		SEN(sched_getscheduler),	"sched_getscheduler"	},
 [334] = { 0,	0,		SEN(sched_yield),		"sched_yield"		},
 [335] = { 1,	0,		SEN(sched_get_priority_max),	"sched_get_priority_max"},
 [336] = { 1,	0,		SEN(sched_get_priority_min),	"sched_get_priority_min"},
@@ -323,7 +323,7 @@
 [357] = { 2,	TS,		SEN(rt_sigsuspend),		"rt_sigsuspend"		},
 [358] = { 5,	TD,		SEN(select),			"select"		},
 [359] = { 2,	0,		SEN(gettimeofday),		"gettimeofday"		},
-[360] = { 3,	0,		SEN(settimeofday),		"settimeofday"		},
+[360] = { 2,	0,		SEN(settimeofday),		"settimeofday"		},
 [361] = { 2,	0,		SEN(getitimer),			"getitimer"		},
 [362] = { 3,	0,		SEN(setitimer),			"setitimer"		},
 [363] = { 2,	TF,		SEN(utimes),			"utimes"		},
diff --git a/linux/arm/syscallent.h b/linux/arm/syscallent.h
index 0a24cae..2433df8 100644
--- a/linux/arm/syscallent.h
+++ b/linux/arm/syscallent.h
@@ -74,7 +74,7 @@
 [ 45] = { 1,	TM|SI,		SEN(brk),			"brk"			},
 [ 46] = { 1,	0,		SEN(setgid16),			"setgid"		},
 [ 47] = { 0,	NF,		SEN(getgid16),			"getgid"		},
-[ 48] = { 3,	TS,		SEN(signal),			"signal"		},
+[ 48] = { 2,	TS,		SEN(signal),			"signal"		},
 [ 49] = { 0,	NF,		SEN(geteuid16),			"geteuid"		},
 [ 50] = { 0,	NF,		SEN(getegid16),			"getegid"		},
 [ 51] = { 1,	TF,		SEN(acct),			"acct"			},
@@ -295,7 +295,7 @@
 [268] = { 3,	TS,		SEN(tgkill),			"tgkill"		},
 [269] = { 2,	TF,		SEN(utimes),			"utimes"		},
 [270] = { 6,	TD,		SEN(fadvise64_64),		"fadvise64_64"		},
-[271] = { 5,	0,		SEN(printargs),			"pciconfig_iobase"	},
+[271] = { 3,	0,		SEN(printargs),			"pciconfig_iobase"	},
 [272] = { 5,	0,		SEN(printargs),			"pciconfig_read"	},
 [273] = { 5,	0,		SEN(printargs),			"pciconfig_write"	},
 [274] = { 4,	0,		SEN(mq_open),			"mq_open"		},
@@ -326,17 +326,17 @@
 [299] = { 3,	TI,		SEN(semget),			"semget"		},
 [300] = { 4,	TI,		SEN(semctl),			"semctl"		},
 [301] = { 4,	TI,		SEN(msgsnd),			"msgsnd"		},
-[302] = { 4,	TI,		SEN(msgrcv),			"msgrcv"		},
+[302] = { 5,	TI,		SEN(msgrcv),			"msgrcv"		},
 [303] = { 2,	TI,		SEN(msgget),			"msgget"		},
-[304] = { 4,	TI,		SEN(msgctl),			"msgctl"		},
-[305] = { 4,	TI|TM|SI,	SEN(shmat),			"shmat"			},
-[306] = { 4,	TI|TM|SI,	SEN(shmdt),			"shmdt"			},
+[304] = { 3,	TI,		SEN(msgctl),			"msgctl"		},
+[305] = { 3,	TI|TM|SI,	SEN(shmat),			"shmat"			},
+[306] = { 1,	TI|TM|SI,	SEN(shmdt),			"shmdt"			},
 [307] = { 3,	TI,		SEN(shmget),			"shmget"		},
-[308] = { 4,	TI,		SEN(shmctl),			"shmctl"		},
+[308] = { 3,	TI,		SEN(shmctl),			"shmctl"		},
 [309] = { 5,	0,		SEN(add_key),			"add_key"		},
 [310] = { 4,	0,		SEN(request_key),		"request_key"		},
 [311] = { 5,	0,		SEN(keyctl),			"keyctl"		},
-[312] = { 5,	TI,		SEN(semtimedop),		"semtimedop"		},
+[312] = { 4,	TI,		SEN(semtimedop),		"semtimedop"		},
 [313] = { 5,	0,		SEN(vserver),			"vserver"		},
 [314] = { 3,	0,		SEN(ioprio_set),		"ioprio_set"		},
 [315] = { 2,	0,		SEN(ioprio_get),		"ioprio_get"		},
@@ -344,8 +344,8 @@
 [317] = { 3,	TD,		SEN(inotify_add_watch),		"inotify_add_watch"	},
 [318] = { 2,	TD,		SEN(inotify_rm_watch),		"inotify_rm_watch"	},
 [319] = { 6,	TM,		SEN(mbind),			"mbind"			},
-[320] = { 3,	TM,		SEN(get_mempolicy),		"get_mempolicy"		},
-[321] = { 5,	TM,		SEN(set_mempolicy),		"set_mempolicy"		},
+[320] = { 5,	TM,		SEN(get_mempolicy),		"get_mempolicy"		},
+[321] = { 3,	TM,		SEN(set_mempolicy),		"set_mempolicy"		},
 [322] = { 4,	TD|TF,		SEN(openat),			"openat"		},
 [323] = { 3,	TD|TF,		SEN(mkdirat),			"mkdirat"		},
 [324] = { 4,	TD|TF,		SEN(mknodat),			"mknodat"		},
@@ -374,7 +374,7 @@
 [347] = { 4,	0,		SEN(kexec_load),		"kexec_load"		},
 [348] = { 4,	TD|TF,		SEN(utimensat),			"utimensat"		},
 [349] = { 3,	TD|TS,		SEN(signalfd),			"signalfd"		},
-[350] = { 4,	TD,		SEN(timerfd_create),		"timerfd_create"	},
+[350] = { 2,	TD,		SEN(timerfd_create),		"timerfd_create"	},
 [351] = { 1,	TD,		SEN(eventfd),			"eventfd"		},
 [352] = { 6,	TD,		SEN(fallocate),			"fallocate"		},
 [353] = { 4,	TD,		SEN(timerfd_settime),		"timerfd_settime"	},
diff --git a/linux/bfin/syscallent.h b/linux/bfin/syscallent.h
index f338704..dd99fa6 100644
--- a/linux/bfin/syscallent.h
+++ b/linux/bfin/syscallent.h
@@ -74,7 +74,7 @@
 [ 45] = { 1,	TM|SI,		SEN(brk),			"brk"			},
 [ 46] = { 1,	0,		SEN(setgid16),			"setgid"		},
 [ 47] = { 0,	NF,		SEN(getgid16),			"getgid"		},
-[ 48] = { 3,	TS,		SEN(signal),			"signal"		},
+[ 48] = { 2,	TS,		SEN(signal),			"signal"		},
 [ 49] = { 0,	NF,		SEN(geteuid16),			"geteuid"		},
 [ 50] = { 0,	NF,		SEN(getegid16),			"getegid"		},
 [ 51] = { 1,	TF,		SEN(acct),			"acct"			},
@@ -155,7 +155,7 @@
 [126] = { 3,	TS,		SEN(sigprocmask),		"sigprocmask"		},
 [127] = { 2,	0,		SEN(create_module),		"create_module"		},
 [128] = { 3,	0,		SEN(init_module),		"init_module"		},
-[129] = { 1,	0,		SEN(delete_module),		"delete_module"		},
+[129] = { 2,	0,		SEN(delete_module),		"delete_module"		},
 [130] = { 1,	0,		SEN(get_kernel_syms),		"get_kernel_syms"	},
 [131] = { 4,	TF,		SEN(quotactl),			"quotactl"		},
 [132] = { 1,	0,		SEN(getpgid),			"getpgid"		},
diff --git a/linux/hppa/syscallent.h b/linux/hppa/syscallent.h
index 104dbb5..433e164 100644
--- a/linux/hppa/syscallent.h
+++ b/linux/hppa/syscallent.h
@@ -130,7 +130,7 @@
 [125] = { 3,	TM|SI,		SEN(mprotect),			"mprotect"		},
 [126] = { 3,	TS,		SEN(sigprocmask),		"sigprocmask"		},
 [127] = { 2,	0,		SEN(create_module),		"create_module"		},
-[128] = { 4,	0,		SEN(init_module),		"init_module"		},
+[128] = { 3,	0,		SEN(init_module),		"init_module"		},
 [129] = { 2,	0,		SEN(delete_module),		"delete_module"		},
 [130] = { 1,	0,		SEN(get_kernel_syms),		"get_kernel_syms"	},
 [131] = { 4,	TF,		SEN(quotactl),			"quotactl"		},
@@ -155,11 +155,11 @@
 [150] = { 2,	TM,		SEN(mlock),			"mlock"			},
 [151] = { 2,	TM,		SEN(munlock),			"munlock"		},
 [152] = { 1,	TM,		SEN(mlockall),			"mlockall"		},
-[153] = { 1,	TM,		SEN(munlockall),		"munlockall"		},
+[153] = { 0,	TM,		SEN(munlockall),		"munlockall"		},
 [154] = { 2,	0,		SEN(sched_setparam),		"sched_setparam"	},
 [155] = { 2,	0,		SEN(sched_getparam),		"sched_getparam"	},
 [156] = { 3,	0,		SEN(sched_setscheduler),	"sched_setscheduler"	},
-[157] = { 2,	0,		SEN(sched_getscheduler),	"sched_getscheduler"	},
+[157] = { 1,	0,		SEN(sched_getscheduler),	"sched_getscheduler"	},
 [158] = { 0,	0,		SEN(sched_yield),		"sched_yield"		},
 [159] = { 1,	0,		SEN(sched_get_priority_max),	"sched_get_priority_max"},
 [160] = { 1,	0,		SEN(sched_get_priority_min),	"sched_get_priority_min"},
@@ -221,7 +221,7 @@
 [216] = { 1,	0,		SEN(io_destroy),		"io_destroy"		},
 [217] = { 5,	0,		SEN(io_getevents),		"io_getevents"		},
 [218] = { 3,	0,		SEN(io_submit),			"io_submit"		},
-[219] = { 4,	0,		SEN(io_cancel),			"io_cancel"		},
+[219] = { 3,	0,		SEN(io_cancel),			"io_cancel"		},
 [220] = { 5,	0,		SEN(printargs),			"alloc_hugepages"	},
 [221] = { 1,	0,		SEN(printargs),			"free_hugepages"	},
 [222] = { 1,	TP|SE,		SEN(exit),			"exit_group"		},
@@ -239,19 +239,19 @@
 [234] = { 3,	0,		SEN(mq_getsetattr),		"mq_getsetattr"		},
 [235] = { 5,	TP,		SEN(waitid),			"waitid"		},
 [236] = { 6,	TD,		SEN(fadvise64_64),		"fadvise64_64"		},
-[237] = { 5,	0,		SEN(set_tid_address),		"set_tid_address"	},
+[237] = { 1,	0,		SEN(set_tid_address),		"set_tid_address"	},
 [238] = { 5,	TF,		SEN(setxattr),			"setxattr"		},
 [239] = { 5,	TF,		SEN(setxattr),			"lsetxattr"		},
 [240] = { 5,	TD,		SEN(fsetxattr),			"fsetxattr"		},
 [241] = { 4,	TF,		SEN(getxattr),			"getxattr"		},
 [242] = { 4,	TF,		SEN(getxattr),			"lgetxattr"		},
 [243] = { 4,	TD,		SEN(fgetxattr),			"fgetxattr"		},
-[244] = { 5,	TF,		SEN(listxattr),			"listxattr"		},
-[245] = { 5,	TF,		SEN(listxattr),			"llistxattr"		},
-[246] = { 5,	TD,		SEN(flistxattr),		"flistxattr"		},
-[247] = { 5,	TF,		SEN(removexattr),		"removexattr"		},
-[248] = { 5,	TF,		SEN(removexattr),		"lremovexattr"		},
-[249] = { 5,	TD,		SEN(fremovexattr),		"fremovexattr"		},
+[244] = { 3,	TF,		SEN(listxattr),			"listxattr"		},
+[245] = { 3,	TF,		SEN(listxattr),			"llistxattr"		},
+[246] = { 3,	TD,		SEN(flistxattr),		"flistxattr"		},
+[247] = { 2,	TF,		SEN(removexattr),		"removexattr"		},
+[248] = { 2,	TF,		SEN(removexattr),		"lremovexattr"		},
+[249] = { 2,	TD,		SEN(fremovexattr),		"fremovexattr"		},
 [250] = { 3,	0,		SEN(timer_create),		"timer_create"		},
 [251] = { 4,	0,		SEN(timer_settime),		"timer_settime"		},
 [252] = { 2,	0,		SEN(timer_gettime),		"timer_gettime"		},
diff --git a/linux/i386/syscallent.h b/linux/i386/syscallent.h
index db89215..ee8d23b 100644
--- a/linux/i386/syscallent.h
+++ b/linux/i386/syscallent.h
@@ -74,7 +74,7 @@
 [ 45] = { 1,	TM|SI,		SEN(brk),			"brk"			},
 [ 46] = { 1,	0,		SEN(setgid16),			"setgid"		},
 [ 47] = { 0,	NF,		SEN(getgid16),			"getgid"		},
-[ 48] = { 3,	TS,		SEN(signal),			"signal"		},
+[ 48] = { 2,	TS,		SEN(signal),			"signal"		},
 [ 49] = { 0,	NF,		SEN(geteuid16),			"geteuid"		},
 [ 50] = { 0,	NF,		SEN(getegid16),			"getegid"		},
 [ 51] = { 1,	TF,		SEN(acct),			"acct"			},
@@ -116,7 +116,7 @@
 [ 87] = { 2,	TF,		SEN(swapon),			"swapon"		},
 [ 88] = { 4,	0,		SEN(reboot),			"reboot"		},
 [ 89] = { 3,	TD,		SEN(readdir),			"readdir"		},
-[ 90] = { 6,	TD|TM|SI,	SEN(old_mmap),			"mmap"			},
+[ 90] = { 1,	TD|TM|SI,	SEN(old_mmap),			"mmap"			},
 [ 91] = { 2,	TM|SI,		SEN(munmap),			"munmap"		},
 [ 92] = { 2,	TF,		SEN(truncate),			"truncate"		},
 [ 93] = { 2,	TD,		SEN(ftruncate),			"ftruncate"		},
diff --git a/linux/ia64/syscallent.h b/linux/ia64/syscallent.h
index c2bf2a8..6f75f1c 100644
--- a/linux/ia64/syscallent.h
+++ b/linux/ia64/syscallent.h
@@ -149,7 +149,7 @@
 [1130] = { 1,	0,		SEN(uname),			"uname"			},
 [1131] = { 1,	0,		SEN(adjtimex),			"adjtimex"		},
 [1132] = { 2,	0,		SEN(create_module),		"create_module"		},
-[1133] = { 4,	0,		SEN(init_module),		"init_module"		},
+[1133] = { 3,	0,		SEN(init_module),		"init_module"		},
 [1134] = { 2,	0,		SEN(delete_module),		"delete_module"		},
 [1135] = { 1,	0,		SEN(get_kernel_syms),		"get_kernel_syms"	},
 [1136] = { 5,	0,		SEN(query_module),		"query_module"		},
@@ -162,8 +162,8 @@
 [1143] = { 1,	NF,		SEN(setfsgid),			"setfsgid"		},
 [1144] = { 3,	TD,		SEN(getdents),			"getdents"		},
 [1145] = { 2,	TD,		SEN(flock),			"flock"			},
-[1146] = { 5,	TD,		SEN(readv),			"readv"			},
-[1147] = { 5,	TD,		SEN(writev),			"writev"		},
+[1146] = { 3,	TD,		SEN(readv),			"readv"			},
+[1147] = { 3,	TD,		SEN(writev),			"writev"		},
 [1148] = { 4,	TD,		SEN(pread),			"pread64"		},
 [1149] = { 4,	TD,		SEN(pwrite),			"pwrite64"		},
 [1150] = { 1,	0,		SEN(printargs),			"_sysctl"		},
@@ -178,7 +178,7 @@
 [1159] = { 0,	TM,		SEN(munlockall),		"munlockall"		},
 [1160] = { 2,	0,		SEN(sched_getparam),		"sched_getparam"	},
 [1161] = { 2,	0,		SEN(sched_setparam),		"sched_setparam"	},
-[1162] = { 2,	0,		SEN(sched_getscheduler),	"sched_getscheduler"	},
+[1162] = { 1,	0,		SEN(sched_getscheduler),	"sched_getscheduler"	},
 [1163] = { 3,	0,		SEN(sched_setscheduler),	"sched_setscheduler"	},
 [1164] = { 0,	0,		SEN(sched_yield),		"sched_yield"		},
 [1165] = { 1,	0,		SEN(sched_get_priority_max),	"sched_get_priority_max"},
diff --git a/linux/m68k/syscallent.h b/linux/m68k/syscallent.h
index d6e0bf4..2028841 100644
--- a/linux/m68k/syscallent.h
+++ b/linux/m68k/syscallent.h
@@ -74,7 +74,7 @@
 [ 45] = { 1,	TM|SI,		SEN(brk),			"brk"			},
 [ 46] = { 1,	0,		SEN(setgid16),			"setgid"		},
 [ 47] = { 0,	NF,		SEN(getgid16),			"getgid"		},
-[ 48] = { 3,	TS,		SEN(signal),			"signal"		},
+[ 48] = { 2,	TS,		SEN(signal),			"signal"		},
 [ 49] = { 0,	NF,		SEN(geteuid16),			"geteuid"		},
 [ 50] = { 0,	NF,		SEN(getegid16),			"getegid"		},
 [ 51] = { 1,	TF,		SEN(acct),			"acct"			},
@@ -305,7 +305,7 @@
 [277] = { 5,	TP,		SEN(waitid),			"waitid"		},
 [278] = { 5,	0,		SEN(vserver),			"vserver"		},
 [279] = { 5,	0,		SEN(add_key),			"add_key"		},
-[280] = { 5,	0,		SEN(request_key),		"request_key"		},
+[280] = { 4,	0,		SEN(request_key),		"request_key"		},
 [281] = { 5,	0,		SEN(keyctl),			"keyctl"		},
 [282] = { 3,	0,		SEN(ioprio_set),		"ioprio_set"		},
 [283] = { 2,	0,		SEN(ioprio_get),		"ioprio_get"		},
diff --git a/linux/microblaze/syscallent.h b/linux/microblaze/syscallent.h
index 7341e13..482e275 100644
--- a/linux/microblaze/syscallent.h
+++ b/linux/microblaze/syscallent.h
@@ -74,7 +74,7 @@
 [ 45] = { 1,	TM|SI,		SEN(brk),			"brk"			},
 [ 46] = { 1,	0,		SEN(setgid16),			"setgid"		},
 [ 47] = { 0,	NF,		SEN(getgid16),			"getgid"		},
-[ 48] = { 3,	TS,		SEN(signal),			"signal"		},
+[ 48] = { 2,	TS,		SEN(signal),			"signal"		},
 [ 49] = { 0,	NF,		SEN(geteuid16),			"geteuid"		},
 [ 50] = { 0,	NF,		SEN(getegid16),			"getegid"		},
 [ 51] = { 1,	TF,		SEN(acct),			"acct"			},
@@ -146,7 +146,7 @@
 [117] = { 6,	TI,		SEN(ipc),			"ipc"			},
 [118] = { 1,	TD,		SEN(fsync),			"fsync"			},
 [119] = { 0,	TS,		SEN(sigreturn),			"sigreturn"		},
-[120] = { 5,	TP,		SEN(clone),			"clone"			},
+[120] = { 6,	TP,		SEN(clone),			"clone"			},
 [121] = { 2,	0,		SEN(setdomainname),		"setdomainname"		},
 [122] = { 1,	0,		SEN(uname),			"uname"			},
 [123] = { 3,	0,		SEN(modify_ldt),		"modify_ldt"		},
@@ -294,7 +294,7 @@
 [266] = { 2,	0,		SEN(clock_getres),		"clock_getres"		},
 [267] = { 4,	0,		SEN(clock_nanosleep),		"clock_nanosleep"	},
 [268] = { 3,	TF,		SEN(statfs64),			"statfs64"		},
-[269] = { 2,	TD,		SEN(fstatfs64),			"fstatfs64"		},
+[269] = { 3,	TD,		SEN(fstatfs64),			"fstatfs64"		},
 [270] = { 3,	TS,		SEN(tgkill),			"tgkill"		},
 [271] = { 2,	TF,		SEN(utimes),			"utimes"		},
 [272] = { 6,	TD,		SEN(fadvise64_64),		"fadvise64_64"		},
@@ -341,7 +341,7 @@
 [313] = { 6,	TD,		SEN(splice),			"splice"		},
 [314] = { 6,	TD,		SEN(sync_file_range),		"sync_file_range"	},
 [315] = { 4,	TD,		SEN(tee),			"tee"			},
-[316] = { 5,	TD,		SEN(vmsplice),			"vmsplice"		},
+[316] = { 4,	TD,		SEN(vmsplice),			"vmsplice"		},
 [317] = { 6,	TM,		SEN(move_pages),		"move_pages"		},
 [318] = { 3,	0,		SEN(getcpu),			"getcpu"		},
 [319] = { 6,	TD,		SEN(epoll_pwait),		"epoll_pwait"		},
diff --git a/linux/mips/syscallent-n32.h b/linux/mips/syscallent-n32.h
index 1f6f0dd..81028f6 100644
--- a/linux/mips/syscallent-n32.h
+++ b/linux/mips/syscallent-n32.h
@@ -119,7 +119,7 @@
 [6116] = { 3,	0,		SEN(getresuid),			"getresuid"		},
 [6117] = { 3,	0,		SEN(setresgid),			"setresgid"		},
 [6118] = { 3,	0,		SEN(getresgid),			"getresgid"		},
-[6119] = { 0,	0,		SEN(getpgid),			"getpgid"		},
+[6119] = { 1,	0,		SEN(getpgid),			"getpgid"		},
 [6120] = { 1,	NF,		SEN(setfsuid),			"setfsuid"		},
 [6121] = { 1,	NF,		SEN(setfsgid),			"setfsgid"		},
 [6122] = { 1,	0,		SEN(getsid),			"getsid"		},
@@ -134,8 +134,8 @@
 [6131] = { 3,	TF,		SEN(mknod),			"mknod"			},
 [6132] = { 1,	NF,		SEN(personality),		"personality"		},
 [6133] = { 2,	0,		SEN(ustat),			"ustat"			},
-[6134] = { 3,	TF,		SEN(statfs),			"statfs"		},
-[6135] = { 3,	TD,		SEN(fstatfs),			"fstatfs"		},
+[6134] = { 2,	TF,		SEN(statfs),			"statfs"		},
+[6135] = { 2,	TD,		SEN(fstatfs),			"fstatfs"		},
 [6136] = { 3,	0,		SEN(sysfs),			"sysfs"			},
 [6137] = { 2,	0,		SEN(getpriority),		"getpriority"		},
 [6138] = { 3,	0,		SEN(setpriority),		"setpriority"		},
@@ -168,8 +168,8 @@
 [6165] = { 2,	0,		SEN(sethostname),		"sethostname"		},
 [6166] = { 2,	0,		SEN(setdomainname),		"setdomainname"		},
 [6167] = { 2,	0,		SEN(create_module),		"create_module"		},
-[6168] = { 4,	0,		SEN(init_module),		"init_module"		},
-[6169] = { 1,	0,		SEN(delete_module),		"delete_module"		},
+[6168] = { 3,	0,		SEN(init_module),		"init_module"		},
+[6169] = { 2,	0,		SEN(delete_module),		"delete_module"		},
 [6170] = { 1,	0,		SEN(get_kernel_syms),		"get_kernel_syms"	},
 [6171] = { 5,	0,		SEN(query_module),		"query_module"		},
 [6172] = { 4,	TF,		SEN(quotactl),			"quotactl"		},
diff --git a/linux/mips/syscallent-n64.h b/linux/mips/syscallent-n64.h
index 18c1a88..3d3dc70 100644
--- a/linux/mips/syscallent-n64.h
+++ b/linux/mips/syscallent-n64.h
@@ -119,7 +119,7 @@
 [5116] = { 3,	0,		SEN(getresuid),			"getresuid"		},
 [5117] = { 3,	0,		SEN(setresgid),			"setresgid"		},
 [5118] = { 3,	0,		SEN(getresgid),			"getresgid"		},
-[5119] = { 0,	0,		SEN(getpgid),			"getpgid"		},
+[5119] = { 1,	0,		SEN(getpgid),			"getpgid"		},
 [5120] = { 1,	NF,		SEN(setfsuid),			"setfsuid"		},
 [5121] = { 1,	NF,		SEN(setfsgid),			"setfsgid"		},
 [5122] = { 1,	0,		SEN(getsid),			"getsid"		},
@@ -134,8 +134,8 @@
 [5131] = { 3,	TF,		SEN(mknod),			"mknod"			},
 [5132] = { 1,	NF,		SEN(personality),		"personality"		},
 [5133] = { 2,	0,		SEN(ustat),			"ustat"			},
-[5134] = { 3,	TF,		SEN(statfs),			"statfs"		},
-[5135] = { 3,	TD,		SEN(fstatfs),			"fstatfs"		},
+[5134] = { 2,	TF,		SEN(statfs),			"statfs"		},
+[5135] = { 2,	TD,		SEN(fstatfs),			"fstatfs"		},
 [5136] = { 3,	0,		SEN(sysfs),			"sysfs"			},
 [5137] = { 2,	0,		SEN(getpriority),		"getpriority"		},
 [5138] = { 3,	0,		SEN(setpriority),		"setpriority"		},
@@ -168,8 +168,8 @@
 [5165] = { 2,	0,		SEN(sethostname),		"sethostname"		},
 [5166] = { 2,	0,		SEN(setdomainname),		"setdomainname"		},
 [5167] = { 2,	0,		SEN(create_module),		"create_module"		},
-[5168] = { 4,	0,		SEN(init_module),		"init_module"		},
-[5169] = { 1,	0,		SEN(delete_module),		"delete_module"		},
+[5168] = { 3,	0,		SEN(init_module),		"init_module"		},
+[5169] = { 2,	0,		SEN(delete_module),		"delete_module"		},
 [5170] = { 1,	0,		SEN(get_kernel_syms),		"get_kernel_syms"	},
 [5171] = { 5,	0,		SEN(query_module),		"query_module"		},
 [5172] = { 4,	TF,		SEN(quotactl),			"quotactl"		},
diff --git a/linux/mips/syscallent-o32.h b/linux/mips/syscallent-o32.h
index 6e9113d..18ddc19 100644
--- a/linux/mips/syscallent-o32.h
+++ b/linux/mips/syscallent-o32.h
@@ -48,7 +48,7 @@
 [4045] = { 1,	TM|SI,		SEN(brk),			"brk"			},
 [4046] = { 1,	0,		SEN(setgid),			"setgid"		},
 [4047] = { 0,	NF,		SEN(getgid),			"getgid"		},
-[4048] = { 1,	TS,		SEN(signal),			"signal"		},
+[4048] = { 2,	TS,		SEN(signal),			"signal"		},
 [4049] = { 0,	NF,		SEN(geteuid),			"geteuid"		},
 [4050] = { 0,	NF,		SEN(getegid),			"getegid"		},
 [4051] = { 1,	TF,		SEN(acct),			"acct"			},
@@ -99,9 +99,9 @@
 [4096] = { 2,	0,		SEN(getpriority),		"getpriority"		},
 [4097] = { 3,	0,		SEN(setpriority),		"setpriority"		},
 [4098] = { 0,	0,		SEN(profil),			"profil"		},
-[4099] = { 3,	TF,		SEN(statfs),			"statfs"		},
-[4100] = { 3,	TD,		SEN(fstatfs),			"fstatfs"		},
-[4101] = { 0,	0,		SEN(ioperm),			"ioperm"		},
+[4099] = { 2,	TF,		SEN(statfs),			"statfs"		},
+[4100] = { 2,	TD,		SEN(fstatfs),			"fstatfs"		},
+[4101] = { 3,	0,		SEN(ioperm),			"ioperm"		},
 [4102] = { 2,	TD,		SEN(socketcall),		"socketcall"		},
 [4103] = { 3,	0,		SEN(syslog),			"syslog"		},
 [4104] = { 3,	0,		SEN(setitimer),			"setitimer"		},
@@ -256,7 +256,7 @@
 [4253] = { 0,	0,		SEN(restart_syscall),		"restart_syscall"	},
 [4254] = { 7,	TD,		SEN(fadvise64_64),		"fadvise64"		},
 [4255] = { 3,	TF,		SEN(statfs64),			"statfs64"		},
-[4256] = { 2,	TD,		SEN(fstatfs64),			"fstatfs64"		},
+[4256] = { 3,	TD,		SEN(fstatfs64),			"fstatfs64"		},
 [4257] = { 3,	0,		SEN(timer_create),		"timer_create"		},
 [4258] = { 4,	0,		SEN(timer_settime),		"timer_settime"		},
 [4259] = { 2,	0,		SEN(timer_gettime),		"timer_gettime"		},
diff --git a/linux/powerpc/syscallent.h b/linux/powerpc/syscallent.h
index a0d9730..afbd602 100644
--- a/linux/powerpc/syscallent.h
+++ b/linux/powerpc/syscallent.h
@@ -74,7 +74,7 @@
 [ 45] = { 1,	TM|SI,		SEN(brk),			"brk"			},
 [ 46] = { 1,	0,		SEN(setgid),			"setgid"		},
 [ 47] = { 0,	NF,		SEN(getgid),			"getgid"		},
-[ 48] = { 3,	TS,		SEN(signal),			"signal"		},
+[ 48] = { 2,	TS,		SEN(signal),			"signal"		},
 [ 49] = { 0,	NF,		SEN(geteuid),			"geteuid"		},
 [ 50] = { 0,	NF,		SEN(getegid),			"getegid"		},
 [ 51] = { 1,	TF,		SEN(acct),			"acct"			},
@@ -304,8 +304,8 @@
 [275] = { 0,	TD,		SEN(inotify_init),		"inotify_init"		},
 [276] = { 3,	TD,		SEN(inotify_add_watch),		"inotify_add_watch"	},
 [277] = { 2,	TD,		SEN(inotify_rm_watch),		"inotify_rm_watch"	},
-[278] = { 5,	0,		SEN(printargs),			"spu_run"		},
-[279] = { 5,	0,		SEN(printargs),			"spu_create"		},
+[278] = { 3,	0,		SEN(printargs),			"spu_run"		},
+[279] = { 4,	0,		SEN(printargs),			"spu_create"		},
 [280] = { 6,	TD,		SEN(pselect6),			"pselect6"		},
 [281] = { 5,	TD,		SEN(ppoll),			"ppoll"			},
 [282] = { 1,	TP,		SEN(unshare),			"unshare"		},
diff --git a/linux/powerpc64/syscallent.h b/linux/powerpc64/syscallent.h
index 0bf55ea..486b3ae 100644
--- a/linux/powerpc64/syscallent.h
+++ b/linux/powerpc64/syscallent.h
@@ -74,7 +74,7 @@
 [ 45] = { 1,	TM|SI,		SEN(brk),			"brk"			},
 [ 46] = { 1,	0,		SEN(setgid),			"setgid"		},
 [ 47] = { 0,	NF,		SEN(getgid),			"getgid"		},
-[ 48] = { 3,	TS,		SEN(signal),			"signal"		},
+[ 48] = { 2,	TS,		SEN(signal),			"signal"		},
 [ 49] = { 0,	NF,		SEN(geteuid),			"geteuid"		},
 [ 50] = { 0,	NF,		SEN(getegid),			"getegid"		},
 [ 51] = { 1,	TF,		SEN(acct),			"acct"			},
@@ -205,8 +205,8 @@
 [176] = { 4,	TS,		SEN(rt_sigtimedwait),		"rt_sigtimedwait"	},
 [177] = { 3,	TS,		SEN(rt_sigqueueinfo),		"rt_sigqueueinfo"	},
 [178] = { 2,	TS,		SEN(rt_sigsuspend),		"rt_sigsuspend"		},
-[179] = { 6,	TD,		SEN(pread),			"pread64"		},
-[180] = { 6,	TD,		SEN(pwrite),			"pwrite64"		},
+[179] = { 4,	TD,		SEN(pread),			"pread64"		},
+[180] = { 4,	TD,		SEN(pwrite),			"pwrite64"		},
 [181] = { 3,	TF,		SEN(chown),			"chown"			},
 [182] = { 2,	TF,		SEN(getcwd),			"getcwd"		},
 [183] = { 2,	0,		SEN(capget),			"capget"		},
@@ -217,7 +217,7 @@
 [188] = { 5,	TN,		SEN(putpmsg),			"putpmsg"		},
 [189] = { 0,	TP,		SEN(vfork),			"vfork"			},
 [190] = { 2,	0,		SEN(getrlimit),			"ugetrlimit"		},
-[191] = { 5,	TD,		SEN(readahead),			"readahead"		},
+[191] = { 3,	TD,		SEN(readahead),			"readahead"		},
 [192 ... 197] = { },
 [198] = { 5,	0,		SEN(printargs),			"pciconfig_read"	},
 [199] = { 5,	0,		SEN(printargs),			"pciconfig_write"	},
@@ -254,9 +254,9 @@
 [230] = { 3,	0,		SEN(io_submit),			"io_submit"		},
 [231] = { 3,	0,		SEN(io_cancel),			"io_cancel"		},
 [232] = { 1,	0,		SEN(set_tid_address),		"set_tid_address"	},
-[233] = { 6,	TD,		SEN(fadvise64),			"fadvise64"		},
+[233] = { 4,	TD,		SEN(fadvise64),			"fadvise64"		},
 [234] = { 1,	TP|SE,		SEN(exit),			"exit_group"		},
-[235] = { 4,	0,		SEN(lookup_dcookie),		"lookup_dcookie"	},
+[235] = { 3,	0,		SEN(lookup_dcookie),		"lookup_dcookie"	},
 [236] = { 1,	TD,		SEN(epoll_create),		"epoll_create"		},
 [237] = { 4,	TD,		SEN(epoll_ctl),			"epoll_ctl"		},
 [238] = { 4,	TD,		SEN(epoll_wait),		"epoll_wait"		},
@@ -299,8 +299,8 @@
 [275] = { 0,	TD,		SEN(inotify_init),		"inotify_init"		},
 [276] = { 3,	TD,		SEN(inotify_add_watch),		"inotify_add_watch"	},
 [277] = { 2,	TD,		SEN(inotify_rm_watch),		"inotify_rm_watch"	},
-[278] = { 5,	0,		SEN(printargs),			"spu_run"		},
-[279] = { 5,	0,		SEN(printargs),			"spu_create"		},
+[278] = { 3,	0,		SEN(printargs),			"spu_run"		},
+[279] = { 4,	0,		SEN(printargs),			"spu_create"		},
 [280] = { 6,	TD,		SEN(pselect6),			"pselect6"		},
 [281] = { 5,	TD,		SEN(ppoll),			"ppoll"			},
 [282] = { 1,	TP,		SEN(unshare),			"unshare"		},
@@ -329,8 +329,8 @@
 [305] = { 3,	TD|TS,		SEN(signalfd),			"signalfd"		},
 [306] = { 2,	TD,		SEN(timerfd_create),		"timerfd_create"	},
 [307] = { 1,	TD,		SEN(eventfd),			"eventfd"		},
-[308] = { 6,	TD,		SEN(sync_file_range2),		"sync_file_range2"	},
-[309] = { 6,	TD,		SEN(fallocate),			"fallocate"		},
+[308] = { 4,	TD,		SEN(sync_file_range2),		"sync_file_range2"	},
+[309] = { 4,	TD,		SEN(fallocate),			"fallocate"		},
 [310] = { 3,	0,		SEN(subpage_prot),		"subpage_prot"		},
 [311] = { 4,	TD,		SEN(timerfd_settime),		"timerfd_settime"	},
 [312] = { 2,	TD,		SEN(timerfd_gettime),		"timerfd_gettime"	},
@@ -341,11 +341,11 @@
 [317] = { 2,	TD,		SEN(pipe2),			"pipe2"			},
 [318] = { 1,	TD,		SEN(inotify_init1),		"inotify_init1"		},
 [319] = { 5,	TD,		SEN(perf_event_open),		"perf_event_open"	},
-[320] = { 5,	TD,		SEN(preadv),			"preadv"		},
-[321] = { 5,	TD,		SEN(pwritev),			"pwritev"		},
+[320] = { 4,	TD,		SEN(preadv),			"preadv"		},
+[321] = { 4,	TD,		SEN(pwritev),			"pwritev"		},
 [322] = { 4,	TP|TS,		SEN(rt_tgsigqueueinfo),		"rt_tgsigqueueinfo"	},
 [323] = { 2,	TD,		SEN(fanotify_init),		"fanotify_init"		},
-[324] = { 6,	TD|TF,		SEN(fanotify_mark),		"fanotify_mark"		},
+[324] = { 5,	TD|TF,		SEN(fanotify_mark),		"fanotify_mark"		},
 [325] = { 4,	0,		SEN(prlimit64),			"prlimit64"		},
 [326] = { 3,	TN,		SEN(socket),			"socket"		},
 [327] = { 3,	TN,		SEN(bind),			"bind"			},
diff --git a/linux/s390/syscallent.h b/linux/s390/syscallent.h
index 74fce89..1cf2d22 100644
--- a/linux/s390/syscallent.h
+++ b/linux/s390/syscallent.h
@@ -76,7 +76,7 @@
 [ 45] = { 1,	TM|SI,		SEN(brk),			"brk"			},
 [ 46] = { 1,	0,		SEN(setgid16),			"setgid"		},
 [ 47] = { 0,	NF,		SEN(getgid16),			"getgid"		},
-[ 48] = { 3,	TS,		SEN(signal),			"signal"		},
+[ 48] = { 2,	TS,		SEN(signal),			"signal"		},
 [ 49] = { 0,	NF,		SEN(geteuid16),			"geteuid"		},
 [ 50] = { 0,	NF,		SEN(getegid16),			"getegid"		},
 [ 51] = { 1,	TF,		SEN(acct),			"acct"			},
@@ -118,7 +118,7 @@
 [ 87] = { 2,	TF,		SEN(swapon),			"swapon"		},
 [ 88] = { 4,	0,		SEN(reboot),			"reboot"		},
 [ 89] = { 3,	TD,		SEN(readdir),			"readdir"		},
-[ 90] = { 6,	TD|TM|SI,	SEN(old_mmap),			"mmap"			},
+[ 90] = { 1,	TD|TM|SI,	SEN(old_mmap),			"mmap"			},
 [ 91] = { 2,	TM|SI,		SEN(munmap),			"munmap"		},
 [ 92] = { 2,	TF,		SEN(truncate),			"truncate"		},
 [ 93] = { 2,	TD,		SEN(ftruncate),			"ftruncate"		},
@@ -138,14 +138,14 @@
 [107] = { 2,	TF,		SEN(lstat),			"lstat"			},
 [108] = { 2,	TD,		SEN(fstat),			"fstat"			},
 [109] = { },
-[110] = { 3,	0,		SEN(lookup_dcookie),		"lookup_dcookie"	},
+[110] = { 4,	0,		SEN(lookup_dcookie),		"lookup_dcookie"	},
 [111] = { 0,	0,		SEN(vhangup),			"vhangup"		},
 [112] = { 0,	0,		SEN(idle),			"idle"			},
 [113] = { },
 [114] = { 4,	TP,		SEN(wait4),			"wait4"			},
 [115] = { 1,	TF,		SEN(swapoff),			"swapoff"		},
 [116] = { 1,	0,		SEN(sysinfo),			"sysinfo"		},
-[117] = { 5,	TI,		SEN(ipc),			"ipc"			},
+[117] = { 6,	TI,		SEN(ipc),			"ipc"			},
 [118] = { 1,	TD,		SEN(fsync),			"fsync"			},
 [119] = { 0,	TS,		SEN(sigreturn),			"sigreturn"		},
 [120] = { 5,	TP,		SEN(clone),			"clone"			},
diff --git a/linux/s390x/syscallent.h b/linux/s390x/syscallent.h
index e29a299..4374d83 100644
--- a/linux/s390x/syscallent.h
+++ b/linux/s390x/syscallent.h
@@ -75,7 +75,7 @@
 [ 45] = { 1,	TM|SI,		SEN(brk),			"brk"			},
 [ 46] = { },
 [ 47] = { },
-[ 48] = { 3,	TS,		SEN(signal),			"signal"		},
+[ 48] = { 2,	TS,		SEN(signal),			"signal"		},
 [ 49] = { },
 [ 50] = { },
 [ 51] = { 1,	TF,		SEN(acct),			"acct"			},
@@ -139,7 +139,7 @@
 [114] = { 4,	TP,		SEN(wait4),			"wait4"			},
 [115] = { 1,	TF,		SEN(swapoff),			"swapoff"		},
 [116] = { 1,	0,		SEN(sysinfo),			"sysinfo"		},
-[117] = { 5,	TI,		SEN(ipc),			"ipc"			},
+[117] = { 6,	TI,		SEN(ipc),			"ipc"			},
 [118] = { 1,	TD,		SEN(fsync),			"fsync"			},
 [119] = { 0,	TS,		SEN(sigreturn),			"sigreturn"		},
 [120] = { 5,	TP,		SEN(clone),			"clone"			},
diff --git a/linux/sh/syscallent.h b/linux/sh/syscallent.h
index 7eea1a0..95b1b59 100644
--- a/linux/sh/syscallent.h
+++ b/linux/sh/syscallent.h
@@ -76,7 +76,7 @@
 [ 45] = { 1,	TM|SI,		SEN(brk),			"brk"			},
 [ 46] = { 1,	0,		SEN(setgid16),			"setgid"		},
 [ 47] = { 0,	NF,		SEN(getgid16),			"getgid"		},
-[ 48] = { 3,	TS,		SEN(signal),			"signal"		},
+[ 48] = { 2,	TS,		SEN(signal),			"signal"		},
 [ 49] = { 0,	NF,		SEN(geteuid16),			"geteuid"		},
 [ 50] = { 0,	NF,		SEN(getegid16),			"getegid"		},
 [ 51] = { 1,	TF,		SEN(acct),			"acct"			},
@@ -145,7 +145,7 @@
 [114] = { 4,	TP,		SEN(wait4),			"wait4"			},
 [115] = { 1,	TF,		SEN(swapoff),			"swapoff"		},
 [116] = { 1,	0,		SEN(sysinfo),			"sysinfo"		},
-[117] = { 5,	TI,		SEN(ipc),			"ipc"			},
+[117] = { 6,	TI,		SEN(ipc),			"ipc"			},
 [118] = { 1,	TD,		SEN(fsync),			"fsync"			},
 [119] = { 0,	TS,		SEN(sigreturn),			"sigreturn"		},
 [120] = { 5,	TP,		SEN(clone),			"clone"			},
@@ -181,7 +181,7 @@
 [150] = { 2,	TM,		SEN(mlock),			"mlock"			},
 [151] = { 2,	TM,		SEN(munlock),			"munlock"		},
 [152] = { 1,	TM,		SEN(mlockall),			"mlockall"		},
-[153] = { 1,	TM,		SEN(munlockall),		"munlockall"		},
+[153] = { 0,	TM,		SEN(munlockall),		"munlockall"		},
 [154] = { 2,	0,		SEN(sched_setparam),		"sched_setparam"	},
 [155] = { 2,	0,		SEN(sched_getparam),		"sched_getparam"	},
 [156] = { 3,	0,		SEN(sched_setscheduler),	"sched_setscheduler"	},
@@ -294,7 +294,7 @@
 [266] = { 2,	0,		SEN(clock_getres),		"clock_getres"		},
 [267] = { 4,	0,		SEN(clock_nanosleep),		"clock_nanosleep"	},
 [268] = { 3,	TF,		SEN(statfs64),			"statfs64"		},
-[269] = { 2,	TD,		SEN(fstatfs64),			"fstatfs64"		},
+[269] = { 3,	TD,		SEN(fstatfs64),			"fstatfs64"		},
 [270] = { 3,	TS,		SEN(tgkill),			"tgkill"		},
 [271] = { 2,	TF,		SEN(utimes),			"utimes"		},
 [272] = { 6,	TD,		SEN(fadvise64_64),		"fadvise64_64"		},
@@ -341,7 +341,7 @@
 [313] = { 6,	TD,		SEN(splice),			"splice"		},
 [314] = { 6,	TD,		SEN(sync_file_range),		"sync_file_range"	},
 [315] = { 4,	TD,		SEN(tee),			"tee"			},
-[316] = { 5,	TD,		SEN(vmsplice),			"vmsplice"		},
+[316] = { 4,	TD,		SEN(vmsplice),			"vmsplice"		},
 [317] = { 6,	TM,		SEN(move_pages),		"move_pages"		},
 [318] = { 3,	0,		SEN(getcpu),			"getcpu"		},
 [319] = { 6,	TD,		SEN(epoll_pwait),		"epoll_pwait"		},
diff --git a/linux/sh64/syscallent.h b/linux/sh64/syscallent.h
index 5ec1647..0f9ad1a 100644
--- a/linux/sh64/syscallent.h
+++ b/linux/sh64/syscallent.h
@@ -74,7 +74,7 @@
 [ 45] = { 1,	TM|SI,		SEN(brk),			"brk"			},
 [ 46] = { 1,	0,		SEN(setgid16),			"setgid"		},
 [ 47] = { 0,	NF,		SEN(getgid16),			"getgid"		},
-[ 48] = { 3,	TS,		SEN(signal),			"signal"		},
+[ 48] = { 2,	TS,		SEN(signal),			"signal"		},
 [ 49] = { 0,	NF,		SEN(geteuid16),			"geteuid"		},
 [ 50] = { 0,	NF,		SEN(getegid16),			"getegid"		},
 [ 51] = { 1,	TF,		SEN(acct),			"acct"			},
@@ -143,7 +143,7 @@
 [114] = { 4,	TP,		SEN(wait4),			"wait4"			},
 [115] = { 1,	TF,		SEN(swapoff),			"swapoff"		},
 [116] = { 1,	0,		SEN(sysinfo),			"sysinfo"		},
-[117] = { 5,	TI,		SEN(ipc),			"ipc"			},
+[117] = { 6,	TI,		SEN(ipc),			"ipc"			},
 [118] = { 1,	TD,		SEN(fsync),			"fsync"			},
 [119] = { 0,	TS,		SEN(sigreturn),			"sigreturn"		},
 [120] = { 5,	TP,		SEN(clone),			"clone"			},
@@ -266,13 +266,13 @@
 [238] = { 3,	TI,		SEN(semget),			"semget"		},
 [239] = { 4,	TI,		SEN(semctl),			"semctl"		},
 [240] = { 4,	TI,		SEN(msgsnd),			"msgsnd"		},
-[241] = { 4,	TI,		SEN(msgrcv),			"msgrcv"		},
+[241] = { 5,	TI,		SEN(msgrcv),			"msgrcv"		},
 [242] = { 2,	TI,		SEN(msgget),			"msgget"		},
-[243] = { 4,	TI,		SEN(msgctl),			"msgctl"		},
-[244] = { 4,	TI|TM|SI,	SEN(shmat),			"shmat"			},
-[245] = { 4,	TI|TM|SI,	SEN(shmdt),			"shmdt"			},
+[243] = { 3,	TI,		SEN(msgctl),			"msgctl"		},
+[244] = { 3,	TI|TM|SI,	SEN(shmat),			"shmat"			},
+[245] = { 1,	TI|TM|SI,	SEN(shmdt),			"shmdt"			},
 [246] = { 3,	TI,		SEN(shmget),			"shmget"		},
-[247] = { 4,	TI,		SEN(shmctl),			"shmctl"		},
+[247] = { 3,	TI,		SEN(shmctl),			"shmctl"		},
 [248] = { 3,	TD,		SEN(getdents64),		"getdents64"		},
 [249] = { 3,	TD,		SEN(fcntl64),			"fcntl64"		},
 [250 ... 251] = { },
@@ -320,7 +320,7 @@
 [294] = { 2,	0,		SEN(clock_getres),		"clock_getres"		},
 [295] = { 4,	0,		SEN(clock_nanosleep),		"clock_nanosleep"	},
 [296] = { 3,	TF,		SEN(statfs64),			"statfs64"		},
-[297] = { 2,	TD,		SEN(fstatfs64),			"fstatfs64"		},
+[297] = { 3,	TD,		SEN(fstatfs64),			"fstatfs64"		},
 [298] = { 3,	TS,		SEN(tgkill),			"tgkill"		},
 [299] = { 2,	TF,		SEN(utimes),			"utimes"		},
 [300] = { 4,	TD,		SEN(fadvise64),			"fadvise64_64"		},
@@ -367,7 +367,7 @@
 [341] = { 6,	TD,		SEN(splice),			"splice"		},
 [342] = { 4,	TD,		SEN(sync_file_range),		"sync_file_range"	},
 [343] = { 4,	TD,		SEN(tee),			"tee"			},
-[344] = { 5,	TD,		SEN(vmsplice),			"vmsplice"		},
+[344] = { 4,	TD,		SEN(vmsplice),			"vmsplice"		},
 [345] = { 6,	TM,		SEN(move_pages),		"move_pages"		},
 [346] = { 3,	0,		SEN(getcpu),			"getcpu"		},
 [347] = { 6,	TD,		SEN(epoll_pwait),		"epoll_pwait"		},
diff --git a/linux/sparc/syscallent.h b/linux/sparc/syscallent.h
index 69c886e..d400371 100644
--- a/linux/sparc/syscallent.h
+++ b/linux/sparc/syscallent.h
@@ -24,7 +24,7 @@
 [ 23] = { 1,	0,		SEN(setuid16),			"setuid"		},
 [ 24] = { 0,	NF,		SEN(getuid16),			"getuid"		},
 [ 25] = { 4,	TD,		SEN(vmsplice),			"vmsplice"		},
-[ 26] = { 5,	0,		SEN(ptrace),			"ptrace"		},
+[ 26] = { 4,	0,		SEN(ptrace),			"ptrace"		},
 [ 27] = { 1,	0,		SEN(alarm),			"alarm"			},
 [ 28] = { 2,	TS,		SEN(sigaltstack),		"sigaltstack"		},
 [ 29] = { 0,	TS,		SEN(pause),			"pause"			},
@@ -39,14 +39,14 @@
 [ 38] = { 2,	TF,		SEN(stat),			"stat"			},
 [ 39] = { 4,	TD|TN,		SEN(sendfile),			"sendfile"		},
 [ 40] = { 2,	TF,		SEN(lstat),			"lstat"			},
-[ 41] = { 2,	TD,		SEN(dup),			"dup"			},
+[ 41] = { 1,	TD,		SEN(dup),			"dup"			},
 [ 42] = { 0,	TD,		SEN(pipe),			"pipe"			},
 [ 43] = { 1,	0,		SEN(times),			"times"			},
 [ 44] = { 0,	NF,		SEN(getuid),			"getuid32"		},
 [ 45] = { 2,	TF,		SEN(umount2),			"umount2"		},
 [ 46] = { 1,	0,		SEN(setgid16),			"setgid"		},
 [ 47] = { 0,	NF,		SEN(getgid16),			"getgid"		},
-[ 48] = { 3,	TS,		SEN(signal),			"signal"		},
+[ 48] = { 2,	TS,		SEN(signal),			"signal"		},
 [ 49] = { 0,	NF,		SEN(geteuid16),			"geteuid"		},
 [ 50] = { 0,	NF,		SEN(getegid16),			"getegid"		},
 [ 51] = { 1,	TF,		SEN(acct),			"acct"			},
@@ -213,7 +213,7 @@
 [212] = { 3,	TP,		SEN(waitpid),			"waitpid"		},
 [213] = { 1,	TF,		SEN(swapoff),			"swapoff"		},
 [214] = { 1,	0,		SEN(sysinfo),			"sysinfo"		},
-[215] = { 5,	TI,		SEN(ipc),			"ipc"			},
+[215] = { 6,	TI,		SEN(ipc),			"ipc"			},
 [216] = { 0,	TS,		SEN(sigreturn),			"sigreturn"		},
 [217] = { 5,	TP,		SEN(clone),			"clone"			},
 [218] = { 2,	0,		SEN(ioprio_get),		"ioprio_get"		},
diff --git a/linux/sparc64/syscallent.h b/linux/sparc64/syscallent.h
index 13ee2fc..c49a4da 100644
--- a/linux/sparc64/syscallent.h
+++ b/linux/sparc64/syscallent.h
@@ -24,7 +24,7 @@
 [ 23] = { 1,	0,		SEN(setuid16),			"setuid"		},
 [ 24] = { 0,	NF,		SEN(getuid16),			"getuid"		},
 [ 25] = { 4,	TD,		SEN(vmsplice),			"vmsplice"		},
-[ 26] = { 5,	0,		SEN(ptrace),			"ptrace"		},
+[ 26] = { 4,	0,		SEN(ptrace),			"ptrace"		},
 [ 27] = { 1,	0,		SEN(alarm),			"alarm"			},
 [ 28] = { 2,	TS,		SEN(sigaltstack),		"sigaltstack"		},
 [ 29] = { 0,	TS,		SEN(pause),			"pause"			},
@@ -38,14 +38,14 @@
 [ 38] = { 2,	TF,		SEN(stat),			"stat"			},
 [ 39] = { 4,	TD|TN,		SEN(sendfile),			"sendfile"		},
 [ 40] = { 2,	TF,		SEN(lstat),			"lstat"			},
-[ 41] = { 2,	TD,		SEN(dup),			"dup"			},
+[ 41] = { 1,	TD,		SEN(dup),			"dup"			},
 [ 42] = { 0,	TD,		SEN(pipe),			"pipe"			},
 [ 43] = { 1,	0,		SEN(times),			"times"			},
 [ 44] = { },
 [ 45] = { 2,	TF,		SEN(umount2),			"umount2"		},
 [ 46] = { 1,	0,		SEN(setgid16),			"setgid"		},
 [ 47] = { 0,	NF,		SEN(getgid16),			"getgid"		},
-[ 48] = { 3,	TS,		SEN(signal),			"signal"		},
+[ 48] = { 2,	TS,		SEN(signal),			"signal"		},
 [ 49] = { 0,	NF,		SEN(geteuid16),			"geteuid"		},
 [ 50] = { 0,	NF,		SEN(getegid16),			"getegid"		},
 [ 51] = { 1,	TF,		SEN(acct),			"acct"			},
@@ -64,8 +64,8 @@
 [ 64] = { 0,	0,		SEN(getpagesize),		"getpagesize"		},
 [ 65] = { 3,	TM,		SEN(msync),			"msync"			},
 [ 66] = { 0,	TP,		SEN(vfork),			"vfork"			},
-[ 67] = { 5,	TD,		SEN(pread),			"pread64"		},
-[ 68] = { 5,	TD,		SEN(pwrite),			"pwrite64"		},
+[ 67] = { 4,	TD,		SEN(pread),			"pread64"		},
+[ 68] = { 4,	TD,		SEN(pwrite),			"pwrite64"		},
 [ 69 ... 70] = { },
 [ 71] = { 6,	TD|TM|SI,	SEN(mmap),			"mmap"			},
 [ 72] = { },
@@ -201,17 +201,17 @@
 [202] = { 2,	TF,		SEN(lstat),			"oldlstat"		},
 [203] = { 1,	TF,		SEN(uselib),			"uselib"		},
 [204] = { 3,	TD,		SEN(readdir),			"readdir"		},
-[205] = { 4,	TD,		SEN(readahead),			"readahead"		},
+[205] = { 3,	TD,		SEN(readahead),			"readahead"		},
 [206] = { 2,	TD,		SEN(socketcall),		"socketcall"		},
 [207] = { 3,	0,		SEN(syslog),			"syslog"		},
-[208] = { 4,	0,		SEN(lookup_dcookie),		"lookup_dcookie"	},
-[209] = { 5,	TD,		SEN(fadvise64),			"fadvise64"		},
-[210] = { 6,	TD,		SEN(fadvise64_64),		"fadvise64_64"		},
+[208] = { 3,	0,		SEN(lookup_dcookie),		"lookup_dcookie"	},
+[209] = { 4,	TD,		SEN(fadvise64),			"fadvise64"		},
+[210] = { 4,	TD,		SEN(fadvise64),			"fadvise64_64"		},
 [211] = { 3,	TS,		SEN(tgkill),			"tgkill"		},
 [212] = { 3,	TP,		SEN(waitpid),			"waitpid"		},
 [213] = { 1,	TF,		SEN(swapoff),			"swapoff"		},
 [214] = { 1,	0,		SEN(sysinfo),			"sysinfo"		},
-[215] = { 5,	TI,		SEN(ipc),			"ipc"			},
+[215] = { 6,	TI,		SEN(ipc),			"ipc"			},
 [216] = { 0,	TS,		SEN(sigreturn),			"sigreturn"		},
 [217] = { 5,	TP,		SEN(clone),			"clone"			},
 [218] = { 2,	0,		SEN(ioprio_get),		"ioprio_get"		},
@@ -251,7 +251,7 @@
 [252] = { 1,	0,		SEN(getsid),			"getsid"		},
 [253] = { 1,	TD,		SEN(fdatasync),			"fdatasync"		},
 [254] = { 3,	0,		SEN(nfsservctl),		"nfsservctl"		},
-[255] = { 6,	TD,		SEN(sync_file_range),		"sync_file_range"	},
+[255] = { 4,	TD,		SEN(sync_file_range),		"sync_file_range"	},
 [256] = { 2,	0,		SEN(clock_settime),		"clock_settime"		},
 [257] = { 2,	0,		SEN(clock_gettime),		"clock_gettime"		},
 [258] = { 2,	0,		SEN(clock_getres),		"clock_getres"		},
@@ -310,7 +310,7 @@
 [311] = { 3,	TD|TS,		SEN(signalfd),			"signalfd"		},
 [312] = { 2,	TD,		SEN(timerfd_create),		"timerfd_create"	},
 [313] = { 1,	TD,		SEN(eventfd),			"eventfd"		},
-[314] = { 6,	TD,		SEN(fallocate),			"fallocate"		},
+[314] = { 4,	TD,		SEN(fallocate),			"fallocate"		},
 [315] = { 4,	TD,		SEN(timerfd_settime),		"timerfd_settime"	},
 [316] = { 2,	TD,		SEN(timerfd_gettime),		"timerfd_gettime"	},
 [317] = { 4,	TD|TS,		SEN(signalfd4),			"signalfd4"		},
@@ -320,13 +320,13 @@
 [321] = { 2,	TD,		SEN(pipe2),			"pipe2"			},
 [322] = { 1,	TD,		SEN(inotify_init1),		"inotify_init1"		},
 [323] = { 4,	TN,		SEN(accept4),			"accept4"		},
-[324] = { 5,	TD,		SEN(preadv),			"preadv"		},
-[325] = { 5,	TD,		SEN(pwritev),			"pwritev"		},
+[324] = { 4,	TD,		SEN(preadv),			"preadv"		},
+[325] = { 4,	TD,		SEN(pwritev),			"pwritev"		},
 [326] = { 4,	TP|TS,		SEN(rt_tgsigqueueinfo),		"rt_tgsigqueueinfo"	},
 [327] = { 5,	TD,		SEN(perf_event_open),		"perf_event_open"	},
 [328] = { 5,	TN,		SEN(recvmmsg),			"recvmmsg"		},
 [329] = { 2,	TD,		SEN(fanotify_init),		"fanotify_init"		},
-[330] = { 6,	TD|TF,		SEN(fanotify_mark),		"fanotify_mark"		},
+[330] = { 5,	TD|TF,		SEN(fanotify_mark),		"fanotify_mark"		},
 [331] = { 4,	0,		SEN(prlimit64),			"prlimit64"		},
 [332] = { 5,	TD|TF,		SEN(name_to_handle_at),		"name_to_handle_at"	},
 [333] = { 3,	TD,		SEN(open_by_handle_at),		"open_by_handle_at"	},
diff --git a/linux/x32/syscallent.h b/linux/x32/syscallent.h
index b3b4814..bcc0d38 100644
--- a/linux/x32/syscallent.h
+++ b/linux/x32/syscallent.h
@@ -45,7 +45,7 @@
 [ 44] = { 6,	TN,		SEN(sendto),			"sendto"		},
 [ 45] = { 6,	TN,		SEN(printargs),			"64:recvfrom"		},
 [ 46] = { 3,	TN,		SEN(printargs),			"64:sendmsg"		},
-[ 47] = { 5,	TN,		SEN(printargs),			"64:recvmsg"		},
+[ 47] = { 3,	TN,		SEN(printargs),			"64:recvmsg"		},
 [ 48] = { 2,	TN,		SEN(shutdown),			"shutdown"		},
 [ 49] = { 3,	TN,		SEN(bind),			"bind"			},
 [ 50] = { 2,	TN,		SEN(listen),			"listen"		},
diff --git a/linux/xtensa/syscallent.h b/linux/xtensa/syscallent.h
index 5f07c2f..ffb7d43 100644
--- a/linux/xtensa/syscallent.h
+++ b/linux/xtensa/syscallent.h
@@ -81,7 +81,7 @@
 [ 85] = { 2,	TM,		SEN(munlock),			"munlock"		},
 [ 86] = { 1,	TM,		SEN(mlockall),			"mlockall"		},
 [ 87] = { 0,	TM,		SEN(munlockall),		"munlockall"		},
-[ 88] = { 4,	TM|SI,		SEN(mremap),			"mremap"		},
+[ 88] = { 5,	TM|SI,		SEN(mremap),			"mremap"		},
 [ 89] = { 3,	TM,		SEN(msync),			"msync"			},
 [ 90] = { 3,	TM,		SEN(mincore),			"mincore"		},
 [ 91] = { 3,	TM,		SEN(madvise),			"madvise"		},
@@ -183,7 +183,7 @@
 [188] = { 2,	0,		SEN(setrlimit),			"setrlimit"		},
 [189] = { 2,	0,		SEN(getrlimit),			"getrlimit"		},
 [190] = { 2,	0,		SEN(getrusage),			"getrusage"		},
-[191] = { 5,	0,		SEN(futex),			"futex"			},
+[191] = { 6,	0,		SEN(futex),			"futex"			},
 [192] = { 2,	0,		SEN(gettimeofday),		"gettimeofday"		},
 [193] = { 2,	0,		SEN(settimeofday),		"settimeofday"		},
 [194] = { 1,	0,		SEN(adjtimex),			"adjtimex"		},
@@ -195,15 +195,15 @@
 [200] = { 3,	0,		SEN(syslog),			"syslog"		},
 [201] = { 0,	0,		SEN(vhangup),			"vhangup"		},
 [202] = { 1,	TF,		SEN(uselib),			"uselib"		},
-[203] = { 3,	0,		SEN(reboot),			"reboot"		},
+[203] = { 4,	0,		SEN(reboot),			"reboot"		},
 [204] = { 4,	TF,		SEN(quotactl),			"quotactl"		},
 [205] = { 3,	0,		SEN(nfsservctl),		"nfsservctl"		},
 [206] = { 1,	0,		SEN(sysctl),			"_sysctl"		},
 [207] = { 2,	0,		SEN(bdflush),			"bdflush"		},
 [208] = { 1,	0,		SEN(uname),			"uname"			},
 [209] = { 1,	0,		SEN(sysinfo),			"sysinfo"		},
-[210] = { 2,	0,		SEN(init_module),		"init_module"		},
-[211] = { 1,	0,		SEN(delete_module),		"delete_module"		},
+[210] = { 3,	0,		SEN(init_module),		"init_module"		},
+[211] = { 2,	0,		SEN(delete_module),		"delete_module"		},
 [212] = { 2,	0,		SEN(sched_setparam),		"sched_setparam"	},
 [213] = { 2,	0,		SEN(sched_getparam),		"sched_getparam"	},
 [214] = { 3,	0,		SEN(sched_setscheduler),	"sched_setscheduler"	},
@@ -247,7 +247,7 @@
 [254] = { 4,	0,		SEN(lookup_dcookie),		"lookup_dcookie"	},
 [255] = { },
 [256] = { 5,	0,		SEN(add_key),			"add_key"		},
-[257] = { 5,	0,		SEN(request_key),		"request_key"		},
+[257] = { 4,	0,		SEN(request_key),		"request_key"		},
 [258] = { 5,	0,		SEN(keyctl),			"keyctl"		},
 [259] = { },
 [260] = { 5,	TD,		SEN(readahead),			"readahead"		},
@@ -270,10 +270,10 @@
 [277] = { 3,	TD,		SEN(inotify_add_watch),		"inotify_add_watch"	},
 [278] = { 2,	TD,		SEN(inotify_rm_watch),		"inotify_rm_watch"	},
 [279] = { 1,	TD,		SEN(inotify_init1),		"inotify_init1"		},
-[280] = { 0,	0,		SEN(getcpu),			"getcpu"		},
+[280] = { 3,	0,		SEN(getcpu),			"getcpu"		},
 [281] = { 4,	0,		SEN(kexec_load),		"kexec_load"		},
-[282] = { 2,	0,		SEN(ioprio_set),		"ioprio_set"		},
-[283] = { 3,	0,		SEN(ioprio_get),		"ioprio_get"		},
+[282] = { 3,	0,		SEN(ioprio_set),		"ioprio_set"		},
+[283] = { 2,	0,		SEN(ioprio_get),		"ioprio_get"		},
 [284] = { 2,	0,		SEN(set_robust_list),		"set_robust_list"	},
 [285] = { 3,	0,		SEN(get_robust_list),		"get_robust_list"	},
 [286 ... 287] = { },
@@ -285,12 +285,12 @@
 [293] = { 5,	TD|TF,		SEN(linkat),			"linkat"		},
 [294] = { 3,	TD|TF,		SEN(symlinkat),			"symlinkat"		},
 [295] = { 4,	TD|TF,		SEN(readlinkat),		"readlinkat"		},
-[296] = { 0,	TD|TF,		SEN(utimensat),			"utimensat"		},
+[296] = { 4,	TD|TF,		SEN(utimensat),			"utimensat"		},
 [297] = { 5,	TD|TF,		SEN(fchownat),			"fchownat"		},
-[298] = { 4,	TD|TF,		SEN(futimesat),			"futimesat"		},
+[298] = { 3,	TD|TF,		SEN(futimesat),			"futimesat"		},
 [299] = { 4,	TD|TF,		SEN(newfstatat),		"fstatat64"		},
-[300] = { 4,	TD|TF,		SEN(fchmodat),			"fchmodat"		},
-[301] = { 4,	TD|TF,		SEN(faccessat),			"faccessat"		},
+[300] = { 3,	TD|TF,		SEN(fchmodat),			"fchmodat"		},
+[301] = { 3,	TD|TF,		SEN(faccessat),			"faccessat"		},
 [302 ... 303] = { },
 [304] = { 3,	TD|TS,		SEN(signalfd),			"signalfd"		},
 [305] = { },