Module Name: src
Committed By: christos
Date: Mon Nov 2 18:56:16 UTC 2020
Modified Files:
src/sys/kern: init_sysent.c syscalls.c syscalls_autoload.c
systrace_args.c
src/sys/rump: rump.sysmap
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:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.336 -r1.337 src/sys/kern/init_sysent.c
cvs rdiff -u -r1.324 -r1.325 src/sys/kern/syscalls.c
cvs rdiff -u -r1.40 -r1.41 src/sys/kern/syscalls_autoload.c
cvs rdiff -u -r1.43 -r1.44 src/sys/kern/systrace_args.c
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/rump.sysmap
cvs rdiff -u -r1.123 -r1.124 src/sys/rump/include/rump/rump_syscalls.h
cvs rdiff -u -r1.154 -r1.155 src/sys/rump/librump/rumpkern/rump_syscalls.c
cvs rdiff -u -r1.318 -r1.319 src/sys/sys/syscall.h
cvs rdiff -u -r1.302 -r1.303 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.336 src/sys/kern/init_sysent.c:1.337
--- src/sys/kern/init_sysent.c:1.336 Thu Aug 13 20:55:02 2020
+++ src/sys/kern/init_sysent.c Mon Nov 2 13:56:16 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: init_sysent.c,v 1.336 2020/08/14 00:55:02 riastradh Exp $ */
+/* $NetBSD: init_sysent.c,v 1.337 2020/11/02 18:56:16 christos Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.306 2020/08/14 00:53:16 riastradh Exp
+ * created from NetBSD: syscalls.master,v 1.307 2020/11/02 18:55:12 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.336 2020/08/14 00:55:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.337 2020/11/02 18:56:16 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_modular.h"
Index: src/sys/kern/syscalls.c
diff -u src/sys/kern/syscalls.c:1.324 src/sys/kern/syscalls.c:1.325
--- src/sys/kern/syscalls.c:1.324 Thu Aug 13 20:55:02 2020
+++ src/sys/kern/syscalls.c Mon Nov 2 13:56:16 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls.c,v 1.324 2020/08/14 00:55:02 riastradh Exp $ */
+/* $NetBSD: syscalls.c,v 1.325 2020/11/02 18:56:16 christos Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.306 2020/08/14 00:53:16 riastradh Exp
+ * created from NetBSD: syscalls.master,v 1.307 2020/11/02 18:55:12 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.324 2020/08/14 00:55:02 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.325 2020/11/02 18:56:16 christos Exp $");
#if defined(_KERNEL_OPT)
#ifdef _KERNEL_OPT
Index: src/sys/kern/syscalls_autoload.c
diff -u src/sys/kern/syscalls_autoload.c:1.40 src/sys/kern/syscalls_autoload.c:1.41
--- src/sys/kern/syscalls_autoload.c:1.40 Wed Jun 10 23:45:30 2020
+++ src/sys/kern/syscalls_autoload.c Mon Nov 2 13:56:16 2020
@@ -1,14 +1,14 @@
-/* $NetBSD: syscalls_autoload.c,v 1.40 2020/06/11 03:45:30 dholland Exp $ */
+/* $NetBSD: syscalls_autoload.c,v 1.41 2020/11/02 18:56:16 christos Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.305 2020/05/16 18:31:50 christos Exp
+ * created from NetBSD: syscalls.master,v 1.307 2020/11/02 18:55:12 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.40 2020/06/11 03:45:30 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.41 2020/11/02 18:56:16 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_modular.h"
Index: src/sys/kern/systrace_args.c
diff -u src/sys/kern/systrace_args.c:1.43 src/sys/kern/systrace_args.c:1.44
--- src/sys/kern/systrace_args.c:1.43 Thu Aug 13 20:55:02 2020
+++ src/sys/kern/systrace_args.c Mon Nov 2 13:56:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: systrace_args.c,v 1.43 2020/08/14 00:55:02 riastradh Exp $ */
+/* $NetBSD: systrace_args.c,v 1.44 2020/11/02 18:56:16 christos Exp $ */
/*
* System call argument to DTrace register array converstion.
Index: src/sys/rump/rump.sysmap
diff -u src/sys/rump/rump.sysmap:1.8 src/sys/rump/rump.sysmap:1.9
--- src/sys/rump/rump.sysmap:1.8 Thu Aug 13 20:55:03 2020
+++ src/sys/rump/rump.sysmap Mon Nov 2 13:56:16 2020
@@ -214,6 +214,7 @@
477 sys_clock_nanosleep clock_nanosleep rump___sysimpl_clock_nanosleep
479 sys_posix_fallocate posix_fallocate rump___sysimpl_posix_fallocate
480 sys_fdiscard fdiscard rump___sysimpl_fdiscard
+482 sys_clock_getcpuclockid2 clock_getcpuclockid2 rump___sysimpl_clock_getcpuclockid2
483 sys___getvfsstat90 __getvfsstat90 rump___sysimpl_getvfsstat90
484 sys___statvfs190 __statvfs190 rump___sysimpl_statvfs190
485 sys___fstatvfs190 __fstatvfs190 rump___sysimpl_fstatvfs190
Index: src/sys/rump/include/rump/rump_syscalls.h
diff -u src/sys/rump/include/rump/rump_syscalls.h:1.123 src/sys/rump/include/rump/rump_syscalls.h:1.124
--- src/sys/rump/include/rump/rump_syscalls.h:1.123 Thu Aug 13 20:55:03 2020
+++ src/sys/rump/include/rump/rump_syscalls.h Mon Nov 2 13:56:16 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.h,v 1.123 2020/08/14 00:55:03 riastradh Exp $ */
+/* $NetBSD: rump_syscalls.h,v 1.124 2020/11/02 18:56:16 christos Exp $ */
/*
* System call protos in rump namespace.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.306 2020/08/14 00:53:16 riastradh Exp
+ * created from NetBSD: syscalls.master,v 1.307 2020/11/02 18:55:12 christos Exp
*/
#ifndef _RUMP_RUMP_SYSCALLS_H_
@@ -156,6 +156,10 @@
#define RUMP_SYS_RENAME_CHROOT rump___sysimpl_chroot
#endif
+#ifndef RUMP_SYS_RENAME_CLOCK_GETCPUCLOCKID2
+#define RUMP_SYS_RENAME_CLOCK_GETCPUCLOCKID2 rump___sysimpl_clock_getcpuclockid2
+#endif
+
#ifndef RUMP_SYS_RENAME_CLOCK_GETRES
#define RUMP_SYS_RENAME_CLOCK_GETRES rump___sysimpl_clock_getres50
#endif
@@ -1068,6 +1072,7 @@ int rump_sys_sendmmsg(int, struct mmsghd
int rump_sys_clock_nanosleep(clockid_t, int, const struct timespec *, struct timespec *) __RENAME(RUMP_SYS_RENAME_CLOCK_NANOSLEEP);
int rump_sys_posix_fallocate(int, off_t, off_t) __RENAME(RUMP_SYS_RENAME_POSIX_FALLOCATE);
int rump_sys_fdiscard(int, off_t, off_t) __RENAME(RUMP_SYS_RENAME_FDISCARD);
+int rump_sys_clock_getcpuclockid2(idtype_t, id_t, clockid_t *) __RENAME(RUMP_SYS_RENAME_CLOCK_GETCPUCLOCKID2);
int rump_sys_getvfsstat(struct statvfs *, size_t, int) __RENAME(RUMP_SYS_RENAME_GETVFSSTAT);
int rump_sys_statvfs1(const char *, struct statvfs *, int) __RENAME(RUMP_SYS_RENAME_STATVFS1);
int rump_sys_fstatvfs1(int, struct statvfs *, int) __RENAME(RUMP_SYS_RENAME_FSTATVFS1);
Index: src/sys/rump/librump/rumpkern/rump_syscalls.c
diff -u src/sys/rump/librump/rumpkern/rump_syscalls.c:1.154 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.155
--- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.154 Thu Aug 13 20:55:03 2020
+++ src/sys/rump/librump/rumpkern/rump_syscalls.c Mon Nov 2 13:56:16 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: rump_syscalls.c,v 1.154 2020/08/14 00:55:03 riastradh Exp $ */
+/* $NetBSD: rump_syscalls.c,v 1.155 2020/11/02 18:56:16 christos Exp $ */
/*
* System call vector and marshalling for rump.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.306 2020/08/14 00:53:16 riastradh Exp
+ * created from NetBSD: syscalls.master,v 1.307 2020/11/02 18:55:12 christos Exp
*/
#ifdef RUMP_CLIENT
@@ -15,7 +15,7 @@
#ifdef __NetBSD__
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.154 2020/08/14 00:55:03 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.155 2020/11/02 18:56:16 christos Exp $");
#include <sys/fstypes.h>
#include <sys/proc.h>
@@ -6428,6 +6428,36 @@ __weak_alias(_fdiscard,rump___sysimpl_fd
__strong_alias(_sys_fdiscard,rump___sysimpl_fdiscard);
#endif /* RUMP_KERNEL_IS_LIBC */
+int rump___sysimpl_clock_getcpuclockid2(idtype_t, id_t, clockid_t *);
+int
+rump___sysimpl_clock_getcpuclockid2(idtype_t idtype, id_t id, clockid_t * clock_id)
+{
+ register_t retval[2];
+ int error = 0;
+ int rv = -1;
+ struct sys_clock_getcpuclockid2_args callarg;
+
+ memset(&callarg, 0, sizeof(callarg));
+ SPARG(&callarg, idtype) = idtype;
+ SPARG(&callarg, id) = id;
+ SPARG(&callarg, clock_id) = clock_id;
+
+ error = rsys_syscall(SYS_clock_getcpuclockid2, &callarg, sizeof(callarg), retval);
+ rsys_seterrno(error);
+ if (error == 0) {
+ if (sizeof(int) > sizeof(register_t))
+ rv = *(int *)retval;
+ else
+ rv = *retval;
+ }
+ return rv;
+}
+#ifdef RUMP_KERNEL_IS_LIBC
+__weak_alias(clock_getcpuclockid2,rump___sysimpl_clock_getcpuclockid2);
+__weak_alias(_clock_getcpuclockid2,rump___sysimpl_clock_getcpuclockid2);
+__strong_alias(_sys_clock_getcpuclockid2,rump___sysimpl_clock_getcpuclockid2);
+#endif /* RUMP_KERNEL_IS_LIBC */
+
int rump___sysimpl_getvfsstat90(struct statvfs *, size_t, int);
int
rump___sysimpl_getvfsstat90(struct statvfs * buf, size_t bufsize, int flags)
@@ -8485,8 +8515,9 @@ struct sysent rump_sysent[] = {
.sy_call = (sy_call_t *)(void *)rumpns_enosys,
}, /* 481 = wait6 */
{
+ ns(struct sys_clock_getcpuclockid2_args),
.sy_call = (sy_call_t *)(void *)rumpns_enosys,
-}, /* 482 = clock_getcpuclockid2 */
+ }, /* 482 = clock_getcpuclockid2 */
{
ns(struct sys___getvfsstat90_args),
.sy_call = (sy_call_t *)(void *)rumpns_enosys,
Index: src/sys/sys/syscall.h
diff -u src/sys/sys/syscall.h:1.318 src/sys/sys/syscall.h:1.319
--- src/sys/sys/syscall.h:1.318 Thu Aug 13 20:55:03 2020
+++ src/sys/sys/syscall.h Mon Nov 2 13:56:15 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: syscall.h,v 1.318 2020/08/14 00:55:03 riastradh Exp $ */
+/* $NetBSD: syscall.h,v 1.319 2020/11/02 18:56:15 christos Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.306 2020/08/14 00:53:16 riastradh Exp
+ * created from NetBSD: syscalls.master,v 1.307 2020/11/02 18:55:12 christos Exp
*/
#ifndef _SYS_SYSCALL_H_
Index: src/sys/sys/syscallargs.h
diff -u src/sys/sys/syscallargs.h:1.302 src/sys/sys/syscallargs.h:1.303
--- src/sys/sys/syscallargs.h:1.302 Thu Aug 13 20:55:03 2020
+++ src/sys/sys/syscallargs.h Mon Nov 2 13:56:15 2020
@@ -1,10 +1,10 @@
-/* $NetBSD: syscallargs.h,v 1.302 2020/08/14 00:55:03 riastradh Exp $ */
+/* $NetBSD: syscallargs.h,v 1.303 2020/11/02 18:56:15 christos Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.306 2020/08/14 00:53:16 riastradh Exp
+ * created from NetBSD: syscalls.master,v 1.307 2020/11/02 18:55:12 christos Exp
*/
#ifndef _SYS_SYSCALLARGS_H_
@@ -3175,14 +3175,12 @@ struct sys_wait6_args {
check_syscall_args(sys_wait6)
#endif /* !RUMP_CLIENT */
-#ifndef RUMP_CLIENT
struct sys_clock_getcpuclockid2_args {
syscallarg(idtype_t) idtype;
syscallarg(id_t) id;
syscallarg(clockid_t *) clock_id;
};
check_syscall_args(sys_clock_getcpuclockid2)
-#endif /* !RUMP_CLIENT */
struct sys___getvfsstat90_args {
syscallarg(struct statvfs *) buf;
