Module Name: src Committed By: christos Date: Sat Apr 23 23:09:27 UTC 2016
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: regen To generate a diff of this commit: cvs rdiff -u -r1.309 -r1.310 src/sys/kern/init_sysent.c cvs rdiff -u -r1.299 -r1.300 src/sys/kern/syscalls.c cvs rdiff -u -r1.18 -r1.19 src/sys/kern/syscalls_autoload.c \ src/sys/kern/systrace_args.c cvs rdiff -u -r1.99 -r1.100 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.126 -r1.127 src/sys/rump/librump/rumpkern/rump_syscalls.c cvs rdiff -u -r1.293 -r1.294 src/sys/sys/syscall.h cvs rdiff -u -r1.277 -r1.278 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.309 src/sys/kern/init_sysent.c:1.310 --- src/sys/kern/init_sysent.c:1.309 Sat Apr 2 21:22:39 2016 +++ src/sys/kern/init_sysent.c Sat Apr 23 19:09:27 2016 @@ -1,14 +1,14 @@ -/* $NetBSD: init_sysent.c,v 1.309 2016/04/03 01:22:39 christos Exp $ */ +/* $NetBSD: init_sysent.c,v 1.310 2016/04/23 23:09:27 christos Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.283 2016/04/03 01:00:26 christos Exp + * created from NetBSD: syscalls.master,v 1.284 2016/04/23 23:08:26 christos Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.309 2016/04/03 01:22:39 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.310 2016/04/23 23:09:27 christos Exp $"); #include "opt_modular.h" #include "opt_ntp.h" @@ -2323,8 +2323,10 @@ struct sysent sysent[] = { .sy_call = (sy_call_t *)sys_wait6 }, /* 481 = wait6 */ { - .sy_call = sys_nosys, - }, /* 482 = filler */ + ns(struct sys_clock_getcpuclockid2_args), + .sy_flags = SYCALL_ARG_PTR, + .sy_call = (sy_call_t *)sys_clock_getcpuclockid2 + }, /* 482 = clock_getcpuclockid2 */ { .sy_call = sys_nosys, }, /* 483 = filler */ Index: src/sys/kern/syscalls.c diff -u src/sys/kern/syscalls.c:1.299 src/sys/kern/syscalls.c:1.300 --- src/sys/kern/syscalls.c:1.299 Sat Apr 2 21:22:39 2016 +++ src/sys/kern/syscalls.c Sat Apr 23 19:09:27 2016 @@ -1,14 +1,14 @@ -/* $NetBSD: syscalls.c,v 1.299 2016/04/03 01:22:39 christos Exp $ */ +/* $NetBSD: syscalls.c,v 1.300 2016/04/23 23:09:27 christos Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.283 2016/04/03 01:00:26 christos Exp + * created from NetBSD: syscalls.master,v 1.284 2016/04/23 23:08:26 christos Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.299 2016/04/03 01:22:39 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.300 2016/04/23 23:09:27 christos Exp $"); #if defined(_KERNEL_OPT) #include "opt_modular.h" @@ -529,7 +529,7 @@ const char *const syscallnames[] = { /* 479 */ "posix_fallocate", /* 480 */ "fdiscard", /* 481 */ "wait6", - /* 482 */ "# filler", + /* 482 */ "clock_getcpuclockid2", /* 483 */ "# filler", /* 484 */ "# filler", /* 485 */ "# filler", @@ -1066,7 +1066,7 @@ const char *const altsyscallnames[] = { /* 479 */ NULL, /* posix_fallocate */ /* 480 */ NULL, /* fdiscard */ /* 481 */ NULL, /* wait6 */ - /* 482 */ NULL, /* filler */ + /* 482 */ NULL, /* clock_getcpuclockid2 */ /* 483 */ NULL, /* filler */ /* 484 */ NULL, /* filler */ /* 485 */ NULL, /* filler */ Index: src/sys/kern/syscalls_autoload.c diff -u src/sys/kern/syscalls_autoload.c:1.18 src/sys/kern/syscalls_autoload.c:1.19 --- src/sys/kern/syscalls_autoload.c:1.18 Sat Apr 2 21:22:39 2016 +++ src/sys/kern/syscalls_autoload.c Sat Apr 23 19:09:27 2016 @@ -1,14 +1,14 @@ -/* $NetBSD: syscalls_autoload.c,v 1.18 2016/04/03 01:22:39 christos Exp $ */ +/* $NetBSD: syscalls_autoload.c,v 1.19 2016/04/23 23:09:27 christos Exp $ */ /* * System call autoload table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.283 2016/04/03 01:00:26 christos Exp + * created from NetBSD: syscalls.master,v 1.284 2016/04/23 23:08:26 christos Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.18 2016/04/03 01:22:39 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.19 2016/04/23 23:09:27 christos Exp $"); #include <sys/proc.h> static struct sc_autoload netbsd_syscalls_autoload[] = { Index: src/sys/kern/systrace_args.c diff -u src/sys/kern/systrace_args.c:1.18 src/sys/kern/systrace_args.c:1.19 --- src/sys/kern/systrace_args.c:1.18 Sat Apr 2 21:22:39 2016 +++ src/sys/kern/systrace_args.c Sat Apr 23 19:09:27 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: systrace_args.c,v 1.18 2016/04/03 01:22:39 christos Exp $ */ +/* $NetBSD: systrace_args.c,v 1.19 2016/04/23 23:09:27 christos Exp $ */ /* * System call argument to DTrace register array converstion. @@ -3669,6 +3669,15 @@ systrace_args(register_t sysnum, const v *n_args = 6; break; } + /* sys_clock_getcpuclockid2 */ + case 482: { + struct sys_clock_getcpuclockid2_args *p = params; + iarg[0] = SCARG(p, idtype); /* idtype_t */ + iarg[1] = SCARG(p, id); /* id_t */ + uarg[2] = (intptr_t) SCARG(p, clock_id); /* clockid_t * */ + *n_args = 3; + break; + } default: *n_args = 0; break; @@ -9884,6 +9893,22 @@ systrace_entry_setargdesc(int sysnum, in break; }; break; + /* sys_clock_getcpuclockid2 */ + case 482: + switch(ndx) { + case 0: + p = "idtype_t"; + break; + case 1: + p = "id_t"; + break; + case 2: + p = "clockid_t *"; + break; + default: + break; + }; + break; default: break; }; @@ -11966,6 +11991,11 @@ systrace_return_setargdesc(int sysnum, i if (ndx == 0 || ndx == 1) p = "int"; break; + /* sys_clock_getcpuclockid2 */ + case 482: + if (ndx == 0 || ndx == 1) + p = "int"; + break; default: break; }; Index: src/sys/rump/include/rump/rump_syscalls.h diff -u src/sys/rump/include/rump/rump_syscalls.h:1.99 src/sys/rump/include/rump/rump_syscalls.h:1.100 --- src/sys/rump/include/rump/rump_syscalls.h:1.99 Sat Apr 2 21:22:39 2016 +++ src/sys/rump/include/rump/rump_syscalls.h Sat Apr 23 19:09:27 2016 @@ -1,10 +1,10 @@ -/* $NetBSD: rump_syscalls.h,v 1.99 2016/04/03 01:22:39 christos Exp $ */ +/* $NetBSD: rump_syscalls.h,v 1.100 2016/04/23 23:09:27 christos Exp $ */ /* * System call protos in rump namespace. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.283 2016/04/03 01:00:26 christos Exp + * created from NetBSD: syscalls.master,v 1.284 2016/04/23 23:08:26 christos 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.126 src/sys/rump/librump/rumpkern/rump_syscalls.c:1.127 --- src/sys/rump/librump/rumpkern/rump_syscalls.c:1.126 Sat Apr 2 21:22:39 2016 +++ src/sys/rump/librump/rumpkern/rump_syscalls.c Sat Apr 23 19:09:27 2016 @@ -1,10 +1,10 @@ -/* $NetBSD: rump_syscalls.c,v 1.126 2016/04/03 01:22:39 christos Exp $ */ +/* $NetBSD: rump_syscalls.c,v 1.127 2016/04/23 23:09:27 christos Exp $ */ /* * System call vector and marshalling for rump. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.283 2016/04/03 01:00:26 christos Exp + * created from NetBSD: syscalls.master,v 1.284 2016/04/23 23:08:26 christos Exp */ #ifdef RUMP_CLIENT @@ -15,7 +15,7 @@ #ifdef __NetBSD__ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.126 2016/04/03 01:22:39 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.127 2016/04/23 23:09:27 christos Exp $"); #include <sys/fstypes.h> #include <sys/proc.h> @@ -8383,9 +8383,8 @@ struct sysent rump_sysent[] = { .sy_call = (sy_call_t *)rumpns_enosys, }, /* 481 = wait6 */ { - .sy_flags = SYCALL_NOSYS, .sy_call = (sy_call_t *)rumpns_enosys, - }, /* 482 = filler */ +}, /* 482 = clock_getcpuclockid2 */ { .sy_flags = SYCALL_NOSYS, .sy_call = (sy_call_t *)rumpns_enosys, Index: src/sys/sys/syscall.h diff -u src/sys/sys/syscall.h:1.293 src/sys/sys/syscall.h:1.294 --- src/sys/sys/syscall.h:1.293 Sat Apr 2 21:22:39 2016 +++ src/sys/sys/syscall.h Sat Apr 23 19:09:27 2016 @@ -1,10 +1,10 @@ -/* $NetBSD: syscall.h,v 1.293 2016/04/03 01:22:39 christos Exp $ */ +/* $NetBSD: syscall.h,v 1.294 2016/04/23 23:09:27 christos Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.283 2016/04/03 01:00:26 christos Exp + * created from NetBSD: syscalls.master,v 1.284 2016/04/23 23:08:26 christos Exp */ #ifndef _SYS_SYSCALL_H_ @@ -1328,6 +1328,9 @@ /* syscall: "wait6" ret: "int" args: "idtype_t" "id_t" "int *" "int" "struct wrusage *" "siginfo_t *" */ #define SYS_wait6 481 -#define SYS_MAXSYSCALL 482 +/* syscall: "clock_getcpuclockid2" ret: "int" args: "idtype_t" "id_t" "clockid_t *" */ +#define SYS_clock_getcpuclockid2 482 + +#define SYS_MAXSYSCALL 483 #define SYS_NSYSENT 512 #endif /* _SYS_SYSCALL_H_ */ Index: src/sys/sys/syscallargs.h diff -u src/sys/sys/syscallargs.h:1.277 src/sys/sys/syscallargs.h:1.278 --- src/sys/sys/syscallargs.h:1.277 Sat Apr 2 21:22:39 2016 +++ src/sys/sys/syscallargs.h Sat Apr 23 19:09:27 2016 @@ -1,10 +1,10 @@ -/* $NetBSD: syscallargs.h,v 1.277 2016/04/03 01:22:39 christos Exp $ */ +/* $NetBSD: syscallargs.h,v 1.278 2016/04/23 23:09:27 christos Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.283 2016/04/03 01:00:26 christos Exp + * created from NetBSD: syscalls.master,v 1.284 2016/04/23 23:08:26 christos Exp */ #ifndef _SYS_SYSCALLARGS_H_ @@ -3141,6 +3141,15 @@ 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 */ + /* * System call prototypes. */ @@ -4017,5 +4026,7 @@ int sys_fdiscard(struct lwp *, const str int sys_wait6(struct lwp *, const struct sys_wait6_args *, register_t *); +int sys_clock_getcpuclockid2(struct lwp *, const struct sys_clock_getcpuclockid2_args *, register_t *); + #endif /* !RUMP_CLIENT */ #endif /* _SYS_SYSCALLARGS_H_ */