Module Name: src
Committed By: pgoyette
Date: Wed May 13 02:13:08 UTC 2015
Modified Files:
src/sys/kern: init_sysent.c syscalls.c syscalls_autoload.c
systrace_args.c
src/sys/rump/include/rump: rump_syscalls.h
src/sys/rump/librump/rumpkern: rump_syscalls.c
src/sys/sys: syscall.h syscallargs.h
Log Message:
Regenerate
To generate a diff of this commit:
cvs rdiff -u -r1.296 -r1.297 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.285 -r1.286 src/sys/kern/syscalls.c
cvs rdiff -u -r1.3 -r1.4 src/sys/kern/syscalls_autoload.c
cvs rdiff -u -r1.5 -r1.6 src/sys/kern/systrace_args.c
cvs rdiff -u -r1.86 -r1.87 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.111 -r1.112 src/sys/rump/librump/rumpkern/rump_syscalls.c
cvs rdiff -u -r1.280 -r1.281 src/sys/sys/syscall.h
cvs rdiff -u -r1.264 -r1.265 src/sys/sys/syscallargs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/init_sysent.c
diff -u src/sys/kern/init_sysent.c:1.296 src/sys/kern/init_sysent.c:1.297
--- src/sys/kern/init_sysent.c:1.296 Sun May 10 08:13:41 2015
+++ src/sys/kern/init_sysent.c Wed May 13 02:13:08 2015
@@ -1,14 +1,14 @@
-/* $NetBSD: init_sysent.c,v 1.296 2015/05/10 08:13:41 pgoyette Exp $ */
+/* $NetBSD: init_sysent.c,v 1.297 2015/05/13 02:13:08 pgoyette Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.276 2015/05/10 07:41:15 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.277 2015/05/13 02:10:46 pgoyette Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.296 2015/05/10 08:13:41 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.297 2015/05/13 02:13:08 pgoyette Exp $");
#include "opt_modular.h"
#include "opt_ntp.h"
@@ -852,7 +852,7 @@ struct sysent sysent[] = {
{
.sy_call = sys_nosys,
}, /* 168 = filler */
-#if (defined(SYSVSEM) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
{
ns(struct compat_10_sys_semsys_args),
.sy_call = (sy_call_t *)sys_nomodule
@@ -862,7 +862,7 @@ struct sysent sysent[] = {
.sy_call = sys_nosys,
}, /* 169 = filler */
#endif
-#if (defined(SYSVMSG) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
{
ns(struct compat_10_sys_msgsys_args),
.sy_call = (sy_call_t *)sys_nomodule
@@ -872,7 +872,7 @@ struct sysent sysent[] = {
.sy_call = sys_nosys,
}, /* 170 = filler */
#endif
-#if (defined(SYSVSHM) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
{
ns(struct compat_10_sys_shmsys_args),
.sy_call = (sy_call_t *)sys_nomodule
@@ -1092,7 +1092,6 @@ struct sysent sysent[] = {
{
.sy_call = sys_nosys,
}, /* 219 = filler */
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
{
ns(struct compat_14_sys___semctl_args),
.sy_flags = SYCALL_ARG_PTR,
@@ -1100,32 +1099,17 @@ struct sysent sysent[] = {
}, /* 220 = compat_14___semctl */
{
ns(struct sys_semget_args),
- .sy_call = (sy_call_t *)sys_semget
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 221 = semget */
{
ns(struct sys_semop_args),
.sy_flags = SYCALL_ARG_PTR,
- .sy_call = (sy_call_t *)sys_semop
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 222 = semop */
{
ns(struct sys_semconfig_args),
- .sy_call = (sy_call_t *)sys_semconfig
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 223 = semconfig */
-#else
- {
- .sy_call = sys_nosys,
- }, /* 220 = filler */
- {
- .sy_call = sys_nosys,
- }, /* 221 = filler */
- {
- .sy_call = sys_nosys,
- }, /* 222 = filler */
- {
- .sy_call = sys_nosys,
- }, /* 223 = filler */
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
{
ns(struct compat_14_sys_msgctl_args),
.sy_flags = SYCALL_ARG_PTR,
@@ -1133,37 +1117,22 @@ struct sysent sysent[] = {
}, /* 224 = compat_14_msgctl */
{
ns(struct sys_msgget_args),
- .sy_call = (sy_call_t *)sys_msgget
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 225 = msgget */
{
ns(struct sys_msgsnd_args),
.sy_flags = SYCALL_ARG_PTR,
- .sy_call = (sy_call_t *)sys_msgsnd
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 226 = msgsnd */
{
ns(struct sys_msgrcv_args),
.sy_flags = SYCALL_ARG_PTR,
- .sy_call = (sy_call_t *)sys_msgrcv
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 227 = msgrcv */
-#else
- {
- .sy_call = sys_nosys,
- }, /* 224 = filler */
- {
- .sy_call = sys_nosys,
- }, /* 225 = filler */
- {
- .sy_call = sys_nosys,
- }, /* 226 = filler */
- {
- .sy_call = sys_nosys,
- }, /* 227 = filler */
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
{
ns(struct sys_shmat_args),
.sy_flags = SYCALL_ARG_PTR,
- .sy_call = (sy_call_t *)sys_shmat
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 228 = shmat */
{
ns(struct compat_14_sys_shmctl_args),
@@ -1173,26 +1142,12 @@ struct sysent sysent[] = {
{
ns(struct sys_shmdt_args),
.sy_flags = SYCALL_ARG_PTR,
- .sy_call = (sy_call_t *)sys_shmdt
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 230 = shmdt */
{
ns(struct sys_shmget_args),
- .sy_call = (sy_call_t *)sys_shmget
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 231 = shmget */
-#else
- {
- .sy_call = sys_nosys,
- }, /* 228 = filler */
- {
- .sy_call = sys_nosys,
- }, /* 229 = filler */
- {
- .sy_call = sys_nosys,
- }, /* 230 = filler */
- {
- .sy_call = sys_nosys,
- }, /* 231 = filler */
-#endif
{
ns(struct compat_50_sys_clock_gettime_args),
.sy_flags = SYCALL_ARG_PTR,
@@ -2182,39 +2137,21 @@ struct sysent sysent[] = {
.sy_flags = SYCALL_ARG_PTR,
.sy_call = (sy_call_t *)sys___lstat50
}, /* 441 = __lstat50 */
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
{
ns(struct sys_____semctl50_args),
.sy_flags = SYCALL_ARG_PTR,
- .sy_call = (sy_call_t *)sys_____semctl50
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 442 = ____semctl50 */
-#else
- {
- .sy_call = sys_nosys,
- }, /* 442 = filler */
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
{
ns(struct sys___shmctl50_args),
.sy_flags = SYCALL_ARG_PTR,
- .sy_call = (sy_call_t *)sys___shmctl50
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 443 = __shmctl50 */
-#else
- {
- .sy_call = sys_nosys,
- }, /* 443 = filler */
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
{
ns(struct sys___msgctl50_args),
.sy_flags = SYCALL_ARG_PTR,
- .sy_call = (sy_call_t *)sys___msgctl50
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 444 = __msgctl50 */
-#else
- {
- .sy_call = sys_nosys,
- }, /* 444 = filler */
-#endif
{
ns(struct sys___getrusage50_args),
.sy_flags = SYCALL_ARG_PTR,
Index: src/sys/kern/syscalls.c
diff -u src/sys/kern/syscalls.c:1.285 src/sys/kern/syscalls.c:1.286
--- src/sys/kern/syscalls.c:1.285 Sun May 10 08:13:41 2015
+++ src/sys/kern/syscalls.c Wed May 13 02:13:08 2015
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls.c,v 1.285 2015/05/10 08:13:41 pgoyette Exp $ */
+/* $NetBSD: syscalls.c,v 1.286 2015/05/13 02:13:08 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.276 2015/05/10 07:41:15 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.277 2015/05/13 02:10:46 pgoyette Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.285 2015/05/10 08:13:41 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.286 2015/05/13 02:13:08 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_modular.h"
@@ -193,17 +193,17 @@ const char *const syscallnames[] = {
/* 166 */ "#166 (unimplemented)",
/* 167 */ "#167 (unimplemented)",
/* 168 */ "#168 (unimplemented)",
-#if (defined(SYSVSEM) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
/* 169 */ "compat_10_osemsys",
#else
/* 169 */ "#169 (excluded 1.0 semsys)",
#endif
-#if (defined(SYSVMSG) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
/* 170 */ "compat_10_omsgsys",
#else
/* 170 */ "#170 (excluded 1.0 msgsys)",
#endif
-#if (defined(SYSVSHM) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
/* 171 */ "compat_10_oshmsys",
#else
/* 171 */ "#171 (excluded 1.0 shmsys)",
@@ -260,39 +260,18 @@ const char *const syscallnames[] = {
/* 217 */ "#217 (unimplemented)",
/* 218 */ "#218 (unimplemented)",
/* 219 */ "#219 (unimplemented)",
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* 220 */ "compat_14___semctl",
/* 221 */ "semget",
/* 222 */ "semop",
/* 223 */ "semconfig",
-#else
- /* 220 */ "#220 (excluded compat_14_semctl)",
- /* 221 */ "#221 (excluded semget)",
- /* 222 */ "#222 (excluded semop)",
- /* 223 */ "#223 (excluded semconfig)",
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* 224 */ "compat_14_msgctl",
/* 225 */ "msgget",
/* 226 */ "msgsnd",
/* 227 */ "msgrcv",
-#else
- /* 224 */ "#224 (excluded compat_14_msgctl)",
- /* 225 */ "#225 (excluded msgget)",
- /* 226 */ "#226 (excluded msgsnd)",
- /* 227 */ "#227 (excluded msgrcv)",
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* 228 */ "shmat",
/* 229 */ "compat_14_shmctl",
/* 230 */ "shmdt",
/* 231 */ "shmget",
-#else
- /* 228 */ "#228 (excluded shmat)",
- /* 229 */ "#229 (excluded compat_14_shmctl)",
- /* 230 */ "#230 (excluded shmdt)",
- /* 231 */ "#231 (excluded shmget)",
-#endif
/* 232 */ "compat_50_clock_gettime",
/* 233 */ "compat_50_clock_settime",
/* 234 */ "compat_50_clock_getres",
@@ -515,21 +494,9 @@ const char *const syscallnames[] = {
/* 439 */ "__stat50",
/* 440 */ "__fstat50",
/* 441 */ "__lstat50",
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* 442 */ "____semctl50",
-#else
- /* 442 */ "#442 (excluded ____semctl50)",
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* 443 */ "__shmctl50",
-#else
- /* 443 */ "#443 (excluded ____shmctl50)",
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* 444 */ "__msgctl50",
-#else
- /* 444 */ "#444 (excluded ____msgctl50)",
-#endif
/* 445 */ "__getrusage50",
/* 446 */ "__timer_settime50",
/* 447 */ "__timer_gettime50",
Index: src/sys/kern/syscalls_autoload.c
diff -u src/sys/kern/syscalls_autoload.c:1.3 src/sys/kern/syscalls_autoload.c:1.4
--- src/sys/kern/syscalls_autoload.c:1.3 Sun May 10 08:13:41 2015
+++ src/sys/kern/syscalls_autoload.c Wed May 13 02:13:08 2015
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls_autoload.c,v 1.3 2015/05/10 08:13:41 pgoyette Exp $ */
+/* $NetBSD: syscalls_autoload.c,v 1.4 2015/05/13 02:13:08 pgoyette Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.276 2015/05/10 07:41:15 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.277 2015/05/13 02:10:46 pgoyette Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.3 2015/05/10 08:13:41 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.4 2015/05/13 02:13:08 pgoyette Exp $");
static struct {
u_int al_code;
@@ -100,8 +100,17 @@ static struct {
{ SYS_compat_50_futimes, "compat" },
{ SYS_afssys, "openafs" },
{ SYS_compat_14___semctl, "compat_sysv" },
+ { SYS_semget, "sysv_ipc" },
+ { SYS_semop, "sysv_ipc" },
+ { SYS_semconfig, "sysv_ipc" },
{ SYS_compat_14_msgctl, "compat_sysv" },
+ { SYS_msgget, "sysv_ipc" },
+ { SYS_msgsnd, "sysv_ipc" },
+ { SYS_msgrcv, "sysv_ipc" },
+ { SYS_shmat, "sysv_ipc" },
{ SYS_compat_14_shmctl, "compat_sysv" },
+ { SYS_shmdt, "sysv_ipc" },
+ { SYS_shmget, "sysv_ipc" },
{ SYS_compat_50_clock_gettime, "compat" },
{ SYS_compat_50_clock_settime, "compat" },
{ SYS_compat_50_clock_getres, "compat" },
@@ -166,4 +175,7 @@ static struct {
{ SYS___mq_timedreceive50, "mqueue" },
{ SYS_compat_60__lwp_park, "compat" },
{ SYS___aio_suspend50, "aio" },
+ { SYS_____semctl50, "sysv_ipc" },
+ { SYS___shmctl50, "sysv_ipc" },
+ { SYS___msgctl50, "sysv_ipc" },
};
Index: src/sys/kern/systrace_args.c
diff -u src/sys/kern/systrace_args.c:1.5 src/sys/kern/systrace_args.c:1.6
--- src/sys/kern/systrace_args.c:1.5 Sun May 10 08:13:41 2015
+++ src/sys/kern/systrace_args.c Wed May 13 02:13:08 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: systrace_args.c,v 1.5 2015/05/10 08:13:41 pgoyette Exp $ */
+/* $NetBSD: systrace_args.c,v 1.6 2015/05/13 02:13:08 pgoyette Exp $ */
/*
* System call argument to DTrace register array converstion.
@@ -1205,7 +1205,7 @@ systrace_args(register_t sysnum, const v
*n_args = 2;
break;
}
-#if (defined(SYSVSEM) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
/* sys_semsys */
case 169: {
struct compat_10_sys_semsys_args *p = params;
@@ -1219,7 +1219,7 @@ systrace_args(register_t sysnum, const v
}
#else
#endif
-#if (defined(SYSVMSG) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
/* sys_msgsys */
case 170: {
struct compat_10_sys_msgsys_args *p = params;
@@ -1234,7 +1234,7 @@ systrace_args(register_t sysnum, const v
}
#else
#endif
-#if (defined(SYSVSHM) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
/* sys_shmsys */
case 171: {
struct compat_10_sys_shmsys_args *p = params;
@@ -1536,7 +1536,6 @@ systrace_args(register_t sysnum, const v
*n_args = 7;
break;
}
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* sys___semctl */
case 220: {
struct compat_14_sys___semctl_args *p = params;
@@ -1572,9 +1571,6 @@ systrace_args(register_t sysnum, const v
*n_args = 1;
break;
}
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* sys_msgctl */
case 224: {
struct compat_14_sys_msgctl_args *p = params;
@@ -1613,9 +1609,6 @@ systrace_args(register_t sysnum, const v
*n_args = 5;
break;
}
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* sys_shmat */
case 228: {
struct sys_shmat_args *p = params;
@@ -1650,8 +1643,6 @@ systrace_args(register_t sysnum, const v
*n_args = 3;
break;
}
-#else
-#endif
/* sys_clock_gettime */
case 232: {
struct compat_50_sys_clock_gettime_args *p = params;
@@ -3309,7 +3300,6 @@ systrace_args(register_t sysnum, const v
*n_args = 2;
break;
}
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* sys_____semctl50 */
case 442: {
struct sys_____semctl50_args *p = params;
@@ -3320,9 +3310,6 @@ systrace_args(register_t sysnum, const v
*n_args = 4;
break;
}
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* sys___shmctl50 */
case 443: {
struct sys___shmctl50_args *p = params;
@@ -3332,9 +3319,6 @@ systrace_args(register_t sysnum, const v
*n_args = 3;
break;
}
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* sys___msgctl50 */
case 444: {
struct sys___msgctl50_args *p = params;
@@ -3344,8 +3328,6 @@ systrace_args(register_t sysnum, const v
*n_args = 3;
break;
}
-#else
-#endif
/* sys___getrusage50 */
case 445: {
struct sys___getrusage50_args *p = params;
@@ -5616,7 +5598,7 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#if (defined(SYSVSEM) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
/* sys_semsys */
case 169:
switch(ndx) {
@@ -5641,7 +5623,7 @@ systrace_entry_setargdesc(int sysnum, in
break;
#else
#endif
-#if (defined(SYSVMSG) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
/* sys_msgsys */
case 170:
switch(ndx) {
@@ -5669,7 +5651,7 @@ systrace_entry_setargdesc(int sysnum, in
break;
#else
#endif
-#if (defined(SYSVSHM) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
/* sys_shmsys */
case 171:
switch(ndx) {
@@ -6189,7 +6171,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* sys___semctl */
case 220:
switch(ndx) {
@@ -6251,9 +6232,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* sys_msgctl */
case 224:
switch(ndx) {
@@ -6324,9 +6302,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* sys_shmat */
case 228:
switch(ndx) {
@@ -6385,8 +6360,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#else
-#endif
/* sys_clock_gettime */
case 232:
switch(ndx) {
@@ -9218,7 +9191,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* sys_____semctl50 */
case 442:
switch(ndx) {
@@ -9238,9 +9210,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* sys___shmctl50 */
case 443:
switch(ndx) {
@@ -9257,9 +9226,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* sys___msgctl50 */
case 444:
switch(ndx) {
@@ -9276,8 +9242,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#else
-#endif
/* sys___getrusage50 */
case 445:
switch(ndx) {
@@ -10603,7 +10567,7 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#if (defined(SYSVSEM) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
/* sys_semsys */
case 169:
if (ndx == 0 || ndx == 1)
@@ -10611,7 +10575,7 @@ systrace_return_setargdesc(int sysnum, i
break;
#else
#endif
-#if (defined(SYSVMSG) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
/* sys_msgsys */
case 170:
if (ndx == 0 || ndx == 1)
@@ -10619,7 +10583,7 @@ systrace_return_setargdesc(int sysnum, i
break;
#else
#endif
-#if (defined(SYSVSHM) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
/* sys_shmsys */
case 171:
if (ndx == 0 || ndx == 1)
@@ -10795,7 +10759,6 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* sys___semctl */
case 220:
if (ndx == 0 || ndx == 1)
@@ -10816,9 +10779,6 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* sys_msgctl */
case 224:
if (ndx == 0 || ndx == 1)
@@ -10839,9 +10799,6 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "ssize_t";
break;
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* sys_shmat */
case 228:
if (ndx == 0 || ndx == 1)
@@ -10862,8 +10819,6 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#else
-#endif
/* sys_clock_gettime */
case 232:
if (ndx == 0 || ndx == 1)
@@ -11803,30 +11758,21 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* sys_____semctl50 */
case 442:
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* sys___shmctl50 */
case 443:
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* sys___msgctl50 */
case 444:
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#else
-#endif
/* sys___getrusage50 */
case 445:
if (ndx == 0 || ndx == 1)
Index: src/sys/rump/include/rump/rump_syscalls.h
diff -u src/sys/rump/include/rump/rump_syscalls.h:1.86 src/sys/rump/include/rump/rump_syscalls.h:1.87
--- src/sys/rump/include/rump/rump_syscalls.h:1.86 Sun May 10 08:13:41 2015
+++ src/sys/rump/include/rump/rump_syscalls.h Wed May 13 02:13:08 2015
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.h,v 1.86 2015/05/10 08:13:41 pgoyette Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.87 2015/05/13 02:13:08 pgoyette Exp $ */
/*
* System call protos in rump namespace.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.276 2015/05/10 07:41:15 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.277 2015/05/13 02:10:46 pgoyette Exp
*/
#ifndef _RUMP_RUMP_SYSCALLS_H_
Index: src/sys/rump/librump/rumpkern/rump_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.111 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.112
--- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.111 Sun May 10 08:13:41 2015
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c Wed May 13 02:13:08 2015
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.c,v 1.111 2015/05/10 08:13:41 pgoyette Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.112 2015/05/13 02:13:08 pgoyette Exp $ */
/*
* System call vector and marshalling for rump.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.276 2015/05/10 07:41:15 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.277 2015/05/13 02:10:46 pgoyette Exp
*/
#ifdef RUMP_CLIENT
@@ -15,7 +15,7 @@
#ifdef __NetBSD__
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.111 2015/05/10 08:13:41 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.112 2015/05/13 02:13:08 pgoyette Exp $");
#include <sys/fstypes.h>
#include <sys/proc.h>
@@ -7077,7 +7077,7 @@ struct sysent rump_sysent[] = {
.sy_flags = SYCALL_NOSYS,
.sy_call = (sy_call_t *)rumpns_enosys,
}, /* 168 = filler */
-#if (defined(SYSVSEM) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
{
.sy_flags = SYCALL_NOSYS,
.sy_call = (sy_call_t *)rumpns_sys_nomodule,
@@ -7088,7 +7088,7 @@ struct sysent rump_sysent[] = {
.sy_call = (sy_call_t *)rumpns_enosys,
}, /* 169 = filler */
#endif
-#if (defined(SYSVMSG) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
{
.sy_flags = SYCALL_NOSYS,
.sy_call = (sy_call_t *)rumpns_sys_nomodule,
@@ -7099,7 +7099,7 @@ struct sysent rump_sysent[] = {
.sy_call = (sy_call_t *)rumpns_enosys,
}, /* 170 = filler */
#endif
-#if (defined(SYSVSHM) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
{
.sy_flags = SYCALL_NOSYS,
.sy_call = (sy_call_t *)rumpns_sys_nomodule,
@@ -7302,102 +7302,54 @@ struct sysent rump_sysent[] = {
.sy_flags = SYCALL_NOSYS,
.sy_call = (sy_call_t *)rumpns_enosys,
}, /* 219 = filler */
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
{
.sy_flags = SYCALL_NOSYS,
.sy_call = (sy_call_t *)rumpns_sys_nomodule,
}, /* 220 = __semctl */
{
- .sy_call = (sy_call_t *)rumpns_enosys,
-}, /* 221 = semget */
- {
- .sy_call = (sy_call_t *)rumpns_enosys,
-}, /* 222 = semop */
- {
- .sy_call = (sy_call_t *)rumpns_enosys,
-}, /* 223 = semconfig */
-#else
- {
- .sy_flags = SYCALL_NOSYS,
- .sy_call = (sy_call_t *)rumpns_enosys,
- }, /* 220 = filler */
- {
.sy_flags = SYCALL_NOSYS,
- .sy_call = (sy_call_t *)rumpns_enosys,
- }, /* 221 = filler */
+ .sy_call = (sy_call_t *)rumpns_sys_nomodule,
+}, /* 221 = semget */
{
.sy_flags = SYCALL_NOSYS,
- .sy_call = (sy_call_t *)rumpns_enosys,
- }, /* 222 = filler */
+ .sy_call = (sy_call_t *)rumpns_sys_nomodule,
+}, /* 222 = semop */
{
.sy_flags = SYCALL_NOSYS,
- .sy_call = (sy_call_t *)rumpns_enosys,
- }, /* 223 = filler */
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
+ .sy_call = (sy_call_t *)rumpns_sys_nomodule,
+}, /* 223 = semconfig */
{
.sy_flags = SYCALL_NOSYS,
.sy_call = (sy_call_t *)rumpns_sys_nomodule,
}, /* 224 = msgctl */
{
- .sy_call = (sy_call_t *)rumpns_enosys,
-}, /* 225 = msgget */
- {
- .sy_call = (sy_call_t *)rumpns_enosys,
-}, /* 226 = msgsnd */
- {
- .sy_call = (sy_call_t *)rumpns_enosys,
-}, /* 227 = msgrcv */
-#else
- {
.sy_flags = SYCALL_NOSYS,
- .sy_call = (sy_call_t *)rumpns_enosys,
- }, /* 224 = filler */
+ .sy_call = (sy_call_t *)rumpns_sys_nomodule,
+}, /* 225 = msgget */
{
.sy_flags = SYCALL_NOSYS,
- .sy_call = (sy_call_t *)rumpns_enosys,
- }, /* 225 = filler */
+ .sy_call = (sy_call_t *)rumpns_sys_nomodule,
+}, /* 226 = msgsnd */
{
.sy_flags = SYCALL_NOSYS,
- .sy_call = (sy_call_t *)rumpns_enosys,
- }, /* 226 = filler */
+ .sy_call = (sy_call_t *)rumpns_sys_nomodule,
+}, /* 227 = msgrcv */
{
.sy_flags = SYCALL_NOSYS,
- .sy_call = (sy_call_t *)rumpns_enosys,
- }, /* 227 = filler */
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
- {
- .sy_call = (sy_call_t *)rumpns_enosys,
+ .sy_call = (sy_call_t *)rumpns_sys_nomodule,
}, /* 228 = shmat */
{
.sy_flags = SYCALL_NOSYS,
.sy_call = (sy_call_t *)rumpns_sys_nomodule,
}, /* 229 = shmctl */
{
- .sy_call = (sy_call_t *)rumpns_enosys,
-}, /* 230 = shmdt */
- {
- .sy_call = (sy_call_t *)rumpns_enosys,
-}, /* 231 = shmget */
-#else
- {
.sy_flags = SYCALL_NOSYS,
- .sy_call = (sy_call_t *)rumpns_enosys,
- }, /* 228 = filler */
- {
- .sy_flags = SYCALL_NOSYS,
- .sy_call = (sy_call_t *)rumpns_enosys,
- }, /* 229 = filler */
- {
- .sy_flags = SYCALL_NOSYS,
- .sy_call = (sy_call_t *)rumpns_enosys,
- }, /* 230 = filler */
+ .sy_call = (sy_call_t *)rumpns_sys_nomodule,
+}, /* 230 = shmdt */
{
.sy_flags = SYCALL_NOSYS,
- .sy_call = (sy_call_t *)rumpns_enosys,
- }, /* 231 = filler */
-#endif
+ .sy_call = (sy_call_t *)rumpns_sys_nomodule,
+}, /* 231 = shmget */
{
.sy_flags = SYCALL_NOSYS,
.sy_call = (sy_call_t *)rumpns_sys_nomodule,
@@ -8202,36 +8154,18 @@ struct sysent rump_sysent[] = {
ns(struct sys___lstat50_args),
.sy_call = (sy_call_t *)rumpns_enosys,
}, /* 441 = __lstat50 */
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
{
- .sy_call = (sy_call_t *)rumpns_enosys,
+ .sy_flags = SYCALL_NOSYS,
+ .sy_call = (sy_call_t *)rumpns_sys_nomodule,
}, /* 442 = ____semctl50 */
-#else
{
.sy_flags = SYCALL_NOSYS,
- .sy_call = (sy_call_t *)rumpns_enosys,
- }, /* 442 = filler */
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
- {
- .sy_call = (sy_call_t *)rumpns_enosys,
+ .sy_call = (sy_call_t *)rumpns_sys_nomodule,
}, /* 443 = __shmctl50 */
-#else
{
.sy_flags = SYCALL_NOSYS,
- .sy_call = (sy_call_t *)rumpns_enosys,
- }, /* 443 = filler */
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
- {
- .sy_call = (sy_call_t *)rumpns_enosys,
+ .sy_call = (sy_call_t *)rumpns_sys_nomodule,
}, /* 444 = __msgctl50 */
-#else
- {
- .sy_flags = SYCALL_NOSYS,
- .sy_call = (sy_call_t *)rumpns_enosys,
- }, /* 444 = filler */
-#endif
{
.sy_call = (sy_call_t *)rumpns_enosys,
}, /* 445 = __getrusage50 */
Index: src/sys/sys/syscall.h
diff -u src/sys/sys/syscall.h:1.280 src/sys/sys/syscall.h:1.281
--- src/sys/sys/syscall.h:1.280 Sun May 10 08:13:41 2015
+++ src/sys/sys/syscall.h Wed May 13 02:13:08 2015
@@ -1,10 +1,10 @@
-/* $NetBSD: syscall.h,v 1.280 2015/05/10 08:13:41 pgoyette Exp $ */
+/* $NetBSD: syscall.h,v 1.281 2015/05/13 02:13:08 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.276 2015/05/10 07:41:15 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.277 2015/05/13 02:10:46 pgoyette Exp
*/
#ifndef _SYS_SYSCALL_H_
@@ -468,21 +468,21 @@
/* syscall: "sysarch" ret: "int" args: "int" "void *" */
#define SYS_sysarch 165
-#if (defined(SYSVSEM) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
/* syscall: "compat_10_osemsys" ret: "int" args: "int" "int" "int" "int" "int" */
#define SYS_compat_10_osemsys 169
#else
/* 169 is excluded 1.0 semsys */
#endif
-#if (defined(SYSVMSG) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
/* syscall: "compat_10_omsgsys" ret: "int" args: "int" "int" "int" "int" "int" "int" */
#define SYS_compat_10_omsgsys 170
#else
/* 170 is excluded 1.0 msgsys */
#endif
-#if (defined(SYSVSHM) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
/* syscall: "compat_10_oshmsys" ret: "int" args: "int" "int" "int" "int" */
#define SYS_compat_10_oshmsys 171
@@ -592,7 +592,6 @@
/* syscall: "afssys" ret: "int" args: "long" "long" "long" "long" "long" "long" "long" */
#define SYS_afssys 210
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* syscall: "compat_14___semctl" ret: "int" args: "int" "int" "int" "union __semun *" */
#define SYS_compat_14___semctl 220
@@ -605,13 +604,6 @@
/* syscall: "semconfig" ret: "int" args: "int" */
#define SYS_semconfig 223
-#else
- /* 220 is excluded compat_14_semctl */
- /* 221 is excluded semget */
- /* 222 is excluded semop */
- /* 223 is excluded semconfig */
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* syscall: "compat_14_msgctl" ret: "int" args: "int" "int" "struct msqid_ds14 *" */
#define SYS_compat_14_msgctl 224
@@ -624,13 +616,6 @@
/* syscall: "msgrcv" ret: "ssize_t" args: "int" "void *" "size_t" "long" "int" */
#define SYS_msgrcv 227
-#else
- /* 224 is excluded compat_14_msgctl */
- /* 225 is excluded msgget */
- /* 226 is excluded msgsnd */
- /* 227 is excluded msgrcv */
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* syscall: "shmat" ret: "void *" args: "int" "const void *" "int" */
#define SYS_shmat 228
@@ -643,12 +628,6 @@
/* syscall: "shmget" ret: "int" args: "key_t" "size_t" "int" */
#define SYS_shmget 231
-#else
- /* 228 is excluded shmat */
- /* 229 is excluded compat_14_shmctl */
- /* 230 is excluded shmdt */
- /* 231 is excluded shmget */
-#endif
/* syscall: "compat_50_clock_gettime" ret: "int" args: "clockid_t" "struct timespec50 *" */
#define SYS_compat_50_clock_gettime 232
@@ -1239,27 +1218,15 @@
/* syscall: "__lstat50" ret: "int" args: "const char *" "struct stat *" */
#define SYS___lstat50 441
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* syscall: "____semctl50" ret: "int" args: "int" "int" "int" "..." */
#define SYS_____semctl50 442
-#else
- /* 442 is excluded ____semctl50 */
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* syscall: "__shmctl50" ret: "int" args: "int" "int" "struct shmid_ds *" */
#define SYS___shmctl50 443
-#else
- /* 443 is excluded ____shmctl50 */
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* syscall: "__msgctl50" ret: "int" args: "int" "int" "struct msqid_ds *" */
#define SYS___msgctl50 444
-#else
- /* 444 is excluded ____msgctl50 */
-#endif
/* syscall: "__getrusage50" ret: "int" args: "int" "struct rusage *" */
#define SYS___getrusage50 445
Index: src/sys/sys/syscallargs.h
diff -u src/sys/sys/syscallargs.h:1.264 src/sys/sys/syscallargs.h:1.265
--- src/sys/sys/syscallargs.h:1.264 Sun May 10 08:13:41 2015
+++ src/sys/sys/syscallargs.h Wed May 13 02:13:08 2015
@@ -1,10 +1,10 @@
-/* $NetBSD: syscallargs.h,v 1.264 2015/05/10 08:13:41 pgoyette Exp $ */
+/* $NetBSD: syscallargs.h,v 1.265 2015/05/13 02:13:08 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.276 2015/05/10 07:41:15 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.277 2015/05/13 02:10:46 pgoyette Exp
*/
#ifndef _SYS_SYSCALLARGS_H_
@@ -1018,7 +1018,7 @@ struct sys_sysarch_args {
};
check_syscall_args(sys_sysarch)
#endif /* !RUMP_CLIENT */
-#if (defined(SYSVSEM) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
#ifndef RUMP_CLIENT
struct compat_10_sys_semsys_args {
@@ -1032,7 +1032,7 @@ check_syscall_args(compat_10_sys_semsys)
#endif /* !RUMP_CLIENT */
#else
#endif
-#if (defined(SYSVMSG) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
#ifndef RUMP_CLIENT
struct compat_10_sys_msgsys_args {
@@ -1047,7 +1047,7 @@ check_syscall_args(compat_10_sys_msgsys)
#endif /* !RUMP_CLIENT */
#else
#endif
-#if (defined(SYSVSHM) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
#ifndef RUMP_CLIENT
struct compat_10_sys_shmsys_args {
@@ -1314,7 +1314,6 @@ struct sys_afssys_args {
};
check_syscall_args(sys_afssys)
#endif /* !RUMP_CLIENT */
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
#ifndef RUMP_CLIENT
struct compat_14_sys___semctl_args {
@@ -1350,9 +1349,6 @@ struct sys_semconfig_args {
};
check_syscall_args(sys_semconfig)
#endif /* !RUMP_CLIENT */
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
#ifndef RUMP_CLIENT
struct compat_14_sys_msgctl_args {
@@ -1391,9 +1387,6 @@ struct sys_msgrcv_args {
};
check_syscall_args(sys_msgrcv)
#endif /* !RUMP_CLIENT */
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
#ifndef RUMP_CLIENT
struct sys_shmat_args {
@@ -1428,8 +1421,6 @@ struct sys_shmget_args {
};
check_syscall_args(sys_shmget)
#endif /* !RUMP_CLIENT */
-#else
-#endif
#ifndef RUMP_CLIENT
struct compat_50_sys_clock_gettime_args {
@@ -2843,7 +2834,6 @@ struct sys___lstat50_args {
syscallarg(struct stat *) ub;
};
check_syscall_args(sys___lstat50)
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
#ifndef RUMP_CLIENT
struct sys_____semctl50_args {
@@ -2854,9 +2844,6 @@ struct sys_____semctl50_args {
};
check_syscall_args(sys_____semctl50)
#endif /* !RUMP_CLIENT */
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
#ifndef RUMP_CLIENT
struct sys___shmctl50_args {
@@ -2866,9 +2853,6 @@ struct sys___shmctl50_args {
};
check_syscall_args(sys___shmctl50)
#endif /* !RUMP_CLIENT */
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
#ifndef RUMP_CLIENT
struct sys___msgctl50_args {
@@ -2878,8 +2862,6 @@ struct sys___msgctl50_args {
};
check_syscall_args(sys___msgctl50)
#endif /* !RUMP_CLIENT */
-#else
-#endif
#ifndef RUMP_CLIENT
struct sys___getrusage50_args {
@@ -3464,17 +3446,17 @@ int compat_09_sys_uname(struct lwp *, co
int sys_sysarch(struct lwp *, const struct sys_sysarch_args *, register_t *);
-#if (defined(SYSVSEM) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
int compat_10_sys_semsys(struct lwp *, const struct compat_10_sys_semsys_args *, register_t *);
#else
#endif
-#if (defined(SYSVMSG) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
int compat_10_sys_msgsys(struct lwp *, const struct compat_10_sys_msgsys_args *, register_t *);
#else
#endif
-#if (defined(SYSVSHM) || !defined(_KERNEL_OPT)) && !defined(_LP64)
+#if !defined(_LP64)
int compat_10_sys_shmsys(struct lwp *, const struct compat_10_sys_shmsys_args *, register_t *);
#else
@@ -3548,7 +3530,6 @@ int sys_poll(struct lwp *, const struct
int sys_afssys(struct lwp *, const struct sys_afssys_args *, register_t *);
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
int compat_14_sys___semctl(struct lwp *, const struct compat_14_sys___semctl_args *, register_t *);
int sys_semget(struct lwp *, const struct sys_semget_args *, register_t *);
@@ -3557,9 +3538,6 @@ int sys_semop(struct lwp *, const struct
int sys_semconfig(struct lwp *, const struct sys_semconfig_args *, register_t *);
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
int compat_14_sys_msgctl(struct lwp *, const struct compat_14_sys_msgctl_args *, register_t *);
int sys_msgget(struct lwp *, const struct sys_msgget_args *, register_t *);
@@ -3568,9 +3546,6 @@ int sys_msgsnd(struct lwp *, const struc
int sys_msgrcv(struct lwp *, const struct sys_msgrcv_args *, register_t *);
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
int sys_shmat(struct lwp *, const struct sys_shmat_args *, register_t *);
int compat_14_sys_shmctl(struct lwp *, const struct compat_14_sys_shmctl_args *, register_t *);
@@ -3579,8 +3554,6 @@ int sys_shmdt(struct lwp *, const struct
int sys_shmget(struct lwp *, const struct sys_shmget_args *, register_t *);
-#else
-#endif
int compat_50_sys_clock_gettime(struct lwp *, const struct compat_50_sys_clock_gettime_args *, register_t *);
int compat_50_sys_clock_settime(struct lwp *, const struct compat_50_sys_clock_settime_args *, register_t *);
@@ -3974,21 +3947,12 @@ int sys___fstat50(struct lwp *, const st
int sys___lstat50(struct lwp *, const struct sys___lstat50_args *, register_t *);
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
int sys_____semctl50(struct lwp *, const struct sys_____semctl50_args *, register_t *);
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
int sys___shmctl50(struct lwp *, const struct sys___shmctl50_args *, register_t *);
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
int sys___msgctl50(struct lwp *, const struct sys___msgctl50_args *, register_t *);
-#else
-#endif
int sys___getrusage50(struct lwp *, const struct sys___getrusage50_args *, register_t *);
int sys___timer_settime50(struct lwp *, const struct sys___timer_settime50_args *, register_t *);
