Module Name: src
Committed By: christos
Date: Fri Mar 29 01:14:10 UTC 2013
Modified Files:
src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h
netbsd32_syscalls.c netbsd32_sysent.c
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/sys/compat/netbsd32/netbsd32_syscall.h \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.103 -r1.104 src/sys/compat/netbsd32/netbsd32_syscalls.c \
src/sys/compat/netbsd32/netbsd32_sysent.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.104 src/sys/compat/netbsd32/netbsd32_syscall.h:1.105
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.104 Mon Oct 1 21:46:22 2012
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Thu Mar 28 21:14:09 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.104 2012/10/02 01:46:22 christos Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.105 2013/03/29 01:14:09 christos Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.96 2012/10/02 01:44:28 christos Exp
+ * created from NetBSD: syscalls.master,v 1.97 2013/03/29 01:04:30 christos Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -1108,8 +1108,8 @@
/* syscall: "netbsd32_____sigtimedwait50" ret: "int" args: "const netbsd32_sigsetp_t" "netbsd32_siginfop_t" "netbsd32_timespecp_t" */
#define NETBSD32_SYS_netbsd32_____sigtimedwait50 431
-/* syscall: "netbsd32____lwp_park50" ret: "int" args: "const netbsd32_timespecp_t" "lwpid_t" "const netbsd32_voidp" "const netbsd32_voidp" */
-#define NETBSD32_SYS_netbsd32____lwp_park50 434
+/* syscall: "compat_60_netbsd32__lwp_park" ret: "int" args: "const netbsd32_timespecp_t" "lwpid_t" "const netbsd32_voidp" "const netbsd32_voidp" */
+#define NETBSD32_SYS_compat_60_netbsd32__lwp_park 434
/* syscall: "netbsd32___kevent50" ret: "int" args: "int" "const netbsd32_keventp_t" "netbsd32_size_t" "netbsd32_keventp_t" "netbsd32_size_t" "const netbsd32_timespecp_t" */
#define NETBSD32_SYS_netbsd32___kevent50 435
@@ -1245,6 +1245,9 @@
/* syscall: "netbsd32_clock_nanosleep" ret: "int" args: "netbsd32_clockid_t" "int" "const netbsd32_timespecp_t" "netbsd32_timespecp_t" */
#define NETBSD32_SYS_netbsd32_clock_nanosleep 477
-#define NETBSD32_SYS_MAXSYSCALL 478
+/* syscall: "netbsd32____lwp_park60" ret: "int" args: "netbsd32_clockid_t" "int" "const netbsd32_timespecp_t" "lwpid_t" "netbsd32_voidp" "netbsd32_voidp" */
+#define NETBSD32_SYS_netbsd32____lwp_park60 478
+
+#define NETBSD32_SYS_MAXSYSCALL 479
#define NETBSD32_SYS_NSYSENT 512
#endif /* _NETBSD32_SYS_SYSCALL_H_ */
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.104 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.105
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.104 Mon Oct 1 21:46:22 2012
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Thu Mar 28 21:14:09 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.104 2012/10/02 01:46:22 christos Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.105 2013/03/29 01:14:09 christos Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.96 2012/10/02 01:44:28 christos Exp
+ * created from NetBSD: syscalls.master,v 1.97 2013/03/29 01:04:30 christos Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -2147,13 +2147,13 @@ struct netbsd32_____sigtimedwait50_args
};
check_syscall_args(netbsd32_____sigtimedwait50)
-struct netbsd32____lwp_park50_args {
+struct compat_60_netbsd32__lwp_park_args {
syscallarg(const netbsd32_timespecp_t) ts;
syscallarg(lwpid_t) unpark;
syscallarg(const netbsd32_voidp) hint;
syscallarg(const netbsd32_voidp) unparkhint;
};
-check_syscall_args(netbsd32____lwp_park50)
+check_syscall_args(compat_60_netbsd32__lwp_park)
struct netbsd32___kevent50_args {
syscallarg(int) fd;
@@ -2456,6 +2456,16 @@ struct netbsd32_clock_nanosleep_args {
};
check_syscall_args(netbsd32_clock_nanosleep)
+struct netbsd32____lwp_park60_args {
+ syscallarg(netbsd32_clockid_t) clock_id;
+ syscallarg(int) flags;
+ syscallarg(const netbsd32_timespecp_t) ts;
+ syscallarg(lwpid_t) unpark;
+ syscallarg(netbsd32_voidp) hint;
+ syscallarg(netbsd32_voidp) unparkhint;
+};
+check_syscall_args(netbsd32____lwp_park60)
+
/*
* System call prototypes.
*/
@@ -3173,7 +3183,7 @@ int netbsd32___nanosleep50(struct lwp *,
int netbsd32_____sigtimedwait50(struct lwp *, const struct netbsd32_____sigtimedwait50_args *, register_t *);
-int netbsd32____lwp_park50(struct lwp *, const struct netbsd32____lwp_park50_args *, register_t *);
+int compat_60_netbsd32__lwp_park(struct lwp *, const struct compat_60_netbsd32__lwp_park_args *, register_t *);
int netbsd32___kevent50(struct lwp *, const struct netbsd32___kevent50_args *, register_t *);
@@ -3265,4 +3275,6 @@ int netbsd32_posix_spawn(struct lwp *, c
int netbsd32_clock_nanosleep(struct lwp *, const struct netbsd32_clock_nanosleep_args *, register_t *);
+int netbsd32____lwp_park60(struct lwp *, const struct netbsd32____lwp_park60_args *, register_t *);
+
#endif /* _NETBSD32_SYS_SYSCALLARGS_H_ */
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.103 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.104
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.103 Mon Oct 1 21:46:22 2012
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Thu Mar 28 21:14:09 2013
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.103 2012/10/02 01:46:22 christos Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.104 2013/03/29 01:14:09 christos Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.96 2012/10/02 01:44:28 christos Exp
+ * created from NetBSD: syscalls.master,v 1.97 2013/03/29 01:04:30 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.103 2012/10/02 01:46:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.104 2013/03/29 01:14:09 christos Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -515,7 +515,7 @@ const char *const netbsd32_syscallnames[
/* 431 */ "netbsd32_____sigtimedwait50",
/* 432 */ "#432 (unimplemented netbsd32___mq_timedsend50)",
/* 433 */ "#433 (unimplemented netbsd32___mq_timedreceive50)",
- /* 434 */ "netbsd32____lwp_park50",
+ /* 434 */ "compat_60_netbsd32__lwp_park",
/* 435 */ "netbsd32___kevent50",
/* 436 */ "netbsd32___pselect50",
/* 437 */ "netbsd32___pollts50",
@@ -575,7 +575,7 @@ const char *const netbsd32_syscallnames[
/* 475 */ "#475 (unimplemented { int | netbsd32 | | recvmmsg ( int s , struct mmsghdr * mmsg , unsigned int vlen , unsigned int flags , netbsd32_timespecp_t timeout ) ; })",
/* 476 */ "#476 (unimplemented { int | netbsd32 | | sendmmsg ( int s , struct mmsghdr * mmsg , unsigned int vlen , unsigned int flags ) ; })",
/* 477 */ "netbsd32_clock_nanosleep",
- /* 478 */ "# filler",
+ /* 478 */ "netbsd32____lwp_park60",
/* 479 */ "# filler",
/* 480 */ "# filler",
/* 481 */ "# filler",
Index: src/sys/compat/netbsd32/netbsd32_sysent.c
diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.103 src/sys/compat/netbsd32/netbsd32_sysent.c:1.104
--- src/sys/compat/netbsd32/netbsd32_sysent.c:1.103 Mon Oct 1 21:46:22 2012
+++ src/sys/compat/netbsd32/netbsd32_sysent.c Thu Mar 28 21:14:10 2013
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.103 2012/10/02 01:46:22 christos Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.104 2013/03/29 01:14:10 christos Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.96 2012/10/02 01:44:28 christos Exp
+ * created from NetBSD: syscalls.master,v 1.97 2013/03/29 01:04:30 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.103 2012/10/02 01:46:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.104 2013/03/29 01:14:10 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -102,6 +102,12 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_sys
#define compat_50(func) sys_nosys
#endif
+#ifdef COMPAT_60
+#define compat_60(func) __CONCAT(compat_60_,func)
+#else
+#define compat_60(func) sys_nosys
+#endif
+
#define s(type) sizeof(type)
#define n(type) (sizeof(type)/sizeof (register32_t))
#define ns(type) n(type), s(type)
@@ -1050,8 +1056,8 @@ struct sysent netbsd32_sysent[] = {
sys_nosys }, /* 432 = unimplemented netbsd32___mq_timedsend50 */
{ 0, 0, 0,
sys_nosys }, /* 433 = unimplemented netbsd32___mq_timedreceive50 */
- { ns(struct netbsd32____lwp_park50_args), 0,
- (sy_call_t *)netbsd32____lwp_park50 },/* 434 = netbsd32____lwp_park50 */
+ { ns(struct compat_60_netbsd32__lwp_park_args), 0,
+ (sy_call_t *)compat_60(netbsd32__lwp_park) },/* 434 = compat_60_netbsd32__lwp_park */
{ ns(struct netbsd32___kevent50_args), 0,
(sy_call_t *)netbsd32___kevent50 }, /* 435 = netbsd32___kevent50 */
{ ns(struct netbsd32___pselect50_args), 0,
@@ -1158,8 +1164,8 @@ struct sysent netbsd32_sysent[] = {
sys_nosys }, /* 476 = unimplemented { int | netbsd32 | | sendmmsg ( int s , struct mmsghdr * mmsg , unsigned int vlen , unsigned int flags ) ; } */
{ ns(struct netbsd32_clock_nanosleep_args), 0,
(sy_call_t *)netbsd32_clock_nanosleep },/* 477 = netbsd32_clock_nanosleep */
- { 0, 0, 0,
- sys_nosys }, /* 478 = filler */
+ { ns(struct netbsd32____lwp_park60_args), 0,
+ (sy_call_t *)netbsd32____lwp_park60 },/* 478 = netbsd32____lwp_park60 */
{ 0, 0, 0,
sys_nosys }, /* 479 = filler */
{ 0, 0, 0,
