Module Name: src
Committed By: pgoyette
Date: Thu Dec 3 10:39:50 UTC 2015
Modified Files:
src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h
netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
Regen syscall definitions - the compat_netbsd32 sysv-ipc stuff is now
modular and can be autoloaded when needed
To generate a diff of this commit:
cvs rdiff -u -r1.121 -r1.122 src/sys/compat/netbsd32/netbsd32_syscall.h \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.120 -r1.121 src/sys/compat/netbsd32/netbsd32_syscalls.c \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.3 -r1.4 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.11 -r1.12 src/sys/compat/netbsd32/netbsd32_systrace_args.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.121 src/sys/compat/netbsd32/netbsd32_syscall.h:1.122
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.121 Tue Dec 1 23:57:19 2015
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Thu Dec 3 10:39:50 2015
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.121 2015/12/01 23:57:19 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.122 2015/12/03 10:39:50 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.111 2015/12/01 23:56:43 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.112 2015/12/03 10:38:21 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -468,27 +468,15 @@
/* syscall: "netbsd32_sysarch" ret: "int" args: "int" "netbsd32_voidp" */
#define NETBSD32_SYS_netbsd32_sysarch 165
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* syscall: "compat_10_osemsys" ret: "int" args: "int" "int" "int" "int" "int" */
#define NETBSD32_SYS_compat_10_osemsys 169
-#else
- /* 169 is excluded netbsd32_semsys */
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* syscall: "compat_10_omsgsys" ret: "int" args: "int" "int" "int" "int" "int" "int" */
#define NETBSD32_SYS_compat_10_omsgsys 170
-#else
- /* 170 is excluded netbsd32_msgsys */
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* syscall: "compat_10_oshmsys" ret: "int" args: "int" "int" "int" "int" */
#define NETBSD32_SYS_compat_10_oshmsys 171
-#else
- /* 171 is excluded netbsd32_shmsys */
-#endif
/* syscall: "netbsd32_pread" ret: "netbsd32_ssize_t" args: "int" "netbsd32_voidp" "netbsd32_size_t" "int" "netbsd32_off_t" */
#define NETBSD32_SYS_netbsd32_pread 173
@@ -582,7 +570,6 @@
/* syscall: "netbsd32_poll" ret: "int" args: "netbsd32_pollfdp_t" "u_int" "int" */
#define NETBSD32_SYS_netbsd32_poll 209
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* syscall: "compat_14_netbsd32___semctl" ret: "int" args: "int" "int" "int" "netbsd32_semunu_t" */
#define NETBSD32_SYS_compat_14_netbsd32___semctl 220
@@ -595,13 +582,6 @@
/* syscall: "netbsd32_semconfig" ret: "int" args: "int" */
#define NETBSD32_SYS_netbsd32_semconfig 223
-#else
- /* 220 is excluded compat_14_netbsd32_semctl */
- /* 221 is excluded netbsd32_semget */
- /* 222 is excluded netbsd32_semop */
- /* 223 is excluded netbsd32_semconfig */
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* syscall: "compat_14_netbsd32_msgctl" ret: "int" args: "int" "int" "netbsd32_msqid_ds14p_t" */
#define NETBSD32_SYS_compat_14_netbsd32_msgctl 224
@@ -614,13 +594,6 @@
/* syscall: "netbsd32_msgrcv" ret: "netbsd32_ssize_t" args: "int" "netbsd32_voidp" "netbsd32_size_t" "netbsd32_long" "int" */
#define NETBSD32_SYS_netbsd32_msgrcv 227
-#else
- /* 224 is excluded compat_14_netbsd32_msgctl */
- /* 225 is excluded netbsd32_msgget */
- /* 226 is excluded netbsd32_msgsnd */
- /* 227 is excluded netbsd32_msgrcv */
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* syscall: "netbsd32_shmat" ret: "netbsd32_voidp" args: "int" "netbsd32_voidp" "int" */
#define NETBSD32_SYS_netbsd32_shmat 228
@@ -633,12 +606,6 @@
/* syscall: "netbsd32_shmget" ret: "int" args: "netbsd32_key_t" "netbsd32_size_t" "int" */
#define NETBSD32_SYS_netbsd32_shmget 231
-#else
- /* 228 is excluded netbsd32_shmat */
- /* 229 is excluded compat_14_netbsd32_shmctl */
- /* 230 is excluded netbsd32_shmdt */
- /* 231 is excluded netbsd32_shmget */
-#endif
/* syscall: "compat_50_netbsd32_clock_gettime" ret: "int" args: "netbsd32_clockid_t" "netbsd32_timespec50p_t" */
#define NETBSD32_SYS_compat_50_netbsd32_clock_gettime 232
@@ -837,27 +804,15 @@
/* syscall: "compat_20_netbsd32_fhstatfs" ret: "int" args: "netbsd32_fhandlep_t" "netbsd32_stat50p_t" */
#define NETBSD32_SYS_compat_20_netbsd32_fhstatfs 300
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* syscall: "compat_50_netbsd32___semctl14" ret: "int" args: "int" "int" "int" "..." */
#define NETBSD32_SYS_compat_50_netbsd32___semctl14 301
-#else
- /* 301 is excluded __semctl14 */
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* syscall: "compat_50_netbsd32___msgctl13" ret: "int" args: "int" "int" "netbsd32_msqid_ds50p_t" */
#define NETBSD32_SYS_compat_50_netbsd32___msgctl13 302
-#else
- /* 302 is excluded __msgctl13 */
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* syscall: "compat_50_netbsd32___shmctl13" ret: "int" args: "int" "int" "netbsd32_shmid_ds50p_t" */
#define NETBSD32_SYS_compat_50_netbsd32___shmctl13 303
-#else
- /* 303 is excluded __shmctl13 */
-#endif
/* syscall: "netbsd32_lchflags" ret: "int" args: "netbsd32_charp" "netbsd32_u_long" */
#define NETBSD32_SYS_netbsd32_lchflags 304
@@ -1186,27 +1141,15 @@
/* syscall: "netbsd32___lstat50" ret: "int" args: "const netbsd32_charp" "netbsd32_statp_t" */
#define NETBSD32_SYS_netbsd32___lstat50 441
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* syscall: "netbsd32_____semctl50" ret: "int" args: "int" "int" "int" "..." */
#define NETBSD32_SYS_netbsd32_____semctl50 442
-#else
- /* 442 is excluded ____semctl50 */
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* syscall: "netbsd32___shmctl50" ret: "int" args: "int" "int" "netbsd32_shmid_dsp_t" */
#define NETBSD32_SYS_netbsd32___shmctl50 443
-#else
- /* 443 is excluded ____shmctl50 */
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* syscall: "netbsd32___msgctl50" ret: "int" args: "int" "int" "netbsd32_msqid_dsp_t" */
#define NETBSD32_SYS_netbsd32___msgctl50 444
-#else
- /* 444 is excluded ____msgctl50 */
-#endif
/* syscall: "netbsd32___getrusage50" ret: "int" args: "int" "netbsd32_rusagep_t" */
#define NETBSD32_SYS_netbsd32___getrusage50 445
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.121 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.122
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.121 Tue Dec 1 23:57:19 2015
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Thu Dec 3 10:39:50 2015
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.121 2015/12/01 23:57:19 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.122 2015/12/03 10:39:50 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.111 2015/12/01 23:56:43 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.112 2015/12/03 10:38:21 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -870,7 +870,6 @@ struct netbsd32_sysarch_args {
syscallarg(netbsd32_voidp) parms;
};
check_syscall_args(netbsd32_sysarch)
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
struct compat_10_netbsd32_semsys_args {
syscallarg(int) which;
@@ -880,9 +879,6 @@ struct compat_10_netbsd32_semsys_args {
syscallarg(int) a5;
};
check_syscall_args(compat_10_netbsd32_semsys)
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
struct compat_10_netbsd32_msgsys_args {
syscallarg(int) which;
@@ -893,9 +889,6 @@ struct compat_10_netbsd32_msgsys_args {
syscallarg(int) a6;
};
check_syscall_args(compat_10_netbsd32_msgsys)
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
struct compat_10_netbsd32_shmsys_args {
syscallarg(int) which;
@@ -904,8 +897,6 @@ struct compat_10_netbsd32_shmsys_args {
syscallarg(int) a4;
};
check_syscall_args(compat_10_netbsd32_shmsys)
-#else
-#endif
struct netbsd32_pread_args {
syscallarg(int) fd;
@@ -1091,7 +1082,6 @@ struct netbsd32_poll_args {
syscallarg(int) timeout;
};
check_syscall_args(netbsd32_poll)
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
struct compat_14_netbsd32___semctl_args {
syscallarg(int) semid;
@@ -1119,9 +1109,6 @@ struct netbsd32_semconfig_args {
syscallarg(int) flag;
};
check_syscall_args(netbsd32_semconfig)
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
struct compat_14_netbsd32_msgctl_args {
syscallarg(int) msqid;
@@ -1152,9 +1139,6 @@ struct netbsd32_msgrcv_args {
syscallarg(int) msgflg;
};
check_syscall_args(netbsd32_msgrcv)
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
struct netbsd32_shmat_args {
syscallarg(int) shmid;
@@ -1181,8 +1165,6 @@ struct netbsd32_shmget_args {
syscallarg(int) shmflg;
};
check_syscall_args(netbsd32_shmget)
-#else
-#endif
struct compat_50_netbsd32_clock_gettime_args {
syscallarg(netbsd32_clockid_t) clock_id;
@@ -1588,7 +1570,6 @@ struct compat_20_netbsd32_fhstatfs_args
syscallarg(netbsd32_stat50p_t) buf;
};
check_syscall_args(compat_20_netbsd32_fhstatfs)
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
struct compat_50_netbsd32___semctl14_args {
syscallarg(int) semid;
@@ -1597,9 +1578,6 @@ struct compat_50_netbsd32___semctl14_arg
syscallarg(netbsd32_semun50p_t) arg;
};
check_syscall_args(compat_50_netbsd32___semctl14)
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
struct compat_50_netbsd32___msgctl13_args {
syscallarg(int) msqid;
@@ -1607,9 +1585,6 @@ struct compat_50_netbsd32___msgctl13_arg
syscallarg(netbsd32_msqid_ds50p_t) buf;
};
check_syscall_args(compat_50_netbsd32___msgctl13)
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
struct compat_50_netbsd32___shmctl13_args {
syscallarg(int) shmid;
@@ -1617,8 +1592,6 @@ struct compat_50_netbsd32___shmctl13_arg
syscallarg(netbsd32_shmid_ds50p_t) buf;
};
check_syscall_args(compat_50_netbsd32___shmctl13)
-#else
-#endif
struct netbsd32_lchflags_args {
syscallarg(netbsd32_charp) path;
@@ -2331,7 +2304,6 @@ struct netbsd32___lstat50_args {
syscallarg(netbsd32_statp_t) ub;
};
check_syscall_args(netbsd32___lstat50)
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
struct netbsd32_____semctl50_args {
syscallarg(int) semid;
@@ -2340,9 +2312,6 @@ struct netbsd32_____semctl50_args {
syscallarg(netbsd32_semunp_t) arg;
};
check_syscall_args(netbsd32_____semctl50)
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
struct netbsd32___shmctl50_args {
syscallarg(int) shmid;
@@ -2350,9 +2319,6 @@ struct netbsd32___shmctl50_args {
syscallarg(netbsd32_shmid_dsp_t) buf;
};
check_syscall_args(netbsd32___shmctl50)
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
struct netbsd32___msgctl50_args {
syscallarg(int) msqid;
@@ -2360,8 +2326,6 @@ struct netbsd32___msgctl50_args {
syscallarg(netbsd32_msqid_dsp_t) buf;
};
check_syscall_args(netbsd32___msgctl50)
-#else
-#endif
struct netbsd32___getrusage50_args {
syscallarg(int) who;
@@ -2916,21 +2880,12 @@ int compat_09_netbsd32_uname(struct lwp
int netbsd32_sysarch(struct lwp *, const struct netbsd32_sysarch_args *, register_t *);
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
int compat_10_netbsd32_semsys(struct lwp *, const struct compat_10_netbsd32_semsys_args *, register_t *);
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
int compat_10_netbsd32_msgsys(struct lwp *, const struct compat_10_netbsd32_msgsys_args *, register_t *);
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
int compat_10_netbsd32_shmsys(struct lwp *, const struct compat_10_netbsd32_shmsys_args *, register_t *);
-#else
-#endif
int netbsd32_pread(struct lwp *, const struct netbsd32_pread_args *, register_t *);
int netbsd32_pwrite(struct lwp *, const struct netbsd32_pwrite_args *, register_t *);
@@ -2990,7 +2945,6 @@ int netbsd32_reboot(struct lwp *, const
int netbsd32_poll(struct lwp *, const struct netbsd32_poll_args *, register_t *);
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
int compat_14_netbsd32___semctl(struct lwp *, const struct compat_14_netbsd32___semctl_args *, register_t *);
int netbsd32_semget(struct lwp *, const struct netbsd32_semget_args *, register_t *);
@@ -2999,9 +2953,6 @@ int netbsd32_semop(struct lwp *, const s
int netbsd32_semconfig(struct lwp *, const struct netbsd32_semconfig_args *, register_t *);
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
int compat_14_netbsd32_msgctl(struct lwp *, const struct compat_14_netbsd32_msgctl_args *, register_t *);
int netbsd32_msgget(struct lwp *, const struct netbsd32_msgget_args *, register_t *);
@@ -3010,9 +2961,6 @@ int netbsd32_msgsnd(struct lwp *, const
int netbsd32_msgrcv(struct lwp *, const struct netbsd32_msgrcv_args *, register_t *);
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
int netbsd32_shmat(struct lwp *, const struct netbsd32_shmat_args *, register_t *);
int compat_14_netbsd32_shmctl(struct lwp *, const struct compat_14_netbsd32_shmctl_args *, register_t *);
@@ -3021,8 +2969,6 @@ int netbsd32_shmdt(struct lwp *, const s
int netbsd32_shmget(struct lwp *, const struct netbsd32_shmget_args *, register_t *);
-#else
-#endif
int compat_50_netbsd32_clock_gettime(struct lwp *, const struct compat_50_netbsd32_clock_gettime_args *, register_t *);
int compat_50_netbsd32_clock_settime(struct lwp *, const struct compat_50_netbsd32_clock_settime_args *, register_t *);
@@ -3155,21 +3101,12 @@ int compat_30_netbsd32_fhstat(struct lwp
int compat_20_netbsd32_fhstatfs(struct lwp *, const struct compat_20_netbsd32_fhstatfs_args *, register_t *);
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
int compat_50_netbsd32___semctl14(struct lwp *, const struct compat_50_netbsd32___semctl14_args *, register_t *);
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
int compat_50_netbsd32___msgctl13(struct lwp *, const struct compat_50_netbsd32___msgctl13_args *, register_t *);
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
int compat_50_netbsd32___shmctl13(struct lwp *, const struct compat_50_netbsd32___shmctl13_args *, register_t *);
-#else
-#endif
int netbsd32_lchflags(struct lwp *, const struct netbsd32_lchflags_args *, register_t *);
int sys_issetugid(struct lwp *, const void *, register_t *);
@@ -3383,21 +3320,12 @@ int netbsd32___fstat50(struct lwp *, con
int netbsd32___lstat50(struct lwp *, const struct netbsd32___lstat50_args *, register_t *);
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
int netbsd32_____semctl50(struct lwp *, const struct netbsd32_____semctl50_args *, register_t *);
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
int netbsd32___shmctl50(struct lwp *, const struct netbsd32___shmctl50_args *, register_t *);
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
int netbsd32___msgctl50(struct lwp *, const struct netbsd32___msgctl50_args *, register_t *);
-#else
-#endif
int netbsd32___getrusage50(struct lwp *, const struct netbsd32___getrusage50_args *, register_t *);
int netbsd32___timer_settime50(struct lwp *, const struct netbsd32___timer_settime50_args *, register_t *);
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.120 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.121
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.120 Tue Dec 1 23:57:19 2015
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Thu Dec 3 10:39:50 2015
@@ -1,20 +1,19 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.120 2015/12/01 23:57:19 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.121 2015/12/03 10:39:50 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.111 2015/12/01 23:56:43 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.112 2015/12/03 10:38:21 pgoyette Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.120 2015/12/01 23:57:19 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.121 2015/12/03 10:39:50 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
#include "opt_ntp.h"
-#include "opt_sysv.h"
#include "opt_compat_43.h"
#endif
#include <sys/param.h>
@@ -198,21 +197,9 @@ const char *const netbsd32_syscallnames[
/* 166 */ "#166 (unimplemented)",
/* 167 */ "#167 (unimplemented)",
/* 168 */ "#168 (unimplemented)",
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* 169 */ "compat_10_osemsys",
-#else
- /* 169 */ "#169 (excluded netbsd32_semsys)",
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* 170 */ "compat_10_omsgsys",
-#else
- /* 170 */ "#170 (excluded netbsd32_msgsys)",
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* 171 */ "compat_10_oshmsys",
-#else
- /* 171 */ "#171 (excluded netbsd32_shmsys)",
-#endif
/* 172 */ "#172 (unimplemented)",
/* 173 */ "netbsd32_pread",
/* 174 */ "netbsd32_pwrite",
@@ -266,39 +253,18 @@ const char *const netbsd32_syscallnames[
/* 217 */ "#217 (unimplemented)",
/* 218 */ "#218 (unimplemented)",
/* 219 */ "#219 (unimplemented)",
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* 220 */ "compat_14_netbsd32___semctl",
/* 221 */ "netbsd32_semget",
/* 222 */ "netbsd32_semop",
/* 223 */ "netbsd32_semconfig",
-#else
- /* 220 */ "#220 (excluded compat_14_netbsd32_semctl)",
- /* 221 */ "#221 (excluded netbsd32_semget)",
- /* 222 */ "#222 (excluded netbsd32_semop)",
- /* 223 */ "#223 (excluded netbsd32_semconfig)",
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* 224 */ "compat_14_netbsd32_msgctl",
/* 225 */ "netbsd32_msgget",
/* 226 */ "netbsd32_msgsnd",
/* 227 */ "netbsd32_msgrcv",
-#else
- /* 224 */ "#224 (excluded compat_14_netbsd32_msgctl)",
- /* 225 */ "#225 (excluded netbsd32_msgget)",
- /* 226 */ "#226 (excluded netbsd32_msgsnd)",
- /* 227 */ "#227 (excluded netbsd32_msgrcv)",
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* 228 */ "netbsd32_shmat",
/* 229 */ "compat_14_netbsd32_shmctl",
/* 230 */ "netbsd32_shmdt",
/* 231 */ "netbsd32_shmget",
-#else
- /* 228 */ "#228 (excluded netbsd32_shmat)",
- /* 229 */ "#229 (excluded compat_14_netbsd32_shmctl)",
- /* 230 */ "#230 (excluded netbsd32_shmdt)",
- /* 231 */ "#231 (excluded netbsd32_shmget)",
-#endif
/* 232 */ "compat_50_netbsd32_clock_gettime",
/* 233 */ "compat_50_netbsd32_clock_settime",
/* 234 */ "compat_50_netbsd32_clock_getres",
@@ -368,21 +334,9 @@ const char *const netbsd32_syscallnames[
/* 298 */ "compat_30_netbsd32_fhopen",
/* 299 */ "compat_30_netbsd32_fhstat",
/* 300 */ "compat_20_netbsd32_fhstatfs",
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* 301 */ "compat_50_netbsd32___semctl14",
-#else
- /* 301 */ "#301 (excluded __semctl14)",
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* 302 */ "compat_50_netbsd32___msgctl13",
-#else
- /* 302 */ "#302 (excluded __msgctl13)",
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* 303 */ "compat_50_netbsd32___shmctl13",
-#else
- /* 303 */ "#303 (excluded __shmctl13)",
-#endif
/* 304 */ "netbsd32_lchflags",
/* 305 */ "issetugid",
/* 306 */ "netbsd32_utrace",
@@ -525,21 +479,9 @@ const char *const netbsd32_syscallnames[
/* 439 */ "netbsd32___stat50",
/* 440 */ "netbsd32___fstat50",
/* 441 */ "netbsd32___lstat50",
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* 442 */ "netbsd32_____semctl50",
-#else
- /* 442 */ "#442 (excluded ____semctl50)",
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* 443 */ "netbsd32___shmctl50",
-#else
- /* 443 */ "#443 (excluded ____shmctl50)",
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* 444 */ "netbsd32___msgctl50",
-#else
- /* 444 */ "#444 (excluded ____msgctl50)",
-#endif
/* 445 */ "netbsd32___getrusage50",
/* 446 */ "netbsd32___timer_settime50",
/* 447 */ "netbsd32___timer_gettime50",
@@ -785,21 +727,9 @@ const char *const altnetbsd32_syscallnam
/* 166 */ NULL, /* unimplemented */
/* 167 */ NULL, /* unimplemented */
/* 168 */ NULL, /* unimplemented */
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* 169 */ NULL, /* compat_10_osemsys */
-#else
- /* 169 */ NULL, /* excluded netbsd32_semsys */
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* 170 */ NULL, /* compat_10_omsgsys */
-#else
- /* 170 */ NULL, /* excluded netbsd32_msgsys */
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* 171 */ NULL, /* compat_10_oshmsys */
-#else
- /* 171 */ NULL, /* excluded netbsd32_shmsys */
-#endif
/* 172 */ NULL, /* unimplemented */
/* 173 */ "pread",
/* 174 */ "pwrite",
@@ -853,39 +783,18 @@ const char *const altnetbsd32_syscallnam
/* 217 */ NULL, /* unimplemented */
/* 218 */ NULL, /* unimplemented */
/* 219 */ NULL, /* unimplemented */
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* 220 */ NULL, /* compat_14_netbsd32___semctl */
/* 221 */ "semget",
/* 222 */ "semop",
/* 223 */ "semconfig",
-#else
- /* 220 */ NULL, /* excluded compat_14_netbsd32_semctl */
- /* 221 */ NULL, /* excluded netbsd32_semget */
- /* 222 */ NULL, /* excluded netbsd32_semop */
- /* 223 */ NULL, /* excluded netbsd32_semconfig */
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* 224 */ NULL, /* compat_14_netbsd32_msgctl */
/* 225 */ "msgget",
/* 226 */ "msgsnd",
/* 227 */ "msgrcv",
-#else
- /* 224 */ NULL, /* excluded compat_14_netbsd32_msgctl */
- /* 225 */ NULL, /* excluded netbsd32_msgget */
- /* 226 */ NULL, /* excluded netbsd32_msgsnd */
- /* 227 */ NULL, /* excluded netbsd32_msgrcv */
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* 228 */ "shmat",
/* 229 */ NULL, /* compat_14_netbsd32_shmctl */
/* 230 */ "shmdt",
/* 231 */ "shmget",
-#else
- /* 228 */ NULL, /* excluded netbsd32_shmat */
- /* 229 */ NULL, /* excluded compat_14_netbsd32_shmctl */
- /* 230 */ NULL, /* excluded netbsd32_shmdt */
- /* 231 */ NULL, /* excluded netbsd32_shmget */
-#endif
/* 232 */ NULL, /* compat_50_netbsd32_clock_gettime */
/* 233 */ NULL, /* compat_50_netbsd32_clock_settime */
/* 234 */ NULL, /* compat_50_netbsd32_clock_getres */
@@ -955,21 +864,9 @@ const char *const altnetbsd32_syscallnam
/* 298 */ NULL, /* compat_30_netbsd32_fhopen */
/* 299 */ NULL, /* compat_30_netbsd32_fhstat */
/* 300 */ NULL, /* compat_20_netbsd32_fhstatfs */
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* 301 */ NULL, /* compat_50_netbsd32___semctl14 */
-#else
- /* 301 */ NULL, /* excluded __semctl14 */
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* 302 */ NULL, /* compat_50_netbsd32___msgctl13 */
-#else
- /* 302 */ NULL, /* excluded __msgctl13 */
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* 303 */ NULL, /* compat_50_netbsd32___shmctl13 */
-#else
- /* 303 */ NULL, /* excluded __shmctl13 */
-#endif
/* 304 */ "lchflags",
/* 305 */ NULL, /* issetugid */
/* 306 */ "utrace",
@@ -1112,21 +1009,9 @@ const char *const altnetbsd32_syscallnam
/* 439 */ "stat",
/* 440 */ "fstat",
/* 441 */ "lstat",
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* 442 */ "__semctl",
-#else
- /* 442 */ NULL, /* excluded ____semctl50 */
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* 443 */ "shmctl",
-#else
- /* 443 */ NULL, /* excluded ____shmctl50 */
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* 444 */ "msgctl",
-#else
- /* 444 */ NULL, /* excluded ____msgctl50 */
-#endif
/* 445 */ "getrusage",
/* 446 */ "timer_settime",
/* 447 */ "timer_gettime",
Index: src/sys/compat/netbsd32/netbsd32_sysent.c
diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.120 src/sys/compat/netbsd32/netbsd32_sysent.c:1.121
--- src/sys/compat/netbsd32/netbsd32_sysent.c:1.120 Tue Dec 1 23:57:19 2015
+++ src/sys/compat/netbsd32/netbsd32_sysent.c Thu Dec 3 10:39:50 2015
@@ -1,19 +1,18 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.120 2015/12/01 23:57:19 pgoyette Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.121 2015/12/03 10:39:50 pgoyette Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.111 2015/12/01 23:56:43 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.112 2015/12/03 10:38:21 pgoyette Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.120 2015/12/01 23:57:19 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.121 2015/12/03 10:39:50 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
#include "opt_ntp.h"
-#include "opt_sysv.h"
#include "opt_compat_43.h"
#endif
#include <sys/param.h>
@@ -758,36 +757,18 @@ struct sysent netbsd32_sysent[] = {
{
.sy_call = sys_nosys,
}, /* 168 = filler */
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
{
ns(struct compat_10_netbsd32_semsys_args),
- .sy_call = (sy_call_t *)compat_10(netbsd32_semsys)
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 169 = compat_10_osemsys */
-#else
- {
- .sy_call = sys_nosys,
- }, /* 169 = filler */
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
{
ns(struct compat_10_netbsd32_msgsys_args),
- .sy_call = (sy_call_t *)compat_10(netbsd32_msgsys)
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 170 = compat_10_omsgsys */
-#else
- {
- .sy_call = sys_nosys,
- }, /* 170 = filler */
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
{
ns(struct compat_10_netbsd32_shmsys_args),
- .sy_call = (sy_call_t *)compat_10(netbsd32_shmsys)
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 171 = compat_10_oshmsys */
-#else
- {
- .sy_call = sys_nosys,
- }, /* 171 = filler */
-#endif
{
.sy_call = sys_nosys,
}, /* 172 = filler */
@@ -970,99 +951,54 @@ struct sysent netbsd32_sysent[] = {
{
.sy_call = sys_nosys,
}, /* 219 = filler */
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
{
ns(struct compat_14_netbsd32___semctl_args),
- .sy_call = (sy_call_t *)compat_14(netbsd32___semctl)
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 220 = compat_14_netbsd32___semctl */
{
ns(struct netbsd32_semget_args),
- .sy_call = (sy_call_t *)netbsd32_semget
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 221 = netbsd32_semget */
{
ns(struct netbsd32_semop_args),
- .sy_call = (sy_call_t *)netbsd32_semop
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 222 = netbsd32_semop */
{
ns(struct netbsd32_semconfig_args),
- .sy_call = (sy_call_t *)netbsd32_semconfig
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 223 = netbsd32_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_netbsd32_msgctl_args),
- .sy_call = (sy_call_t *)compat_14(netbsd32_msgctl)
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 224 = compat_14_netbsd32_msgctl */
{
ns(struct netbsd32_msgget_args),
- .sy_call = (sy_call_t *)netbsd32_msgget
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 225 = netbsd32_msgget */
{
ns(struct netbsd32_msgsnd_args),
- .sy_call = (sy_call_t *)netbsd32_msgsnd
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 226 = netbsd32_msgsnd */
{
ns(struct netbsd32_msgrcv_args),
- .sy_call = (sy_call_t *)netbsd32_msgrcv
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 227 = netbsd32_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 netbsd32_shmat_args),
- .sy_call = (sy_call_t *)netbsd32_shmat
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 228 = netbsd32_shmat */
{
ns(struct compat_14_netbsd32_shmctl_args),
- .sy_call = (sy_call_t *)compat_14(netbsd32_shmctl)
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 229 = compat_14_netbsd32_shmctl */
{
ns(struct netbsd32_shmdt_args),
- .sy_call = (sy_call_t *)netbsd32_shmdt
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 230 = netbsd32_shmdt */
{
ns(struct netbsd32_shmget_args),
- .sy_call = (sy_call_t *)netbsd32_shmget
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 231 = netbsd32_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_netbsd32_clock_gettime_args),
.sy_call = (sy_call_t *)compat_50(netbsd32_clock_gettime)
@@ -1334,36 +1270,18 @@ struct sysent netbsd32_sysent[] = {
ns(struct compat_20_netbsd32_fhstatfs_args),
.sy_call = (sy_call_t *)compat_20(netbsd32_fhstatfs)
}, /* 300 = compat_20_netbsd32_fhstatfs */
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
{
ns(struct compat_50_netbsd32___semctl14_args),
- .sy_call = (sy_call_t *)compat_50(netbsd32___semctl14)
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 301 = compat_50_netbsd32___semctl14 */
-#else
- {
- .sy_call = sys_nosys,
- }, /* 301 = filler */
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
{
ns(struct compat_50_netbsd32___msgctl13_args),
- .sy_call = (sy_call_t *)compat_50(netbsd32___msgctl13)
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 302 = compat_50_netbsd32___msgctl13 */
-#else
- {
- .sy_call = sys_nosys,
- }, /* 302 = filler */
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
{
ns(struct compat_50_netbsd32___shmctl13_args),
- .sy_call = (sy_call_t *)compat_50(netbsd32___shmctl13)
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 303 = compat_50_netbsd32___shmctl13 */
-#else
- {
- .sy_call = sys_nosys,
- }, /* 303 = filler */
-#endif
{
ns(struct netbsd32_lchflags_args),
.sy_call = (sy_call_t *)netbsd32_lchflags
@@ -1883,36 +1801,18 @@ struct sysent netbsd32_sysent[] = {
ns(struct netbsd32___lstat50_args),
.sy_call = (sy_call_t *)netbsd32___lstat50
}, /* 441 = netbsd32___lstat50 */
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
{
ns(struct netbsd32_____semctl50_args),
- .sy_call = (sy_call_t *)netbsd32_____semctl50
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 442 = netbsd32_____semctl50 */
-#else
- {
- .sy_call = sys_nosys,
- }, /* 442 = filler */
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
{
ns(struct netbsd32___shmctl50_args),
- .sy_call = (sy_call_t *)netbsd32___shmctl50
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 443 = netbsd32___shmctl50 */
-#else
- {
- .sy_call = sys_nosys,
- }, /* 443 = filler */
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
{
ns(struct netbsd32___msgctl50_args),
- .sy_call = (sy_call_t *)netbsd32___msgctl50
+ .sy_call = (sy_call_t *)sys_nomodule
}, /* 444 = netbsd32___msgctl50 */
-#else
- {
- .sy_call = sys_nosys,
- }, /* 444 = filler */
-#endif
{
ns(struct netbsd32___getrusage50_args),
.sy_call = (sy_call_t *)netbsd32___getrusage50
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.3 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.4
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.3 Tue Dec 1 23:57:19 2015
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Thu Dec 3 10:39:50 2015
@@ -1,18 +1,33 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.3 2015/12/01 23:57:19 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.4 2015/12/03 10:39:50 pgoyette Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.111 2015/12/01 23:56:43 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.112 2015/12/03 10:38:21 pgoyette Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.3 2015/12/01 23:57:19 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.4 2015/12/03 10:39:50 pgoyette Exp $");
#include <sys/proc.h>
static struct sc_autoload netbsd32_syscalls_autoload[] = {
{ NETBSD32_SYS_netbsd32_nfssvc, "compat_netbsd32_nfssrv" },
+ { NETBSD32_SYS_compat_10_osemsys, "compat_netbsd32_sysvipc" },
+ { NETBSD32_SYS_compat_10_omsgsys, "compat_netbsd32_sysvipc" },
+ { NETBSD32_SYS_compat_10_oshmsys, "compat_netbsd32_sysvipc" },
+ { NETBSD32_SYS_compat_14_netbsd32___semctl, "compat_netbsd32_sysvipc" },
+ { NETBSD32_SYS_netbsd32_semget, "compat_netbsd32_sysvipc" },
+ { NETBSD32_SYS_netbsd32_semop, "compat_netbsd32_sysvipc" },
+ { NETBSD32_SYS_netbsd32_semconfig, "compat_netbsd32_sysvipc" },
+ { NETBSD32_SYS_compat_14_netbsd32_msgctl, "compat_netbsd32_sysvipc" },
+ { NETBSD32_SYS_netbsd32_msgget, "compat_netbsd32_sysvipc" },
+ { NETBSD32_SYS_netbsd32_msgsnd, "compat_netbsd32_sysvipc" },
+ { NETBSD32_SYS_netbsd32_msgrcv, "compat_netbsd32_sysvipc" },
+ { NETBSD32_SYS_netbsd32_shmat, "compat_netbsd32_sysvipc" },
+ { NETBSD32_SYS_compat_14_netbsd32_shmctl, "compat_netbsd32_sysvipc" },
+ { NETBSD32_SYS_netbsd32_shmdt, "compat_netbsd32_sysvipc" },
+ { NETBSD32_SYS_netbsd32_shmget, "compat_netbsd32_sysvipc" },
{ NETBSD32_SYS_netbsd32_mq_open, "compat_netbsd32_mqueue" },
{ NETBSD32_SYS_netbsd32_mq_close, "compat_netbsd32_mqueue" },
{ NETBSD32_SYS_netbsd32_mq_unlink, "compat_netbsd32_mqueue" },
@@ -23,7 +38,13 @@ static struct sc_autoload netbsd32_sysca
{ NETBSD32_SYS_netbsd32_mq_receive, "compat_netbsd32_mqueue" },
{ NETBSD32_SYS_compat_50_netbsd32_mq_timedsend, "compat_netbsd32_mqueue" },
{ NETBSD32_SYS_compat_50_netbsd32_mq_timedreceive, "compat_netbsd32_mqueue" },
+ { NETBSD32_SYS_compat_50_netbsd32___semctl14, "compat_netbsd32_sysvipc" },
+ { NETBSD32_SYS_compat_50_netbsd32___msgctl13, "compat_netbsd32_sysvipc" },
+ { NETBSD32_SYS_compat_50_netbsd32___shmctl13, "compat_netbsd32_sysvipc" },
{ NETBSD32_SYS_netbsd32___mq_timedsend50, "compat_netbsd32_mqueue" },
{ NETBSD32_SYS_netbsd32___mq_timedreceive50, "compat_netbsd32_mqueue" },
+ { NETBSD32_SYS_netbsd32_____semctl50, "compat_netbsd32_sysvipc" },
+ { NETBSD32_SYS_netbsd32___shmctl50, "compat_netbsd32_sysvipc" },
+ { NETBSD32_SYS_netbsd32___msgctl50, "compat_netbsd32_sysvipc" },
{ 0, NULL }
};
Index: src/sys/compat/netbsd32/netbsd32_systrace_args.c
diff -u src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.11 src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.12
--- src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.11 Tue Dec 1 23:57:19 2015
+++ src/sys/compat/netbsd32/netbsd32_systrace_args.c Thu Dec 3 10:39:50 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_systrace_args.c,v 1.11 2015/12/01 23:57:19 pgoyette Exp $ */
+/* $NetBSD: netbsd32_systrace_args.c,v 1.12 2015/12/03 10:39:50 pgoyette Exp $ */
/*
* System call argument to DTrace register array converstion.
@@ -1205,7 +1205,6 @@ systrace_args(register_t sysnum, const v
*n_args = 2;
break;
}
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* netbsd32_semsys */
case 169: {
struct compat_10_netbsd32_semsys_args *p = params;
@@ -1217,9 +1216,6 @@ systrace_args(register_t sysnum, const v
*n_args = 5;
break;
}
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* netbsd32_msgsys */
case 170: {
struct compat_10_netbsd32_msgsys_args *p = params;
@@ -1232,9 +1228,6 @@ systrace_args(register_t sysnum, const v
*n_args = 6;
break;
}
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* netbsd32_shmsys */
case 171: {
struct compat_10_netbsd32_shmsys_args *p = params;
@@ -1245,8 +1238,6 @@ systrace_args(register_t sysnum, const v
*n_args = 4;
break;
}
-#else
-#endif
/* netbsd32_pread */
case 173: {
struct netbsd32_pread_args *p = params;
@@ -1489,7 +1480,6 @@ systrace_args(register_t sysnum, const v
*n_args = 3;
break;
}
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* netbsd32___semctl */
case 220: {
struct compat_14_netbsd32___semctl_args *p = params;
@@ -1525,9 +1515,6 @@ systrace_args(register_t sysnum, const v
*n_args = 1;
break;
}
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* netbsd32_msgctl */
case 224: {
struct compat_14_netbsd32_msgctl_args *p = params;
@@ -1566,9 +1553,6 @@ systrace_args(register_t sysnum, const v
*n_args = 5;
break;
}
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* netbsd32_shmat */
case 228: {
struct netbsd32_shmat_args *p = params;
@@ -1603,8 +1587,6 @@ systrace_args(register_t sysnum, const v
*n_args = 3;
break;
}
-#else
-#endif
/* netbsd32_clock_gettime */
case 232: {
struct compat_50_netbsd32_clock_gettime_args *p = params;
@@ -2148,7 +2130,6 @@ systrace_args(register_t sysnum, const v
*n_args = 2;
break;
}
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* netbsd32___semctl14 */
case 301: {
struct compat_50_netbsd32___semctl14_args *p = params;
@@ -2159,9 +2140,6 @@ systrace_args(register_t sysnum, const v
*n_args = 4;
break;
}
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* netbsd32___msgctl13 */
case 302: {
struct compat_50_netbsd32___msgctl13_args *p = params;
@@ -2171,9 +2149,6 @@ systrace_args(register_t sysnum, const v
*n_args = 3;
break;
}
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* netbsd32___shmctl13 */
case 303: {
struct compat_50_netbsd32___shmctl13_args *p = params;
@@ -2183,8 +2158,6 @@ systrace_args(register_t sysnum, const v
*n_args = 3;
break;
}
-#else
-#endif
/* netbsd32_lchflags */
case 304: {
struct netbsd32_lchflags_args *p = params;
@@ -3125,7 +3098,6 @@ systrace_args(register_t sysnum, const v
*n_args = 2;
break;
}
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* netbsd32_____semctl50 */
case 442: {
struct netbsd32_____semctl50_args *p = params;
@@ -3136,9 +3108,6 @@ systrace_args(register_t sysnum, const v
*n_args = 4;
break;
}
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* netbsd32___shmctl50 */
case 443: {
struct netbsd32___shmctl50_args *p = params;
@@ -3148,9 +3117,6 @@ systrace_args(register_t sysnum, const v
*n_args = 3;
break;
}
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* netbsd32___msgctl50 */
case 444: {
struct netbsd32___msgctl50_args *p = params;
@@ -3160,8 +3126,6 @@ systrace_args(register_t sysnum, const v
*n_args = 3;
break;
}
-#else
-#endif
/* netbsd32___getrusage50 */
case 445: {
struct netbsd32___getrusage50_args *p = params;
@@ -5411,7 +5375,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* netbsd32_semsys */
case 169:
switch(ndx) {
@@ -5434,9 +5397,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* netbsd32_msgsys */
case 170:
switch(ndx) {
@@ -5462,9 +5422,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* netbsd32_shmsys */
case 171:
switch(ndx) {
@@ -5484,8 +5441,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#else
-#endif
/* netbsd32_pread */
case 173:
switch(ndx) {
@@ -5898,7 +5853,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* netbsd32___semctl */
case 220:
switch(ndx) {
@@ -5960,9 +5914,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* netbsd32_msgctl */
case 224:
switch(ndx) {
@@ -6033,9 +5984,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* netbsd32_shmat */
case 228:
switch(ndx) {
@@ -6094,8 +6042,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#else
-#endif
/* netbsd32_clock_gettime */
case 232:
switch(ndx) {
@@ -6997,7 +6943,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* netbsd32___semctl14 */
case 301:
switch(ndx) {
@@ -7017,9 +6962,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* netbsd32___msgctl13 */
case 302:
switch(ndx) {
@@ -7036,9 +6978,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* netbsd32___shmctl13 */
case 303:
switch(ndx) {
@@ -7055,8 +6994,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#else
-#endif
/* netbsd32_lchflags */
case 304:
switch(ndx) {
@@ -8710,7 +8647,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* netbsd32_____semctl50 */
case 442:
switch(ndx) {
@@ -8730,9 +8666,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* netbsd32___shmctl50 */
case 443:
switch(ndx) {
@@ -8749,9 +8682,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* netbsd32___msgctl50 */
case 444:
switch(ndx) {
@@ -8768,8 +8698,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#else
-#endif
/* netbsd32___getrusage50 */
case 445:
switch(ndx) {
@@ -10054,30 +9982,21 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* netbsd32_semsys */
case 169:
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* netbsd32_msgsys */
case 170:
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* netbsd32_shmsys */
case 171:
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#else
-#endif
/* netbsd32_pread */
case 173:
if (ndx == 0 || ndx == 1)
@@ -10221,7 +10140,6 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* netbsd32___semctl */
case 220:
if (ndx == 0 || ndx == 1)
@@ -10242,9 +10160,6 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* netbsd32_msgctl */
case 224:
if (ndx == 0 || ndx == 1)
@@ -10265,9 +10180,6 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "netbsd32_ssize_t";
break;
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* netbsd32_shmat */
case 228:
if (ndx == 0 || ndx == 1)
@@ -10288,8 +10200,6 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#else
-#endif
/* netbsd32_clock_gettime */
case 232:
if (ndx == 0 || ndx == 1)
@@ -10614,30 +10524,21 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* netbsd32___semctl14 */
case 301:
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* netbsd32___msgctl13 */
case 302:
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* netbsd32___shmctl13 */
case 303:
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#else
-#endif
/* netbsd32_lchflags */
case 304:
if (ndx == 0 || ndx == 1)
@@ -11148,30 +11049,21 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#if defined(SYSVSEM) || !defined(_KERNEL_OPT)
/* netbsd32_____semctl50 */
case 442:
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#else
-#endif
-#if defined(SYSVSHM) || !defined(_KERNEL_OPT)
/* netbsd32___shmctl50 */
case 443:
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#else
-#endif
-#if defined(SYSVMSG) || !defined(_KERNEL_OPT)
/* netbsd32___msgctl50 */
case 444:
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#else
-#endif
/* netbsd32___getrusage50 */
case 445:
if (ndx == 0 || ndx == 1)
