Module Name: src
Committed By: pgoyette
Date: Tue Sep 11 05:48:07 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_compat_80.c
netbsd32_mqueue.c netbsd32_syscall.h netbsd32_syscallargs.h
netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/compat/netbsd32/netbsd32_compat_80.c
cvs rdiff -u -r1.6 -r1.6.18.1 src/sys/compat/netbsd32/netbsd32_mqueue.c
cvs rdiff -u -r1.134.2.4 -r1.134.2.5 \
src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.134.2.3 -r1.134.2.4 \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.132.2.4 -r1.132.2.5 \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.13.2.3 -r1.13.2.4 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.132.2.3 -r1.132.2.4 \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.24.2.3 -r1.24.2.4 \
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_compat_80.c
diff -u src/sys/compat/netbsd32/netbsd32_compat_80.c:1.1.2.1 src/sys/compat/netbsd32/netbsd32_compat_80.c:1.1.2.2
--- src/sys/compat/netbsd32/netbsd32_compat_80.c:1.1.2.1 Mon Sep 10 22:50:51 2018
+++ src/sys/compat/netbsd32/netbsd32_compat_80.c Tue Sep 11 05:48:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_compat_80.c,v 1.1.2.1 2018/09/10 22:50:51 pgoyette Exp $ */
+/* $NetBSD: netbsd32_compat_80.c,v 1.1.2.2 2018/09/11 05:48:07 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_80.c,v 1.1.2.1 2018/09/10 22:50:51 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_80.c,v 1.1.2.2 2018/09/11 05:48:07 pgoyette Exp $");
#include <sys/param.h>
#include <sys/dirent.h>
@@ -37,12 +37,18 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_com
#include <sys/module.h>
#include <sys/kobj.h>
+#include <compat/sys/siginfo.h>
+
#include <compat/netbsd32/netbsd32.h>
#include <compat/netbsd32/netbsd32_syscall.h>
#include <compat/netbsd32/netbsd32_syscallargs.h>
#include <compat/netbsd32/netbsd32_conv.h>
#ifdef COMPAT_80
+
+int netbsd32_80_modctl(struct lwp *, const struct netbsd32_modctl_args *,
+ register_t *);
+
static int
modctl32_handle_ostat(int cmd, struct netbsd32_iovec *iov, void *arg)
{
@@ -147,9 +153,7 @@ netbsd32_80_modctl(struct lwp *lwp, cons
syscallarg(int) cmd;
syscallarg(netbsd32_voidp) arg;
} */
- char buf[MAXMODNAME];
struct netbsd32_iovec iov;
- struct netbsd32_modctl_load ml;
int error;
void *arg;
#ifdef MODULAR
@@ -197,5 +201,3 @@ static int (*orig_netbsd32_80_modctl)(st
}
}
#endif /* COMPAT_80 */
-
-vec_compat32_80_modctl = compat32_80_modctl_compat_stub;
Index: src/sys/compat/netbsd32/netbsd32_mqueue.c
diff -u src/sys/compat/netbsd32/netbsd32_mqueue.c:1.6 src/sys/compat/netbsd32/netbsd32_mqueue.c:1.6.18.1
--- src/sys/compat/netbsd32/netbsd32_mqueue.c:1.6 Tue Dec 1 23:56:43 2015
+++ src/sys/compat/netbsd32/netbsd32_mqueue.c Tue Sep 11 05:48:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_mqueue.c,v 1.6 2015/12/01 23:56:43 pgoyette Exp $ */
+/* $NetBSD: netbsd32_mqueue.c,v 1.6.18.1 2018/09/11 05:48:07 pgoyette Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_mqueue.c,v 1.6 2015/12/01 23:56:43 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_mqueue.c,v 1.6.18.1 2018/09/11 05:48:07 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -328,7 +328,7 @@ netbsd32___mq_timedreceive50(struct lwp
int
compat_50_netbsd32_mq_timedsend(struct lwp *l,
- const struct compat_50_netbsd32_mq_timedsend_args *uap,
+ const struct netbsd32_mq_timedsend_args *uap,
register_t *retval)
{
/* {
@@ -360,7 +360,7 @@ compat_50_netbsd32_mq_timedsend(struct l
int
compat_50_netbsd32_mq_timedreceive(struct lwp *l,
- const struct compat_50_netbsd32_mq_timedreceive_args *uap,
+ const struct netbsd32_mq_timedreceive_args *uap,
register_t *retval)
{
/* {
Index: src/sys/compat/netbsd32/netbsd32_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.4 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.5
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.4 Tue Sep 11 01:52:00 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Tue Sep 11 05:48:07 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.134.2.4 2018/09/11 01:52:00 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.134.2.5 2018/09/11 05:48:07 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.7 2018/09/11 01:45:19 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.8 2018/09/11 05:47:52 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -569,8 +569,8 @@
/* syscall: "netbsd32_poll" ret: "int" args: "netbsd32_pollfdp_t" "u_int" "int" */
#define NETBSD32_SYS_netbsd32_poll 209
-/* syscall: "netbsd32___semctl" ret: "int" args: "int" "int" "int" "netbsd32_semunu_t" */
-#define NETBSD32_SYS_netbsd32___semctl 220
+/* syscall: "compat_14_netbsd32___semctl" ret: "int" args: "int" "int" "int" "netbsd32_semunu_t" */
+#define NETBSD32_SYS_compat_14_netbsd32___semctl 220
/* syscall: "netbsd32_semget" ret: "int" args: "netbsd32_key_t" "int" "int" */
#define NETBSD32_SYS_netbsd32_semget 221
@@ -581,8 +581,8 @@
/* syscall: "netbsd32_semconfig" ret: "int" args: "int" */
#define NETBSD32_SYS_netbsd32_semconfig 223
-/* syscall: "netbsd32_msgctl" ret: "int" args: "int" "int" "netbsd32_msqid_ds14p_t" */
-#define NETBSD32_SYS_netbsd32_msgctl 224
+/* syscall: "compat_14_netbsd32_msgctl" ret: "int" args: "int" "int" "netbsd32_msqid_ds14p_t" */
+#define NETBSD32_SYS_compat_14_netbsd32_msgctl 224
/* syscall: "netbsd32_msgget" ret: "int" args: "netbsd32_key_t" "int" */
#define NETBSD32_SYS_netbsd32_msgget 225
@@ -596,8 +596,8 @@
/* syscall: "netbsd32_shmat" ret: "netbsd32_voidp" args: "int" "netbsd32_voidp" "int" */
#define NETBSD32_SYS_netbsd32_shmat 228
-/* syscall: "netbsd32_shmctl" ret: "int" args: "int" "int" "netbsd32_shmid_dsp_t" */
-#define NETBSD32_SYS_netbsd32_shmctl 229
+/* syscall: "compat_14_netbsd32_shmctl" ret: "int" args: "int" "int" "netbsd32_shmid_dsp_t" */
+#define NETBSD32_SYS_compat_14_netbsd32_shmctl 229
/* syscall: "netbsd32_shmdt" ret: "int" args: "netbsd32_voidp" */
#define NETBSD32_SYS_netbsd32_shmdt 230
@@ -704,11 +704,11 @@
/* syscall: "netbsd32_mq_receive" ret: "netbsd32_ssize_t" args: "mqd_t" "netbsd32_charp" "netbsd32_size_t" "netbsd32_uintp" */
#define NETBSD32_SYS_netbsd32_mq_receive 264
-/* syscall: "netbsd32_mq_timedsend" ret: "int" args: "mqd_t" "const netbsd32_charp" "netbsd32_size_t" "unsigned" "const netbsd32_timespec50p_t" */
-#define NETBSD32_SYS_netbsd32_mq_timedsend 265
+/* syscall: "compat_50_netbsd32_mq_timedsend" ret: "int" args: "mqd_t" "const netbsd32_charp" "netbsd32_size_t" "unsigned" "const netbsd32_timespec50p_t" */
+#define NETBSD32_SYS_compat_50_netbsd32_mq_timedsend 265
-/* syscall: "netbsd32_mq_timedreceive" ret: "netbsd32_ssize_t" args: "mqd_t" "netbsd32_charp" "netbsd32_size_t" "netbsd32_uintp" "const netbsd32_timespec50p_t" */
-#define NETBSD32_SYS_netbsd32_mq_timedreceive 266
+/* syscall: "compat_50_netbsd32_mq_timedreceive" ret: "netbsd32_ssize_t" args: "mqd_t" "netbsd32_charp" "netbsd32_size_t" "netbsd32_uintp" "const netbsd32_timespec50p_t" */
+#define NETBSD32_SYS_compat_50_netbsd32_mq_timedreceive 266
/* syscall: "netbsd32___posix_rename" ret: "int" args: "netbsd32_charp" "netbsd32_charp" */
#define NETBSD32_SYS_netbsd32___posix_rename 270
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.3 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.4
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.3 Tue Sep 11 01:52:00 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Tue Sep 11 05:48:07 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.3 2018/09/11 01:52:00 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.4 2018/09/11 05:48:07 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.7 2018/09/11 01:45:19 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.8 2018/09/11 05:47:52 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -1085,13 +1085,13 @@ struct netbsd32_poll_args {
};
check_syscall_args(netbsd32_poll)
-struct netbsd32___semctl_args {
+struct compat_14_netbsd32___semctl_args {
syscallarg(int) semid;
syscallarg(int) semnum;
syscallarg(int) cmd;
syscallarg(netbsd32_semunu_t) arg;
};
-check_syscall_args(netbsd32___semctl)
+check_syscall_args(compat_14_netbsd32___semctl)
struct netbsd32_semget_args {
syscallarg(netbsd32_key_t) key;
@@ -1112,12 +1112,12 @@ struct netbsd32_semconfig_args {
};
check_syscall_args(netbsd32_semconfig)
-struct netbsd32_msgctl_args {
+struct compat_14_netbsd32_msgctl_args {
syscallarg(int) msqid;
syscallarg(int) cmd;
syscallarg(netbsd32_msqid_ds14p_t) buf;
};
-check_syscall_args(netbsd32_msgctl)
+check_syscall_args(compat_14_netbsd32_msgctl)
struct netbsd32_msgget_args {
syscallarg(netbsd32_key_t) key;
@@ -1149,12 +1149,12 @@ struct netbsd32_shmat_args {
};
check_syscall_args(netbsd32_shmat)
-struct netbsd32_shmctl_args {
+struct compat_14_netbsd32_shmctl_args {
syscallarg(int) shmid;
syscallarg(int) cmd;
syscallarg(netbsd32_shmid_dsp_t) buf;
};
-check_syscall_args(netbsd32_shmctl)
+check_syscall_args(compat_14_netbsd32_shmctl)
struct netbsd32_shmdt_args {
syscallarg(netbsd32_voidp) shmaddr;
@@ -1362,23 +1362,23 @@ struct netbsd32_mq_receive_args {
};
check_syscall_args(netbsd32_mq_receive)
-struct netbsd32_mq_timedsend_args {
+struct compat_50_netbsd32_mq_timedsend_args {
syscallarg(mqd_t) mqdes;
syscallarg(const netbsd32_charp) msg_ptr;
syscallarg(netbsd32_size_t) msg_len;
syscallarg(unsigned) msg_prio;
syscallarg(const netbsd32_timespec50p_t) abs_timeout;
};
-check_syscall_args(netbsd32_mq_timedsend)
+check_syscall_args(compat_50_netbsd32_mq_timedsend)
-struct netbsd32_mq_timedreceive_args {
+struct compat_50_netbsd32_mq_timedreceive_args {
syscallarg(mqd_t) mqdes;
syscallarg(netbsd32_charp) msg_ptr;
syscallarg(netbsd32_size_t) msg_len;
syscallarg(netbsd32_uintp) msg_prio;
syscallarg(const netbsd32_timespec50p_t) abs_timeout;
};
-check_syscall_args(netbsd32_mq_timedreceive)
+check_syscall_args(compat_50_netbsd32_mq_timedreceive)
struct netbsd32___posix_rename_args {
syscallarg(netbsd32_charp) from;
@@ -2984,7 +2984,7 @@ int netbsd32_reboot(struct lwp *, const
int netbsd32_poll(struct lwp *, const struct netbsd32_poll_args *, register_t *);
-int netbsd32___semctl(struct lwp *, const struct netbsd32___semctl_args *, register_t *);
+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 *);
@@ -2992,7 +2992,7 @@ int netbsd32_semop(struct lwp *, const s
int netbsd32_semconfig(struct lwp *, const struct netbsd32_semconfig_args *, register_t *);
-int netbsd32_msgctl(struct lwp *, const struct netbsd32_msgctl_args *, register_t *);
+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 *);
@@ -3002,7 +3002,7 @@ int netbsd32_msgrcv(struct lwp *, const
int netbsd32_shmat(struct lwp *, const struct netbsd32_shmat_args *, register_t *);
-int netbsd32_shmctl(struct lwp *, const struct netbsd32_shmctl_args *, register_t *);
+int compat_14_netbsd32_shmctl(struct lwp *, const struct compat_14_netbsd32_shmctl_args *, register_t *);
int netbsd32_shmdt(struct lwp *, const struct netbsd32_shmdt_args *, register_t *);
@@ -3074,9 +3074,9 @@ int netbsd32_mq_send(struct lwp *, const
int netbsd32_mq_receive(struct lwp *, const struct netbsd32_mq_receive_args *, register_t *);
-int netbsd32_mq_timedsend(struct lwp *, const struct netbsd32_mq_timedsend_args *, register_t *);
+int compat_50_netbsd32_mq_timedsend(struct lwp *, const struct compat_50_netbsd32_mq_timedsend_args *, register_t *);
-int netbsd32_mq_timedreceive(struct lwp *, const struct netbsd32_mq_timedreceive_args *, register_t *);
+int compat_50_netbsd32_mq_timedreceive(struct lwp *, const struct compat_50_netbsd32_mq_timedreceive_args *, register_t *);
int netbsd32___posix_rename(struct lwp *, const struct netbsd32___posix_rename_args *, register_t *);
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.4 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.5
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.4 Tue Sep 11 01:52:00 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Tue Sep 11 05:48:07 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.4 2018/09/11 01:52:00 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.5 2018/09/11 05:48:07 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.7 2018/09/11 01:45:19 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.8 2018/09/11 05:47:52 pgoyette Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.4 2018/09/11 01:52:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.5 2018/09/11 05:48:07 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -253,16 +253,16 @@ const char *const netbsd32_syscallnames[
/* 217 */ "#217 (unimplemented)",
/* 218 */ "#218 (unimplemented)",
/* 219 */ "#219 (unimplemented)",
- /* 220 */ "netbsd32___semctl",
+ /* 220 */ "compat_14_netbsd32___semctl",
/* 221 */ "netbsd32_semget",
/* 222 */ "netbsd32_semop",
/* 223 */ "netbsd32_semconfig",
- /* 224 */ "netbsd32_msgctl",
+ /* 224 */ "compat_14_netbsd32_msgctl",
/* 225 */ "netbsd32_msgget",
/* 226 */ "netbsd32_msgsnd",
/* 227 */ "netbsd32_msgrcv",
/* 228 */ "netbsd32_shmat",
- /* 229 */ "netbsd32_shmctl",
+ /* 229 */ "compat_14_netbsd32_shmctl",
/* 230 */ "netbsd32_shmdt",
/* 231 */ "netbsd32_shmget",
/* 232 */ "compat_50_netbsd32_clock_gettime",
@@ -298,8 +298,8 @@ const char *const netbsd32_syscallnames[
/* 262 */ "netbsd32_mq_notify",
/* 263 */ "netbsd32_mq_send",
/* 264 */ "netbsd32_mq_receive",
- /* 265 */ "netbsd32_mq_timedsend",
- /* 266 */ "netbsd32_mq_timedreceive",
+ /* 265 */ "compat_50_netbsd32_mq_timedsend",
+ /* 266 */ "compat_50_netbsd32_mq_timedreceive",
/* 267 */ "#267 (unimplemented)",
/* 268 */ "#268 (unimplemented)",
/* 269 */ "#269 (unimplemented)",
@@ -783,16 +783,16 @@ const char *const altnetbsd32_syscallnam
/* 217 */ NULL, /* unimplemented */
/* 218 */ NULL, /* unimplemented */
/* 219 */ NULL, /* unimplemented */
- /* 220 */ "__semctl",
+ /* 220 */ NULL, /* compat_14_netbsd32___semctl */
/* 221 */ "semget",
/* 222 */ "semop",
/* 223 */ "semconfig",
- /* 224 */ "msgctl",
+ /* 224 */ NULL, /* compat_14_netbsd32_msgctl */
/* 225 */ "msgget",
/* 226 */ "msgsnd",
/* 227 */ "msgrcv",
/* 228 */ "shmat",
- /* 229 */ "shmctl",
+ /* 229 */ NULL, /* compat_14_netbsd32_shmctl */
/* 230 */ "shmdt",
/* 231 */ "shmget",
/* 232 */ NULL, /* compat_50_netbsd32_clock_gettime */
@@ -828,8 +828,8 @@ const char *const altnetbsd32_syscallnam
/* 262 */ "mq_notify",
/* 263 */ "mq_send",
/* 264 */ "mq_receive",
- /* 265 */ "mq_timedsend",
- /* 266 */ "mq_timedreceive",
+ /* 265 */ NULL, /* compat_50_netbsd32_mq_timedsend */
+ /* 266 */ NULL, /* compat_50_netbsd32_mq_timedreceive */
/* 267 */ NULL, /* unimplemented */
/* 268 */ NULL, /* unimplemented */
/* 269 */ NULL, /* unimplemented */
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.3 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.4
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.3 Tue Sep 11 01:52:00 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Tue Sep 11 05:48:07 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.3 2018/09/11 01:52:00 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.4 2018/09/11 05:48:07 pgoyette Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.7 2018/09/11 01:45:19 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.8 2018/09/11 05:47:52 pgoyette Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.3 2018/09/11 01:52:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.4 2018/09/11 05:48:07 pgoyette Exp $");
#include <sys/proc.h>
static struct sc_autoload netbsd32_syscalls_autoload[] = {
@@ -46,16 +46,16 @@ static struct sc_autoload netbsd32_sysca
{ NETBSD32_SYS_compat_12_netbsd32_fstat12, "compat_netbsd32_12" },
{ NETBSD32_SYS_compat_12_netbsd32_lstat12, "compat_netbsd32_12" },
{ NETBSD32_SYS_compat_50_netbsd32_futimes, "compat_netbsd32_50" },
- { NETBSD32_SYS_netbsd32___semctl, "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_netbsd32_msgctl, "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_netbsd32_shmctl, "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_compat_50_netbsd32_clock_gettime, "compat_netbsd32_50" },
@@ -73,8 +73,8 @@ static struct sc_autoload netbsd32_sysca
{ NETBSD32_SYS_netbsd32_mq_notify, "compat_netbsd32_mqueue" },
{ NETBSD32_SYS_netbsd32_mq_send, "compat_netbsd32_mqueue" },
{ NETBSD32_SYS_netbsd32_mq_receive, "compat_netbsd32_mqueue" },
- { NETBSD32_SYS_netbsd32_mq_timedsend, "compat_netbsd32_mqueue" },
- { NETBSD32_SYS_netbsd32_mq_timedreceive, "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_30_netbsd32_getdents, "compat_netbsd32_30" },
{ NETBSD32_SYS_compat_50_netbsd32_lutimes, "compat_netbsd32_50" },
{ NETBSD32_SYS_compat_30_netbsd32___stat13, "compat_netbsd32_30" },
Index: src/sys/compat/netbsd32/netbsd32_sysent.c
diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.132.2.3 src/sys/compat/netbsd32/netbsd32_sysent.c:1.132.2.4
--- src/sys/compat/netbsd32/netbsd32_sysent.c:1.132.2.3 Tue Sep 11 01:52:00 2018
+++ src/sys/compat/netbsd32/netbsd32_sysent.c Tue Sep 11 05:48:07 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.132.2.3 2018/09/11 01:52:00 pgoyette Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.132.2.4 2018/09/11 05:48:07 pgoyette Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.7 2018/09/11 01:45:19 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.8 2018/09/11 05:47:52 pgoyette Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.132.2.3 2018/09/11 01:52:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.132.2.4 2018/09/11 05:48:07 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -963,9 +963,9 @@ struct sysent netbsd32_sysent[] = {
.sy_call = sys_nosys,
}, /* 219 = filler */
{
- ns(struct netbsd32___semctl_args),
+ ns(struct compat_14_netbsd32___semctl_args),
.sy_call = (sy_call_t *)sys_nomodule
- }, /* 220 = netbsd32___semctl */
+ }, /* 220 = compat_14_netbsd32___semctl */
{
ns(struct netbsd32_semget_args),
.sy_call = (sy_call_t *)sys_nomodule
@@ -979,9 +979,9 @@ struct sysent netbsd32_sysent[] = {
.sy_call = (sy_call_t *)sys_nomodule
}, /* 223 = netbsd32_semconfig */
{
- ns(struct netbsd32_msgctl_args),
+ ns(struct compat_14_netbsd32_msgctl_args),
.sy_call = (sy_call_t *)sys_nomodule
- }, /* 224 = netbsd32_msgctl */
+ }, /* 224 = compat_14_netbsd32_msgctl */
{
ns(struct netbsd32_msgget_args),
.sy_call = (sy_call_t *)sys_nomodule
@@ -999,9 +999,9 @@ struct sysent netbsd32_sysent[] = {
.sy_call = (sy_call_t *)sys_nomodule
}, /* 228 = netbsd32_shmat */
{
- ns(struct netbsd32_shmctl_args),
+ ns(struct compat_14_netbsd32_shmctl_args),
.sy_call = (sy_call_t *)sys_nomodule
- }, /* 229 = netbsd32_shmctl */
+ }, /* 229 = compat_14_netbsd32_shmctl */
{
ns(struct netbsd32_shmdt_args),
.sy_call = (sy_call_t *)sys_nomodule
@@ -1142,13 +1142,13 @@ struct sysent netbsd32_sysent[] = {
.sy_call = (sy_call_t *)sys_nomodule
}, /* 264 = netbsd32_mq_receive */
{
- ns(struct netbsd32_mq_timedsend_args),
+ ns(struct compat_50_netbsd32_mq_timedsend_args),
.sy_call = (sy_call_t *)sys_nomodule
- }, /* 265 = netbsd32_mq_timedsend */
+ }, /* 265 = compat_50_netbsd32_mq_timedsend */
{
- ns(struct netbsd32_mq_timedreceive_args),
+ ns(struct compat_50_netbsd32_mq_timedreceive_args),
.sy_call = (sy_call_t *)sys_nomodule
- }, /* 266 = netbsd32_mq_timedreceive */
+ }, /* 266 = compat_50_netbsd32_mq_timedreceive */
{
.sy_call = sys_nosys,
}, /* 267 = filler */
Index: src/sys/compat/netbsd32/netbsd32_systrace_args.c
diff -u src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.24.2.3 src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.24.2.4
--- src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.24.2.3 Tue Sep 11 01:52:00 2018
+++ src/sys/compat/netbsd32/netbsd32_systrace_args.c Tue Sep 11 05:48:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_systrace_args.c,v 1.24.2.3 2018/09/11 01:52:00 pgoyette Exp $ */
+/* $NetBSD: netbsd32_systrace_args.c,v 1.24.2.4 2018/09/11 05:48:07 pgoyette Exp $ */
/*
* System call argument to DTrace register array converstion.
@@ -1479,7 +1479,7 @@ systrace_args(register_t sysnum, const v
}
/* netbsd32___semctl */
case 220: {
- const struct netbsd32___semctl_args *p = params;
+ const struct compat_14_netbsd32___semctl_args *p = params;
iarg[0] = SCARG(p, semid); /* int */
iarg[1] = SCARG(p, semnum); /* int */
iarg[2] = SCARG(p, cmd); /* int */
@@ -1514,7 +1514,7 @@ systrace_args(register_t sysnum, const v
}
/* netbsd32_msgctl */
case 224: {
- const struct netbsd32_msgctl_args *p = params;
+ const struct compat_14_netbsd32_msgctl_args *p = params;
iarg[0] = SCARG(p, msqid); /* int */
iarg[1] = SCARG(p, cmd); /* int */
uarg[2] = (intptr_t) SCARG(p, buf).i32; /* netbsd32_msqid_ds14p_t */
@@ -1561,7 +1561,7 @@ systrace_args(register_t sysnum, const v
}
/* netbsd32_shmctl */
case 229: {
- const struct netbsd32_shmctl_args *p = params;
+ const struct compat_14_netbsd32_shmctl_args *p = params;
iarg[0] = SCARG(p, shmid); /* int */
iarg[1] = SCARG(p, cmd); /* int */
uarg[2] = (intptr_t) SCARG(p, buf).i32; /* netbsd32_shmid_dsp_t */
@@ -1849,7 +1849,7 @@ systrace_args(register_t sysnum, const v
}
/* netbsd32_mq_timedsend */
case 265: {
- const struct netbsd32_mq_timedsend_args *p = params;
+ const struct compat_50_netbsd32_mq_timedsend_args *p = params;
iarg[0] = SCARG(p, mqdes); /* mqd_t */
uarg[1] = (intptr_t) SCARG(p, msg_ptr).i32; /* const netbsd32_charp */
iarg[2] = SCARG(p, msg_len); /* netbsd32_size_t */
@@ -1860,7 +1860,7 @@ systrace_args(register_t sysnum, const v
}
/* netbsd32_mq_timedreceive */
case 266: {
- const struct netbsd32_mq_timedreceive_args *p = params;
+ const struct compat_50_netbsd32_mq_timedreceive_args *p = params;
iarg[0] = SCARG(p, mqdes); /* mqd_t */
uarg[1] = (intptr_t) SCARG(p, msg_ptr).i32; /* netbsd32_charp */
iarg[2] = SCARG(p, msg_len); /* netbsd32_size_t */
