diff --git a/sys/amd64/linux/linux_proto.h b/sys/amd64/linux/linux_proto.h
index dabe5b0ff0c9..11d3051bdb90 100644
--- a/sys/amd64/linux/linux_proto.h
+++ b/sys/amd64/linux/linux_proto.h
@@ -605,42 +605,15 @@ struct linux_setdomainname_args {
 struct linux_iopl_args {
 	char level_l_[PADL_(l_uint)]; l_uint level; char level_r_[PADR_(l_uint)];
 };
-struct linux_create_module_args {
-	register_t dummy;
-};
 struct linux_init_module_args {
 	register_t dummy;
 };
 struct linux_delete_module_args {
 	register_t dummy;
 };
-struct linux_get_kernel_syms_args {
-	register_t dummy;
-};
-struct linux_query_module_args {
-	register_t dummy;
-};
 struct linux_quotactl_args {
 	register_t dummy;
 };
-struct linux_nfsservctl_args {
-	register_t dummy;
-};
-struct linux_getpmsg_args {
-	register_t dummy;
-};
-struct linux_putpmsg_args {
-	register_t dummy;
-};
-struct linux_afs_syscall_args {
-	register_t dummy;
-};
-struct linux_tuxcall_args {
-	register_t dummy;
-};
-struct linux_security_args {
-	register_t dummy;
-};
 struct linux_gettid_args {
 	register_t dummy;
 };
@@ -705,21 +678,12 @@ struct linux_sched_getaffinity_args {
 	char len_l_[PADL_(l_uint)]; l_uint len; char len_r_[PADR_(l_uint)];
 	char user_mask_ptr_l_[PADL_(l_ulong *)]; l_ulong * user_mask_ptr; char user_mask_ptr_r_[PADR_(l_ulong *)];
 };
-struct linux_set_thread_area_args {
-	register_t dummy;
-};
 struct linux_lookup_dcookie_args {
 	register_t dummy;
 };
 struct linux_epoll_create_args {
 	char size_l_[PADL_(l_int)]; l_int size; char size_r_[PADR_(l_int)];
 };
-struct linux_epoll_ctl_old_args {
-	register_t dummy;
-};
-struct linux_epoll_wait_old_args {
-	register_t dummy;
-};
 struct linux_remap_file_pages_args {
 	register_t dummy;
 };
@@ -1377,18 +1341,9 @@ int	linux_reboot(struct thread *, struct linux_reboot_args *);
 int	linux_sethostname(struct thread *, struct linux_sethostname_args *);
 int	linux_setdomainname(struct thread *, struct linux_setdomainname_args *);
 int	linux_iopl(struct thread *, struct linux_iopl_args *);
-int	linux_create_module(struct thread *, struct linux_create_module_args *);
 int	linux_init_module(struct thread *, struct linux_init_module_args *);
 int	linux_delete_module(struct thread *, struct linux_delete_module_args *);
-int	linux_get_kernel_syms(struct thread *, struct linux_get_kernel_syms_args *);
-int	linux_query_module(struct thread *, struct linux_query_module_args *);
 int	linux_quotactl(struct thread *, struct linux_quotactl_args *);
-int	linux_nfsservctl(struct thread *, struct linux_nfsservctl_args *);
-int	linux_getpmsg(struct thread *, struct linux_getpmsg_args *);
-int	linux_putpmsg(struct thread *, struct linux_putpmsg_args *);
-int	linux_afs_syscall(struct thread *, struct linux_afs_syscall_args *);
-int	linux_tuxcall(struct thread *, struct linux_tuxcall_args *);
-int	linux_security(struct thread *, struct linux_security_args *);
 int	linux_gettid(struct thread *, struct linux_gettid_args *);
 int	linux_setxattr(struct thread *, struct linux_setxattr_args *);
 int	linux_lsetxattr(struct thread *, struct linux_lsetxattr_args *);
@@ -1407,11 +1362,8 @@ int	linux_time(struct thread *, struct linux_time_args *);
 int	linux_sys_futex(struct thread *, struct linux_sys_futex_args *);
 int	linux_sched_setaffinity(struct thread *, struct linux_sched_setaffinity_args *);
 int	linux_sched_getaffinity(struct thread *, struct linux_sched_getaffinity_args *);
-int	linux_set_thread_area(struct thread *, struct linux_set_thread_area_args *);
 int	linux_lookup_dcookie(struct thread *, struct linux_lookup_dcookie_args *);
 int	linux_epoll_create(struct thread *, struct linux_epoll_create_args *);
-int	linux_epoll_ctl_old(struct thread *, struct linux_epoll_ctl_old_args *);
-int	linux_epoll_wait_old(struct thread *, struct linux_epoll_wait_old_args *);
 int	linux_remap_file_pages(struct thread *, struct linux_remap_file_pages_args *);
 int	linux_getdents64(struct thread *, struct linux_getdents64_args *);
 int	linux_set_tid_address(struct thread *, struct linux_set_tid_address_args *);
@@ -1689,18 +1641,9 @@ int	linux_pkey_free(struct thread *, struct linux_pkey_free_args *);
 #define	LINUX_SYS_AUE_linux_sethostname	AUE_SYSCTL
 #define	LINUX_SYS_AUE_linux_setdomainname	AUE_SYSCTL
 #define	LINUX_SYS_AUE_linux_iopl	AUE_NULL
-#define	LINUX_SYS_AUE_linux_create_module	AUE_NULL
 #define	LINUX_SYS_AUE_linux_init_module	AUE_NULL
 #define	LINUX_SYS_AUE_linux_delete_module	AUE_NULL
-#define	LINUX_SYS_AUE_linux_get_kernel_syms	AUE_NULL
-#define	LINUX_SYS_AUE_linux_query_module	AUE_NULL
 #define	LINUX_SYS_AUE_linux_quotactl	AUE_QUOTACTL
-#define	LINUX_SYS_AUE_linux_nfsservctl	AUE_NULL
-#define	LINUX_SYS_AUE_linux_getpmsg	AUE_GETPMSG
-#define	LINUX_SYS_AUE_linux_putpmsg	AUE_PUTPMSG
-#define	LINUX_SYS_AUE_linux_afs_syscall	AUE_NULL
-#define	LINUX_SYS_AUE_linux_tuxcall	AUE_NULL
-#define	LINUX_SYS_AUE_linux_security	AUE_NULL
 #define	LINUX_SYS_AUE_linux_gettid	AUE_NULL
 #define	LINUX_SYS_AUE_linux_setxattr	AUE_NULL
 #define	LINUX_SYS_AUE_linux_lsetxattr	AUE_NULL
@@ -1719,11 +1662,8 @@ int	linux_pkey_free(struct thread *, struct linux_pkey_free_args *);
 #define	LINUX_SYS_AUE_linux_sys_futex	AUE_NULL
 #define	LINUX_SYS_AUE_linux_sched_setaffinity	AUE_NULL
 #define	LINUX_SYS_AUE_linux_sched_getaffinity	AUE_NULL
-#define	LINUX_SYS_AUE_linux_set_thread_area	AUE_NULL
 #define	LINUX_SYS_AUE_linux_lookup_dcookie	AUE_NULL
 #define	LINUX_SYS_AUE_linux_epoll_create	AUE_NULL
-#define	LINUX_SYS_AUE_linux_epoll_ctl_old	AUE_NULL
-#define	LINUX_SYS_AUE_linux_epoll_wait_old	AUE_NULL
 #define	LINUX_SYS_AUE_linux_remap_file_pages	AUE_NULL
 #define	LINUX_SYS_AUE_linux_getdents64	AUE_GETDIRENTRIES
 #define	LINUX_SYS_AUE_linux_set_tid_address	AUE_NULL
diff --git a/sys/amd64/linux/linux_syscall.h b/sys/amd64/linux/linux_syscall.h
index f7213363a603..717f0facd5d9 100644
--- a/sys/amd64/linux/linux_syscall.h
+++ b/sys/amd64/linux/linux_syscall.h
@@ -176,18 +176,9 @@
 #define	LINUX_SYS_linux_sethostname	170
 #define	LINUX_SYS_linux_setdomainname	171
 #define	LINUX_SYS_linux_iopl	172
-#define	LINUX_SYS_linux_create_module	174
 #define	LINUX_SYS_linux_init_module	175
 #define	LINUX_SYS_linux_delete_module	176
-#define	LINUX_SYS_linux_get_kernel_syms	177
-#define	LINUX_SYS_linux_query_module	178
 #define	LINUX_SYS_linux_quotactl	179
-#define	LINUX_SYS_linux_nfsservctl	180
-#define	LINUX_SYS_linux_getpmsg	181
-#define	LINUX_SYS_linux_putpmsg	182
-#define	LINUX_SYS_linux_afs_syscall	183
-#define	LINUX_SYS_linux_tuxcall	184
-#define	LINUX_SYS_linux_security	185
 #define	LINUX_SYS_linux_gettid	186
 #define	LINUX_SYS_linux_setxattr	188
 #define	LINUX_SYS_linux_lsetxattr	189
@@ -206,11 +197,8 @@
 #define	LINUX_SYS_linux_sys_futex	202
 #define	LINUX_SYS_linux_sched_setaffinity	203
 #define	LINUX_SYS_linux_sched_getaffinity	204
-#define	LINUX_SYS_linux_set_thread_area	205
 #define	LINUX_SYS_linux_lookup_dcookie	212
 #define	LINUX_SYS_linux_epoll_create	213
-#define	LINUX_SYS_linux_epoll_ctl_old	214
-#define	LINUX_SYS_linux_epoll_wait_old	215
 #define	LINUX_SYS_linux_remap_file_pages	216
 #define	LINUX_SYS_linux_getdents64	217
 #define	LINUX_SYS_linux_set_tid_address	218
diff --git a/sys/amd64/linux/linux_syscalls.c b/sys/amd64/linux/linux_syscalls.c
index 1ed98ae2ca7c..98f4f407ae33 100644
--- a/sys/amd64/linux/linux_syscalls.c
+++ b/sys/amd64/linux/linux_syscalls.c
@@ -181,18 +181,18 @@ const char *linux_syscallnames[] = {
 	"linux_setdomainname",			/* 171 = linux_setdomainname */
 	"linux_iopl",			/* 172 = linux_iopl */
 	"#173",			/* 173 = ioperm */
-	"linux_create_module",			/* 174 = linux_create_module */
+	"#174",			/* 174 = create_module */
 	"linux_init_module",			/* 175 = linux_init_module */
 	"linux_delete_module",			/* 176 = linux_delete_module */
-	"linux_get_kernel_syms",			/* 177 = linux_get_kernel_syms */
-	"linux_query_module",			/* 178 = linux_query_module */
+	"#177",			/* 177 = get_kernel_syms */
+	"#178",			/* 178 = query_module */
 	"linux_quotactl",			/* 179 = linux_quotactl */
-	"linux_nfsservctl",			/* 180 = linux_nfsservctl */
-	"linux_getpmsg",			/* 181 = linux_getpmsg */
-	"linux_putpmsg",			/* 182 = linux_putpmsg */
-	"linux_afs_syscall",			/* 183 = linux_afs_syscall */
-	"linux_tuxcall",			/* 184 = linux_tuxcall */
-	"linux_security",			/* 185 = linux_security */
+	"#180",			/* 180 = nfsservctl */
+	"#181",			/* 181 = getpmsg */
+	"#182",			/* 182 = putpmsg */
+	"#183",			/* 183 = afs_syscall */
+	"#184",			/* 184 = tuxcall */
+	"#185",			/* 185 = security */
 	"linux_gettid",			/* 186 = linux_gettid */
 	"#187",			/* 187 = linux_readahead */
 	"linux_setxattr",			/* 188 = linux_setxattr */
@@ -212,17 +212,17 @@ const char *linux_syscallnames[] = {
 	"linux_sys_futex",			/* 202 = linux_sys_futex */
 	"linux_sched_setaffinity",			/* 203 = linux_sched_setaffinity */
 	"linux_sched_getaffinity",			/* 204 = linux_sched_getaffinity */
-	"linux_set_thread_area",			/* 205 = linux_set_thread_area */
+	"#205",			/* 205 = set_thread_area */
 	"#206",			/* 206 = linux_io_setup */
 	"#207",			/* 207 = linux_io_destroy */
 	"#208",			/* 208 = linux_io_getevents */
 	"#209",			/* 209 = linux_io_submit */
 	"#210",			/* 210 = linux_io_cancel */
-	"#211",			/* 211 = linux_get_thread_area */
+	"#211",			/* 211 = get_thread_area */
 	"linux_lookup_dcookie",			/* 212 = linux_lookup_dcookie */
 	"linux_epoll_create",			/* 213 = linux_epoll_create */
-	"linux_epoll_ctl_old",			/* 214 = linux_epoll_ctl_old */
-	"linux_epoll_wait_old",			/* 215 = linux_epoll_wait_old */
+	"#214",			/* 214 = epoll_ctl_old */
+	"#215",			/* 215 = epoll_wait_old */
 	"linux_remap_file_pages",			/* 216 = linux_remap_file_pages */
 	"linux_getdents64",			/* 217 = linux_getdents64 */
 	"linux_set_tid_address",			/* 218 = linux_set_tid_address */
diff --git a/sys/amd64/linux/linux_sysent.c b/sys/amd64/linux/linux_sysent.c
index b9224fec6da1..3b672b1b43e9 100644
--- a/sys/amd64/linux/linux_sysent.c
+++ b/sys/amd64/linux/linux_sysent.c
@@ -191,18 +191,18 @@ struct sysent linux_sysent[] = {
 	{ AS(linux_setdomainname_args), (sy_call_t *)linux_setdomainname, AUE_SYSCTL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 171 = linux_setdomainname */
 	{ AS(linux_iopl_args), (sy_call_t *)linux_iopl, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 172 = linux_iopl */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 173 = ioperm */
-	{ 0, (sy_call_t *)linux_create_module, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 174 = linux_create_module */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 174 = create_module */
 	{ 0, (sy_call_t *)linux_init_module, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 175 = linux_init_module */
 	{ 0, (sy_call_t *)linux_delete_module, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 176 = linux_delete_module */
-	{ 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 177 = linux_get_kernel_syms */
-	{ 0, (sy_call_t *)linux_query_module, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 178 = linux_query_module */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 177 = get_kernel_syms */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 178 = query_module */
 	{ 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 179 = linux_quotactl */
-	{ 0, (sy_call_t *)linux_nfsservctl, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 180 = linux_nfsservctl */
-	{ 0, (sy_call_t *)linux_getpmsg, AUE_GETPMSG, NULL, 0, 0, 0, SY_THR_STATIC },	/* 181 = linux_getpmsg */
-	{ 0, (sy_call_t *)linux_putpmsg, AUE_PUTPMSG, NULL, 0, 0, 0, SY_THR_STATIC },	/* 182 = linux_putpmsg */
-	{ 0, (sy_call_t *)linux_afs_syscall, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 183 = linux_afs_syscall */
-	{ 0, (sy_call_t *)linux_tuxcall, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 184 = linux_tuxcall */
-	{ 0, (sy_call_t *)linux_security, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 185 = linux_security */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 180 = nfsservctl */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 181 = getpmsg */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 182 = putpmsg */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 183 = afs_syscall */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 184 = tuxcall */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 185 = security */
 	{ 0, (sy_call_t *)linux_gettid, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 186 = linux_gettid */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 187 = linux_readahead */
 	{ 0, (sy_call_t *)linux_setxattr, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 188 = linux_setxattr */
@@ -222,17 +222,17 @@ struct sysent linux_sysent[] = {
 	{ AS(linux_sys_futex_args), (sy_call_t *)linux_sys_futex, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 202 = linux_sys_futex */
 	{ AS(linux_sched_setaffinity_args), (sy_call_t *)linux_sched_setaffinity, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 203 = linux_sched_setaffinity */
 	{ AS(linux_sched_getaffinity_args), (sy_call_t *)linux_sched_getaffinity, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 204 = linux_sched_getaffinity */
-	{ 0, (sy_call_t *)linux_set_thread_area, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 205 = linux_set_thread_area */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 205 = set_thread_area */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 206 = linux_io_setup */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 207 = linux_io_destroy */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 208 = linux_io_getevents */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 209 = linux_io_submit */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 210 = linux_io_cancel */
-	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 211 = linux_get_thread_area */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 211 = get_thread_area */
 	{ 0, (sy_call_t *)linux_lookup_dcookie, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 212 = linux_lookup_dcookie */
 	{ AS(linux_epoll_create_args), (sy_call_t *)linux_epoll_create, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 213 = linux_epoll_create */
-	{ 0, (sy_call_t *)linux_epoll_ctl_old, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 214 = linux_epoll_ctl_old */
-	{ 0, (sy_call_t *)linux_epoll_wait_old, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 215 = linux_epoll_wait_old */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 214 = epoll_ctl_old */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 215 = epoll_wait_old */
 	{ 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 216 = linux_remap_file_pages */
 	{ AS(linux_getdents64_args), (sy_call_t *)linux_getdents64, AUE_GETDIRENTRIES, NULL, 0, 0, 0, SY_THR_STATIC },	/* 217 = linux_getdents64 */
 	{ AS(linux_set_tid_address_args), (sy_call_t *)linux_set_tid_address, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 218 = linux_set_tid_address */
diff --git a/sys/amd64/linux/linux_systrace_args.c b/sys/amd64/linux/linux_systrace_args.c
index 9adea93312ce..d976d1a92627 100644
--- a/sys/amd64/linux/linux_systrace_args.c
+++ b/sys/amd64/linux/linux_systrace_args.c
@@ -1396,11 +1396,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		*n_args = 1;
 		break;
 	}
-	/* linux_create_module */
-	case 174: {
-		*n_args = 0;
-		break;
-	}
 	/* linux_init_module */
 	case 175: {
 		*n_args = 0;
@@ -1411,51 +1406,11 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		*n_args = 0;
 		break;
 	}
-	/* linux_get_kernel_syms */
-	case 177: {
-		*n_args = 0;
-		break;
-	}
-	/* linux_query_module */
-	case 178: {
-		*n_args = 0;
-		break;
-	}
 	/* linux_quotactl */
 	case 179: {
 		*n_args = 0;
 		break;
 	}
-	/* linux_nfsservctl */
-	case 180: {
-		*n_args = 0;
-		break;
-	}
-	/* linux_getpmsg */
-	case 181: {
-		*n_args = 0;
-		break;
-	}
-	/* linux_putpmsg */
-	case 182: {
-		*n_args = 0;
-		break;
-	}
-	/* linux_afs_syscall */
-	case 183: {
-		*n_args = 0;
-		break;
-	}
-	/* linux_tuxcall */
-	case 184: {
-		*n_args = 0;
-		break;
-	}
-	/* linux_security */
-	case 185: {
-		*n_args = 0;
-		break;
-	}
 	/* linux_gettid */
 	case 186: {
 		*n_args = 0;
@@ -1566,11 +1521,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		*n_args = 3;
 		break;
 	}
-	/* linux_set_thread_area */
-	case 205: {
-		*n_args = 0;
-		break;
-	}
 	/* linux_lookup_dcookie */
 	case 212: {
 		*n_args = 0;
@@ -1583,16 +1533,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		*n_args = 1;
 		break;
 	}
-	/* linux_epoll_ctl_old */
-	case 214: {
-		*n_args = 0;
-		break;
-	}
-	/* linux_epoll_wait_old */
-	case 215: {
-		*n_args = 0;
-		break;
-	}
 	/* linux_remap_file_pages */
 	case 216: {
 		*n_args = 0;
@@ -4771,42 +4711,15 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			break;
 		};
 		break;
-	/* linux_create_module */
-	case 174:
-		break;
 	/* linux_init_module */
 	case 175:
 		break;
 	/* linux_delete_module */
 	case 176:
 		break;
-	/* linux_get_kernel_syms */
-	case 177:
-		break;
-	/* linux_query_module */
-	case 178:
-		break;
 	/* linux_quotactl */
 	case 179:
 		break;
-	/* linux_nfsservctl */
-	case 180:
-		break;
-	/* linux_getpmsg */
-	case 181:
-		break;
-	/* linux_putpmsg */
-	case 182:
-		break;
-	/* linux_afs_syscall */
-	case 183:
-		break;
-	/* linux_tuxcall */
-	case 184:
-		break;
-	/* linux_security */
-	case 185:
-		break;
 	/* linux_gettid */
 	case 186:
 		break;
@@ -4926,9 +4839,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			break;
 		};
 		break;
-	/* linux_set_thread_area */
-	case 205:
-		break;
 	/* linux_lookup_dcookie */
 	case 212:
 		break;
@@ -4942,12 +4852,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			break;
 		};
 		break;
-	/* linux_epoll_ctl_old */
-	case 214:
-		break;
-	/* linux_epoll_wait_old */
-	case 215:
-		break;
 	/* linux_remap_file_pages */
 	case 216:
 		break;
@@ -7214,30 +7118,12 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;
-	/* linux_create_module */
-	case 174:
 	/* linux_init_module */
 	case 175:
 	/* linux_delete_module */
 	case 176:
-	/* linux_get_kernel_syms */
-	case 177:
-	/* linux_query_module */
-	case 178:
 	/* linux_quotactl */
 	case 179:
-	/* linux_nfsservctl */
-	case 180:
-	/* linux_getpmsg */
-	case 181:
-	/* linux_putpmsg */
-	case 182:
-	/* linux_afs_syscall */
-	case 183:
-	/* linux_tuxcall */
-	case 184:
-	/* linux_security */
-	case 185:
 	/* linux_gettid */
 	case 186:
 	/* linux_setxattr */
@@ -7289,8 +7175,6 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;
-	/* linux_set_thread_area */
-	case 205:
 	/* linux_lookup_dcookie */
 	case 212:
 	/* linux_epoll_create */
@@ -7298,10 +7182,6 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;
-	/* linux_epoll_ctl_old */
-	case 214:
-	/* linux_epoll_wait_old */
-	case 215:
 	/* linux_remap_file_pages */
 	case 216:
 	/* linux_getdents64 */
diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h
index c4b2b3d68f56..266db5cb9a55 100644
--- a/sys/amd64/linux32/linux32_proto.h
+++ b/sys/amd64/linux32/linux32_proto.h
@@ -402,18 +402,12 @@ struct linux_sigprocmask_args {
 	char mask_l_[PADL_(l_osigset_t *)]; l_osigset_t * mask; char mask_r_[PADR_(l_osigset_t *)];
 	char omask_l_[PADL_(l_osigset_t *)]; l_osigset_t * omask; char omask_r_[PADR_(l_osigset_t *)];
 };
-struct linux_create_module_args {
-	register_t dummy;
-};
 struct linux_init_module_args {
 	register_t dummy;
 };
 struct linux_delete_module_args {
 	register_t dummy;
 };
-struct linux_get_kernel_syms_args {
-	register_t dummy;
-};
 struct linux_quotactl_args {
 	register_t dummy;
 };
@@ -524,12 +518,6 @@ struct linux_getresuid16_args {
 	char euid_l_[PADL_(l_uid16_t *)]; l_uid16_t * euid; char euid_r_[PADR_(l_uid16_t *)];
 	char suid_l_[PADL_(l_uid16_t *)]; l_uid16_t * suid; char suid_r_[PADR_(l_uid16_t *)];
 };
-struct linux_query_module_args {
-	register_t dummy;
-};
-struct linux_nfsservctl_args {
-	register_t dummy;
-};
 struct linux_setresgid16_args {
 	char rgid_l_[PADL_(l_gid16_t)]; l_gid16_t rgid; char rgid_r_[PADR_(l_gid16_t)];
 	char egid_l_[PADL_(l_gid16_t)]; l_gid16_t egid; char egid_r_[PADR_(l_gid16_t)];
@@ -1470,10 +1458,8 @@ int	linux_newuname(struct thread *, struct linux_newuname_args *);
 int	linux_adjtimex(struct thread *, struct linux_adjtimex_args *);
 int	linux_mprotect(struct thread *, struct linux_mprotect_args *);
 int	linux_sigprocmask(struct thread *, struct linux_sigprocmask_args *);
-int	linux_create_module(struct thread *, struct linux_create_module_args *);
 int	linux_init_module(struct thread *, struct linux_init_module_args *);
 int	linux_delete_module(struct thread *, struct linux_delete_module_args *);
-int	linux_get_kernel_syms(struct thread *, struct linux_get_kernel_syms_args *);
 int	linux_quotactl(struct thread *, struct linux_quotactl_args *);
 int	linux_bdflush(struct thread *, struct linux_bdflush_args *);
 int	linux_sysfs(struct thread *, struct linux_sysfs_args *);
@@ -1500,8 +1486,6 @@ int	linux_nanosleep(struct thread *, struct linux_nanosleep_args *);
 int	linux_mremap(struct thread *, struct linux_mremap_args *);
 int	linux_setresuid16(struct thread *, struct linux_setresuid16_args *);
 int	linux_getresuid16(struct thread *, struct linux_getresuid16_args *);
-int	linux_query_module(struct thread *, struct linux_query_module_args *);
-int	linux_nfsservctl(struct thread *, struct linux_nfsservctl_args *);
 int	linux_setresgid16(struct thread *, struct linux_setresgid16_args *);
 int	linux_getresgid16(struct thread *, struct linux_getresgid16_args *);
 int	linux_prctl(struct thread *, struct linux_prctl_args *);
@@ -1816,10 +1800,8 @@ int	linux_pkey_free(struct thread *, struct linux_pkey_free_args *);
 #define	LINUX32_SYS_AUE_linux_adjtimex	AUE_ADJTIME
 #define	LINUX32_SYS_AUE_linux_mprotect	AUE_MPROTECT
 #define	LINUX32_SYS_AUE_linux_sigprocmask	AUE_SIGPROCMASK
-#define	LINUX32_SYS_AUE_linux_create_module	AUE_NULL
 #define	LINUX32_SYS_AUE_linux_init_module	AUE_NULL
 #define	LINUX32_SYS_AUE_linux_delete_module	AUE_NULL
-#define	LINUX32_SYS_AUE_linux_get_kernel_syms	AUE_NULL
 #define	LINUX32_SYS_AUE_linux_quotactl	AUE_QUOTACTL
 #define	LINUX32_SYS_AUE_linux_bdflush	AUE_BDFLUSH
 #define	LINUX32_SYS_AUE_linux_sysfs	AUE_NULL
@@ -1846,8 +1828,6 @@ int	linux_pkey_free(struct thread *, struct linux_pkey_free_args *);
 #define	LINUX32_SYS_AUE_linux_mremap	AUE_NULL
 #define	LINUX32_SYS_AUE_linux_setresuid16	AUE_SETRESUID
 #define	LINUX32_SYS_AUE_linux_getresuid16	AUE_GETRESUID
-#define	LINUX32_SYS_AUE_linux_query_module	AUE_NULL
-#define	LINUX32_SYS_AUE_linux_nfsservctl	AUE_NULL
 #define	LINUX32_SYS_AUE_linux_setresgid16	AUE_SETRESGID
 #define	LINUX32_SYS_AUE_linux_getresgid16	AUE_GETRESGID
 #define	LINUX32_SYS_AUE_linux_prctl	AUE_PRCTL
diff --git a/sys/amd64/linux32/linux32_syscall.h b/sys/amd64/linux32/linux32_syscall.h
index aa94cedbf658..3a62ef373f36 100644
--- a/sys/amd64/linux32/linux32_syscall.h
+++ b/sys/amd64/linux32/linux32_syscall.h
@@ -116,10 +116,8 @@
 #define	LINUX32_SYS_linux_adjtimex	124
 #define	LINUX32_SYS_linux_mprotect	125
 #define	LINUX32_SYS_linux_sigprocmask	126
-#define	LINUX32_SYS_linux_create_module	127
 #define	LINUX32_SYS_linux_init_module	128
 #define	LINUX32_SYS_linux_delete_module	129
-#define	LINUX32_SYS_linux_get_kernel_syms	130
 #define	LINUX32_SYS_linux_quotactl	131
 #define	LINUX32_SYS_getpgid	132
 #define	LINUX32_SYS_fchdir	133
@@ -154,9 +152,7 @@
 #define	LINUX32_SYS_linux_mremap	163
 #define	LINUX32_SYS_linux_setresuid16	164
 #define	LINUX32_SYS_linux_getresuid16	165
-#define	LINUX32_SYS_linux_query_module	167
 #define	LINUX32_SYS_poll	168
-#define	LINUX32_SYS_linux_nfsservctl	169
 #define	LINUX32_SYS_linux_setresgid16	170
 #define	LINUX32_SYS_linux_getresgid16	171
 #define	LINUX32_SYS_linux_prctl	172
diff --git a/sys/amd64/linux32/linux32_syscalls.c b/sys/amd64/linux32/linux32_syscalls.c
index 41de22559b34..6b010e188c75 100644
--- a/sys/amd64/linux32/linux32_syscalls.c
+++ b/sys/amd64/linux32/linux32_syscalls.c
@@ -134,10 +134,10 @@ const char *linux32_syscallnames[] = {
 	"linux_adjtimex",			/* 124 = linux_adjtimex */
 	"linux_mprotect",			/* 125 = linux_mprotect */
 	"linux_sigprocmask",			/* 126 = linux_sigprocmask */
-	"linux_create_module",			/* 127 = linux_create_module */
+	"#127",			/* 127 = create_module */
 	"linux_init_module",			/* 128 = linux_init_module */
 	"linux_delete_module",			/* 129 = linux_delete_module */
-	"linux_get_kernel_syms",			/* 130 = linux_get_kernel_syms */
+	"#130",			/* 130 = get_kernel_syms */
 	"linux_quotactl",			/* 131 = linux_quotactl */
 	"getpgid",			/* 132 = getpgid */
 	"fchdir",			/* 133 = fchdir */
@@ -174,9 +174,9 @@ const char *linux32_syscallnames[] = {
 	"linux_setresuid16",			/* 164 = linux_setresuid16 */
 	"linux_getresuid16",			/* 165 = linux_getresuid16 */
 	"#166",			/* 166 = vm86 */
-	"linux_query_module",			/* 167 = linux_query_module */
+	"#167",			/* 167 = query_module */
 	"poll",			/* 168 = poll */
-	"linux_nfsservctl",			/* 169 = linux_nfsservctl */
+	"#169",			/* 169 = nfsservctl */
 	"linux_setresgid16",			/* 170 = linux_setresgid16 */
 	"linux_getresgid16",			/* 171 = linux_getresgid16 */
 	"linux_prctl",			/* 172 = linux_prctl */
diff --git a/sys/amd64/linux32/linux32_sysent.c b/sys/amd64/linux32/linux32_sysent.c
index 0147fc95b412..9995d873336c 100644
--- a/sys/amd64/linux32/linux32_sysent.c
+++ b/sys/amd64/linux32/linux32_sysent.c
@@ -145,10 +145,10 @@ struct sysent linux32_sysent[] = {
 	{ 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME, NULL, 0, 0, 0, SY_THR_STATIC },	/* 124 = linux_adjtimex */
 	{ AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 125 = linux_mprotect */
 	{ AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 126 = linux_sigprocmask */
-	{ 0, (sy_call_t *)linux_create_module, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 127 = linux_create_module */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 127 = create_module */
 	{ 0, (sy_call_t *)linux_init_module, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 128 = linux_init_module */
 	{ 0, (sy_call_t *)linux_delete_module, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 129 = linux_delete_module */
-	{ 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 130 = linux_get_kernel_syms */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 130 = get_kernel_syms */
 	{ 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 131 = linux_quotactl */
 	{ AS(getpgid_args), (sy_call_t *)sys_getpgid, AUE_GETPGID, NULL, 0, 0, 0, SY_THR_STATIC },	/* 132 = getpgid */
 	{ AS(fchdir_args), (sy_call_t *)sys_fchdir, AUE_FCHDIR, NULL, 0, 0, 0, SY_THR_STATIC },	/* 133 = fchdir */
@@ -185,9 +185,9 @@ struct sysent linux32_sysent[] = {
 	{ AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID, NULL, 0, 0, 0, SY_THR_STATIC },	/* 164 = linux_setresuid16 */
 	{ AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID, NULL, 0, 0, 0, SY_THR_STATIC },	/* 165 = linux_getresuid16 */
 	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 166 = vm86 */
-	{ 0, (sy_call_t *)linux_query_module, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 167 = linux_query_module */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 167 = query_module */
 	{ AS(poll_args), (sy_call_t *)sys_poll, AUE_POLL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 168 = poll */
-	{ 0, (sy_call_t *)linux_nfsservctl, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 169 = linux_nfsservctl */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 169 = nfsservctl */
 	{ AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID, NULL, 0, 0, 0, SY_THR_STATIC },	/* 170 = linux_setresgid16 */
 	{ AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID, NULL, 0, 0, 0, SY_THR_STATIC },	/* 171 = linux_getresgid16 */
 	{ AS(linux_prctl_args), (sy_call_t *)linux_prctl, AUE_PRCTL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 172 = linux_prctl */
diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c
index 523c4e544d94..b9335c716c87 100644
--- a/sys/amd64/linux32/linux32_systrace_args.c
+++ b/sys/amd64/linux32/linux32_systrace_args.c
@@ -854,11 +854,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		*n_args = 3;
 		break;
 	}
-	/* linux_create_module */
-	case 127: {
-		*n_args = 0;
-		break;
-	}
 	/* linux_init_module */
 	case 128: {
 		*n_args = 0;
@@ -869,11 +864,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		*n_args = 0;
 		break;
 	}
-	/* linux_get_kernel_syms */
-	case 130: {
-		*n_args = 0;
-		break;
-	}
 	/* linux_quotactl */
 	case 131: {
 		*n_args = 0;
@@ -1139,11 +1129,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		*n_args = 3;
 		break;
 	}
-	/* linux_query_module */
-	case 167: {
-		*n_args = 0;
-		break;
-	}
 	/* poll */
 	case 168: {
 		struct poll_args *p = params;
@@ -1153,11 +1138,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		*n_args = 3;
 		break;
 	}
-	/* linux_nfsservctl */
-	case 169: {
-		*n_args = 0;
-		break;
-	}
 	/* linux_setresgid16 */
 	case 170: {
 		struct linux_setresgid16_args *p = params;
@@ -4026,18 +4006,12 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			break;
 		};
 		break;
-	/* linux_create_module */
-	case 127:
-		break;
 	/* linux_init_module */
 	case 128:
 		break;
 	/* linux_delete_module */
 	case 129:
 		break;
-	/* linux_get_kernel_syms */
-	case 130:
-		break;
 	/* linux_quotactl */
 	case 131:
 		break;
@@ -4455,9 +4429,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			break;
 		};
 		break;
-	/* linux_query_module */
-	case 167:
-		break;
 	/* poll */
 	case 168:
 		switch(ndx) {
@@ -4474,9 +4445,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			break;
 		};
 		break;
-	/* linux_nfsservctl */
-	case 169:
-		break;
 	/* linux_setresgid16 */
 	case 170:
 		switch(ndx) {
@@ -7464,14 +7432,10 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;
-	/* linux_create_module */
-	case 127:
 	/* linux_init_module */
 	case 128:
 	/* linux_delete_module */
 	case 129:
-	/* linux_get_kernel_syms */
-	case 130:
 	/* linux_quotactl */
 	case 131:
 	/* getpgid */
@@ -7630,15 +7594,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;
-	/* linux_query_module */
-	case 167:
 	/* poll */
 	case 168:
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;
-	/* linux_nfsservctl */
-	case 169:
 	/* linux_setresgid16 */
 	case 170:
 		if (ndx == 0 || ndx == 1)
diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h
index a953776fbb5c..c2620e79acfd 100644
--- a/sys/i386/linux/linux_proto.h
+++ b/sys/i386/linux/linux_proto.h
@@ -410,18 +410,12 @@ struct linux_sigprocmask_args {
 	char mask_l_[PADL_(l_osigset_t *)]; l_osigset_t * mask; char mask_r_[PADR_(l_osigset_t *)];
 	char omask_l_[PADL_(l_osigset_t *)]; l_osigset_t * omask; char omask_r_[PADR_(l_osigset_t *)];
 };
-struct linux_create_module_args {
-	register_t dummy;
-};
 struct linux_init_module_args {
 	register_t dummy;
 };
 struct linux_delete_module_args {
 	register_t dummy;
 };
-struct linux_get_kernel_syms_args {
-	register_t dummy;
-};
 struct linux_quotactl_args {
 	register_t dummy;
 };
@@ -525,12 +519,6 @@ struct linux_getresuid16_args {
 struct linux_vm86_args {
 	register_t dummy;
 };
-struct linux_query_module_args {
-	register_t dummy;
-};
-struct linux_nfsservctl_args {
-	register_t dummy;
-};
 struct linux_setresgid16_args {
 	char rgid_l_[PADL_(l_gid16_t)]; l_gid16_t rgid; char rgid_r_[PADR_(l_gid16_t)];
 	char egid_l_[PADL_(l_gid16_t)]; l_gid16_t egid; char egid_r_[PADR_(l_gid16_t)];
@@ -1490,10 +1478,8 @@ int	linux_modify_ldt(struct thread *, struct linux_modify_ldt_args *);
 int	linux_adjtimex(struct thread *, struct linux_adjtimex_args *);
 int	linux_mprotect(struct thread *, struct linux_mprotect_args *);
 int	linux_sigprocmask(struct thread *, struct linux_sigprocmask_args *);
-int	linux_create_module(struct thread *, struct linux_create_module_args *);
 int	linux_init_module(struct thread *, struct linux_init_module_args *);
 int	linux_delete_module(struct thread *, struct linux_delete_module_args *);
-int	linux_get_kernel_syms(struct thread *, struct linux_get_kernel_syms_args *);
 int	linux_quotactl(struct thread *, struct linux_quotactl_args *);
 int	linux_bdflush(struct thread *, struct linux_bdflush_args *);
 int	linux_sysfs(struct thread *, struct linux_sysfs_args *);
@@ -1519,8 +1505,6 @@ int	linux_mremap(struct thread *, struct linux_mremap_args *);
 int	linux_setresuid16(struct thread *, struct linux_setresuid16_args *);
 int	linux_getresuid16(struct thread *, struct linux_getresuid16_args *);
 int	linux_vm86(struct thread *, struct linux_vm86_args *);
-int	linux_query_module(struct thread *, struct linux_query_module_args *);
-int	linux_nfsservctl(struct thread *, struct linux_nfsservctl_args *);
 int	linux_setresgid16(struct thread *, struct linux_setresgid16_args *);
 int	linux_getresgid16(struct thread *, struct linux_getresgid16_args *);
 int	linux_prctl(struct thread *, struct linux_prctl_args *);
@@ -1838,10 +1822,8 @@ int	linux_pkey_free(struct thread *, struct linux_pkey_free_args *);
 #define	LINUX_SYS_AUE_linux_adjtimex	AUE_ADJTIME
 #define	LINUX_SYS_AUE_linux_mprotect	AUE_MPROTECT
 #define	LINUX_SYS_AUE_linux_sigprocmask	AUE_SIGPROCMASK
-#define	LINUX_SYS_AUE_linux_create_module	AUE_NULL
 #define	LINUX_SYS_AUE_linux_init_module	AUE_NULL
 #define	LINUX_SYS_AUE_linux_delete_module	AUE_NULL
-#define	LINUX_SYS_AUE_linux_get_kernel_syms	AUE_NULL
 #define	LINUX_SYS_AUE_linux_quotactl	AUE_QUOTACTL
 #define	LINUX_SYS_AUE_linux_bdflush	AUE_BDFLUSH
 #define	LINUX_SYS_AUE_linux_sysfs	AUE_NULL
@@ -1867,8 +1849,6 @@ int	linux_pkey_free(struct thread *, struct linux_pkey_free_args *);
 #define	LINUX_SYS_AUE_linux_setresuid16	AUE_SETRESUID
 #define	LINUX_SYS_AUE_linux_getresuid16	AUE_GETRESUID
 #define	LINUX_SYS_AUE_linux_vm86	AUE_NULL
-#define	LINUX_SYS_AUE_linux_query_module	AUE_NULL
-#define	LINUX_SYS_AUE_linux_nfsservctl	AUE_NULL
 #define	LINUX_SYS_AUE_linux_setresgid16	AUE_SETRESGID
 #define	LINUX_SYS_AUE_linux_getresgid16	AUE_GETRESGID
 #define	LINUX_SYS_AUE_linux_prctl	AUE_PRCTL
diff --git a/sys/i386/linux/linux_syscall.h b/sys/i386/linux/linux_syscall.h
index 07d48bfb1686..7fcf7053d0f4 100644
--- a/sys/i386/linux/linux_syscall.h
+++ b/sys/i386/linux/linux_syscall.h
@@ -121,10 +121,8 @@
 #define	LINUX_SYS_linux_adjtimex	124
 #define	LINUX_SYS_linux_mprotect	125
 #define	LINUX_SYS_linux_sigprocmask	126
-#define	LINUX_SYS_linux_create_module	127
 #define	LINUX_SYS_linux_init_module	128
 #define	LINUX_SYS_linux_delete_module	129
-#define	LINUX_SYS_linux_get_kernel_syms	130
 #define	LINUX_SYS_linux_quotactl	131
 #define	LINUX_SYS_getpgid	132
 #define	LINUX_SYS_fchdir	133
@@ -160,9 +158,7 @@
 #define	LINUX_SYS_linux_setresuid16	164
 #define	LINUX_SYS_linux_getresuid16	165
 #define	LINUX_SYS_linux_vm86	166
-#define	LINUX_SYS_linux_query_module	167
 #define	LINUX_SYS_poll	168
-#define	LINUX_SYS_linux_nfsservctl	169
 #define	LINUX_SYS_linux_setresgid16	170
 #define	LINUX_SYS_linux_getresgid16	171
 #define	LINUX_SYS_linux_prctl	172
diff --git a/sys/i386/linux/linux_syscalls.c b/sys/i386/linux/linux_syscalls.c
index 1220bb70174d..e626c8f2e348 100644
--- a/sys/i386/linux/linux_syscalls.c
+++ b/sys/i386/linux/linux_syscalls.c
@@ -134,10 +134,10 @@ const char *linux_syscallnames[] = {
 	"linux_adjtimex",			/* 124 = linux_adjtimex */
 	"linux_mprotect",			/* 125 = linux_mprotect */
 	"linux_sigprocmask",			/* 126 = linux_sigprocmask */
-	"linux_create_module",			/* 127 = linux_create_module */
+	"#127",			/* 127 = create_module */
 	"linux_init_module",			/* 128 = linux_init_module */
 	"linux_delete_module",			/* 129 = linux_delete_module */
-	"linux_get_kernel_syms",			/* 130 = linux_get_kernel_syms */
+	"#130",			/* 130 = get_kernel_syms */
 	"linux_quotactl",			/* 131 = linux_quotactl */
 	"getpgid",			/* 132 = getpgid */
 	"fchdir",			/* 133 = fchdir */
@@ -174,9 +174,9 @@ const char *linux_syscallnames[] = {
 	"linux_setresuid16",			/* 164 = linux_setresuid16 */
 	"linux_getresuid16",			/* 165 = linux_getresuid16 */
 	"linux_vm86",			/* 166 = linux_vm86 */
-	"linux_query_module",			/* 167 = linux_query_module */
+	"#167",			/* 167 = query_module */
 	"poll",			/* 168 = poll */
-	"linux_nfsservctl",			/* 169 = linux_nfsservctl */
+	"#169",			/* 169 = nfsservctl */
 	"linux_setresgid16",			/* 170 = linux_setresgid16 */
 	"linux_getresgid16",			/* 171 = linux_getresgid16 */
 	"linux_prctl",			/* 172 = linux_prctl */
diff --git a/sys/i386/linux/linux_sysent.c b/sys/i386/linux/linux_sysent.c
index 3588b9cab373..fb9334d52b6c 100644
--- a/sys/i386/linux/linux_sysent.c
+++ b/sys/i386/linux/linux_sysent.c
@@ -144,10 +144,10 @@ struct sysent linux_sysent[] = {
 	{ 0, (sy_call_t *)linux_adjtimex, AUE_ADJTIME, NULL, 0, 0, 0, SY_THR_STATIC },	/* 124 = linux_adjtimex */
 	{ AS(linux_mprotect_args), (sy_call_t *)linux_mprotect, AUE_MPROTECT, NULL, 0, 0, 0, SY_THR_STATIC },	/* 125 = linux_mprotect */
 	{ AS(linux_sigprocmask_args), (sy_call_t *)linux_sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0, 0, SY_THR_STATIC },	/* 126 = linux_sigprocmask */
-	{ 0, (sy_call_t *)linux_create_module, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 127 = linux_create_module */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 127 = create_module */
 	{ 0, (sy_call_t *)linux_init_module, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 128 = linux_init_module */
 	{ 0, (sy_call_t *)linux_delete_module, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 129 = linux_delete_module */
-	{ 0, (sy_call_t *)linux_get_kernel_syms, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 130 = linux_get_kernel_syms */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 130 = get_kernel_syms */
 	{ 0, (sy_call_t *)linux_quotactl, AUE_QUOTACTL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 131 = linux_quotactl */
 	{ AS(getpgid_args), (sy_call_t *)sys_getpgid, AUE_GETPGID, NULL, 0, 0, 0, SY_THR_STATIC },	/* 132 = getpgid */
 	{ AS(fchdir_args), (sy_call_t *)sys_fchdir, AUE_FCHDIR, NULL, 0, 0, 0, SY_THR_STATIC },	/* 133 = fchdir */
@@ -184,9 +184,9 @@ struct sysent linux_sysent[] = {
 	{ AS(linux_setresuid16_args), (sy_call_t *)linux_setresuid16, AUE_SETRESUID, NULL, 0, 0, 0, SY_THR_STATIC },	/* 164 = linux_setresuid16 */
 	{ AS(linux_getresuid16_args), (sy_call_t *)linux_getresuid16, AUE_GETRESUID, NULL, 0, 0, 0, SY_THR_STATIC },	/* 165 = linux_getresuid16 */
 	{ 0, (sy_call_t *)linux_vm86, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 166 = linux_vm86 */
-	{ 0, (sy_call_t *)linux_query_module, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 167 = linux_query_module */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 167 = query_module */
 	{ AS(poll_args), (sy_call_t *)sys_poll, AUE_POLL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 168 = poll */
-	{ 0, (sy_call_t *)linux_nfsservctl, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 169 = linux_nfsservctl */
+	{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT },			/* 169 = nfsservctl */
 	{ AS(linux_setresgid16_args), (sy_call_t *)linux_setresgid16, AUE_SETRESGID, NULL, 0, 0, 0, SY_THR_STATIC },	/* 170 = linux_setresgid16 */
 	{ AS(linux_getresgid16_args), (sy_call_t *)linux_getresgid16, AUE_GETRESGID, NULL, 0, 0, 0, SY_THR_STATIC },	/* 171 = linux_getresgid16 */
 	{ AS(linux_prctl_args), (sy_call_t *)linux_prctl, AUE_PRCTL, NULL, 0, 0, 0, SY_THR_STATIC },	/* 172 = linux_prctl */
diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c
index 4f961bc9f44f..4de40b2dbe8c 100644
--- a/sys/i386/linux/linux_systrace_args.c
+++ b/sys/i386/linux/linux_systrace_args.c
@@ -892,11 +892,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		*n_args = 3;
 		break;
 	}
-	/* linux_create_module */
-	case 127: {
-		*n_args = 0;
-		break;
-	}
 	/* linux_init_module */
 	case 128: {
 		*n_args = 0;
@@ -907,11 +902,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		*n_args = 0;
 		break;
 	}
-	/* linux_get_kernel_syms */
-	case 130: {
-		*n_args = 0;
-		break;
-	}
 	/* linux_quotactl */
 	case 131: {
 		*n_args = 0;
@@ -1182,11 +1172,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		*n_args = 0;
 		break;
 	}
-	/* linux_query_module */
-	case 167: {
-		*n_args = 0;
-		break;
-	}
 	/* poll */
 	case 168: {
 		struct poll_args *p = params;
@@ -1196,11 +1181,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
 		*n_args = 3;
 		break;
 	}
-	/* linux_nfsservctl */
-	case 169: {
-		*n_args = 0;
-		break;
-	}
 	/* linux_setresgid16 */
 	case 170: {
 		struct linux_setresgid16_args *p = params;
@@ -4160,18 +4140,12 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			break;
 		};
 		break;
-	/* linux_create_module */
-	case 127:
-		break;
 	/* linux_init_module */
 	case 128:
 		break;
 	/* linux_delete_module */
 	case 129:
 		break;
-	/* linux_get_kernel_syms */
-	case 130:
-		break;
 	/* linux_quotactl */
 	case 131:
 		break;
@@ -4592,9 +4566,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 	/* linux_vm86 */
 	case 166:
 		break;
-	/* linux_query_module */
-	case 167:
-		break;
 	/* poll */
 	case 168:
 		switch(ndx) {
@@ -4611,9 +4582,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 			break;
 		};
 		break;
-	/* linux_nfsservctl */
-	case 169:
-		break;
 	/* linux_setresgid16 */
 	case 170:
 		switch(ndx) {
@@ -7717,14 +7685,10 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;
-	/* linux_create_module */
-	case 127:
 	/* linux_init_module */
 	case 128:
 	/* linux_delete_module */
 	case 129:
-	/* linux_get_kernel_syms */
-	case 130:
 	/* linux_quotactl */
 	case 131:
 	/* getpgid */
@@ -7885,15 +7849,11 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
 		break;
 	/* linux_vm86 */
 	case 166:
-	/* linux_query_module */
-	case 167:
 	/* poll */
 	case 168:
 		if (ndx == 0 || ndx == 1)
 			p = "int";
 		break;
-	/* linux_nfsservctl */
-	case 169:
 	/* linux_setresgid16 */
 	case 170:
 		if (ndx == 0 || ndx == 1)