From d4c18fb9c68cbb6e44d7fdae9d90bf280b9aaabd Mon Sep 17 00:00:00 2001 From: pgoyette Date: Sat, 10 Oct 2015 03:30:17 +0000 Subject: [PATCH] Regen --- sys/kern/init_sysent.c | 24 ++----------- sys/kern/syscalls.c | 30 ++--------------- sys/kern/syscalls_autoload.c | 6 ++-- sys/kern/systrace_args.c | 29 +--------------- sys/rump/include/rump/rump_syscalls.h | 4 +-- sys/rump/librump/rumpkern/rump_syscalls.c | 41 +++++------------------ sys/sys/syscall.h | 16 ++------- sys/sys/syscallargs.h | 22 ++---------- 8 files changed, 24 insertions(+), 148 deletions(-) diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c index 139e85eac973..83faf0cfe6ea 100644 --- a/sys/kern/init_sysent.c +++ b/sys/kern/init_sysent.c @@ -1,14 +1,14 @@ -/* $NetBSD: init_sysent.c,v 1.300 2015/09/24 14:34:48 christos Exp $ */ +/* $NetBSD: init_sysent.c,v 1.301 2015/10/10 03:30:17 pgoyette Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.278 2015/06/18 15:16:12 pooka Exp + * created from NetBSD: syscalls.master,v 1.280 2015/10/10 03:27:30 pgoyette Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.300 2015/09/24 14:34:48 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: init_sysent.c,v 1.301 2015/10/10 03:30:17 pgoyette Exp $"); #include "opt_modular.h" #include "opt_ntp.h" @@ -1469,39 +1469,21 @@ struct sysent sysent[] = { .sy_flags = SYCALL_ARG_PTR, .sy_call = (sy_call_t *)sys_nomodule }, /* 300 = compat_20_fhstatfs */ -#if defined(SYSVSEM) || !defined(_KERNEL_OPT) { ns(struct compat_50_sys_____semctl13_args), .sy_flags = SYCALL_ARG_PTR, .sy_call = (sy_call_t *)sys_nomodule }, /* 301 = compat_50_____semctl13 */ -#else - { - .sy_call = sys_nosys, - }, /* 301 = filler */ -#endif -#if defined(SYSVMSG) || !defined(_KERNEL_OPT) { ns(struct compat_50_sys___msgctl13_args), .sy_flags = SYCALL_ARG_PTR, .sy_call = (sy_call_t *)sys_nomodule }, /* 302 = compat_50___msgctl13 */ -#else - { - .sy_call = sys_nosys, - }, /* 302 = filler */ -#endif -#if defined(SYSVSHM) || !defined(_KERNEL_OPT) { ns(struct compat_50_sys___shmctl13_args), .sy_flags = SYCALL_ARG_PTR, .sy_call = (sy_call_t *)sys_nomodule }, /* 303 = compat_50___shmctl13 */ -#else - { - .sy_call = sys_nosys, - }, /* 303 = filler */ -#endif { ns(struct sys_lchflags_args), .sy_flags = SYCALL_ARG_PTR, diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c index 1752181d6e32..31443e545cc5 100644 --- a/sys/kern/syscalls.c +++ b/sys/kern/syscalls.c @@ -1,14 +1,14 @@ -/* $NetBSD: syscalls.c,v 1.289 2015/09/24 14:34:22 christos Exp $ */ +/* $NetBSD: syscalls.c,v 1.290 2015/10/10 03:30:17 pgoyette Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.278 2015/06/18 15:16:12 pooka Exp + * created from NetBSD: syscalls.master,v 1.280 2015/10/10 03:27:30 pgoyette Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.289 2015/09/24 14:34:22 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscalls.c,v 1.290 2015/10/10 03:30:17 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_modular.h" @@ -343,21 +343,9 @@ const char *const syscallnames[] = { /* 298 */ "compat_30_fhopen", /* 299 */ "compat_30_fhstat", /* 300 */ "compat_20_fhstatfs", -#if defined(SYSVSEM) || !defined(_KERNEL_OPT) /* 301 */ "compat_50_____semctl13", -#else - /* 301 */ "#301 (excluded ____semctl13)", -#endif -#if defined(SYSVMSG) || !defined(_KERNEL_OPT) /* 302 */ "compat_50___msgctl13", -#else - /* 302 */ "#302 (excluded __msgctl13)", -#endif -#if defined(SYSVSHM) || !defined(_KERNEL_OPT) /* 303 */ "compat_50___shmctl13", -#else - /* 303 */ "#303 (excluded __shmctl13)", -#endif /* 304 */ "lchflags", /* 305 */ "issetugid", /* 306 */ "utrace", @@ -892,21 +880,9 @@ const char *const altsyscallnames[] = { /* 298 */ NULL, /* compat_30_fhopen */ /* 299 */ NULL, /* compat_30_fhstat */ /* 300 */ NULL, /* compat_20_fhstatfs */ -#if defined(SYSVSEM) || !defined(_KERNEL_OPT) /* 301 */ NULL, /* compat_50_____semctl13 */ -#else - /* 301 */ NULL, /* excluded ____semctl13 */ -#endif -#if defined(SYSVMSG) || !defined(_KERNEL_OPT) /* 302 */ NULL, /* compat_50___msgctl13 */ -#else - /* 302 */ NULL, /* excluded __msgctl13 */ -#endif -#if defined(SYSVSHM) || !defined(_KERNEL_OPT) /* 303 */ NULL, /* compat_50___shmctl13 */ -#else - /* 303 */ NULL, /* excluded __shmctl13 */ -#endif /* 304 */ NULL, /* lchflags */ /* 305 */ NULL, /* issetugid */ /* 306 */ NULL, /* utrace */ diff --git a/sys/kern/syscalls_autoload.c b/sys/kern/syscalls_autoload.c index ee87373be33e..ee441c4f4054 100644 --- a/sys/kern/syscalls_autoload.c +++ b/sys/kern/syscalls_autoload.c @@ -1,14 +1,14 @@ -/* $NetBSD: syscalls_autoload.c,v 1.7 2015/09/24 14:34:22 christos Exp $ */ +/* $NetBSD: syscalls_autoload.c,v 1.8 2015/10/10 03:30:17 pgoyette Exp $ */ /* * System call autoload table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.278 2015/06/18 15:16:12 pooka Exp + * created from NetBSD: syscalls.master,v 1.280 2015/10/10 03:27:30 pgoyette Exp */ #include -__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.7 2015/09/24 14:34:22 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscalls_autoload.c,v 1.8 2015/10/10 03:30:17 pgoyette Exp $"); static struct { u_int al_code; diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index 4b9563301af2..095b455a76f7 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -1,4 +1,4 @@ -/* $NetBSD: systrace_args.c,v 1.8 2015/09/24 14:34:22 christos Exp $ */ +/* $NetBSD: systrace_args.c,v 1.9 2015/10/10 03:30:17 pgoyette Exp $ */ /* * System call argument to DTrace register array converstion. @@ -2186,7 +2186,6 @@ systrace_args(register_t sysnum, const void *params, uintptr_t *uarg, size_t *n_ *n_args = 2; break; } -#if defined(SYSVSEM) || !defined(_KERNEL_OPT) /* sys_____semctl13 */ case 301: { struct compat_50_sys_____semctl13_args *p = params; @@ -2197,9 +2196,6 @@ systrace_args(register_t sysnum, const void *params, uintptr_t *uarg, size_t *n_ *n_args = 4; break; } -#else -#endif -#if defined(SYSVMSG) || !defined(_KERNEL_OPT) /* sys___msgctl13 */ case 302: { struct compat_50_sys___msgctl13_args *p = params; @@ -2209,9 +2205,6 @@ systrace_args(register_t sysnum, const void *params, uintptr_t *uarg, size_t *n_ *n_args = 3; break; } -#else -#endif -#if defined(SYSVSHM) || !defined(_KERNEL_OPT) /* sys___shmctl13 */ case 303: { struct compat_50_sys___shmctl13_args *p = params; @@ -2221,8 +2214,6 @@ systrace_args(register_t sysnum, const void *params, uintptr_t *uarg, size_t *n_ *n_args = 3; break; } -#else -#endif /* sys_lchflags */ case 304: { struct sys_lchflags_args *p = params; @@ -7261,7 +7252,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; -#if defined(SYSVSEM) || !defined(_KERNEL_OPT) /* sys_____semctl13 */ case 301: switch(ndx) { @@ -7281,9 +7271,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; -#else -#endif -#if defined(SYSVMSG) || !defined(_KERNEL_OPT) /* sys___msgctl13 */ case 302: switch(ndx) { @@ -7300,9 +7287,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; -#else -#endif -#if defined(SYSVSHM) || !defined(_KERNEL_OPT) /* sys___shmctl13 */ case 303: switch(ndx) { @@ -7319,8 +7303,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) break; }; break; -#else -#endif /* sys_lchflags */ case 304: switch(ndx) { @@ -11143,30 +11125,21 @@ systrace_return_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) if (ndx == 0 || ndx == 1) p = "int"; break; -#if defined(SYSVSEM) || !defined(_KERNEL_OPT) /* sys_____semctl13 */ case 301: if (ndx == 0 || ndx == 1) p = "int"; break; -#else -#endif -#if defined(SYSVMSG) || !defined(_KERNEL_OPT) /* sys___msgctl13 */ case 302: if (ndx == 0 || ndx == 1) p = "int"; break; -#else -#endif -#if defined(SYSVSHM) || !defined(_KERNEL_OPT) /* sys___shmctl13 */ case 303: if (ndx == 0 || ndx == 1) p = "int"; break; -#else -#endif /* sys_lchflags */ case 304: if (ndx == 0 || ndx == 1) diff --git a/sys/rump/include/rump/rump_syscalls.h b/sys/rump/include/rump/rump_syscalls.h index ac9236094b4b..febe47a8f19d 100644 --- a/sys/rump/include/rump/rump_syscalls.h +++ b/sys/rump/include/rump/rump_syscalls.h @@ -1,10 +1,10 @@ -/* $NetBSD: rump_syscalls.h,v 1.90 2015/09/24 14:58:19 christos Exp $ */ +/* $NetBSD: rump_syscalls.h,v 1.91 2015/10/10 03:30:18 pgoyette Exp $ */ /* * System call protos in rump namespace. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.278 2015/06/18 15:16:12 pooka Exp + * created from NetBSD: syscalls.master,v 1.280 2015/10/10 03:27:30 pgoyette Exp */ #ifndef _RUMP_RUMP_SYSCALLS_H_ diff --git a/sys/rump/librump/rumpkern/rump_syscalls.c b/sys/rump/librump/rumpkern/rump_syscalls.c index e4e9aff9ce01..57489a1c05ab 100644 --- a/sys/rump/librump/rumpkern/rump_syscalls.c +++ b/sys/rump/librump/rumpkern/rump_syscalls.c @@ -1,10 +1,10 @@ -/* $NetBSD: rump_syscalls.c,v 1.115 2015/09/24 14:58:19 christos Exp $ */ +/* $NetBSD: rump_syscalls.c,v 1.116 2015/10/10 03:30:17 pgoyette Exp $ */ /* * System call vector and marshalling for rump. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.278 2015/06/18 15:16:12 pooka Exp + * created from NetBSD: syscalls.master,v 1.280 2015/10/10 03:27:30 pgoyette Exp */ #ifdef RUMP_CLIENT @@ -15,7 +15,7 @@ #ifdef __NetBSD__ #include -__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.115 2015/09/24 14:58:19 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rump_syscalls.c,v 1.116 2015/10/10 03:30:17 pgoyette Exp $"); #include #include @@ -6408,7 +6408,6 @@ int rump___sysimpl_clock_nanosleep(clockid_t clock_id, int flags, const struct timespec * rqtp, struct timespec * rmtp) { register_t retval[2]; - int error = 0; int rv = -1; struct sys_clock_nanosleep_args callarg; @@ -6418,14 +6417,11 @@ rump___sysimpl_clock_nanosleep(clockid_t clock_id, int flags, const struct times SPARG(&callarg, rqtp) = rqtp; SPARG(&callarg, rmtp) = rmtp; - error = rsys_syscall(SYS_clock_nanosleep, &callarg, sizeof(callarg), retval); - rsys_seterrno(error); - if (error == 0) { - if (sizeof(int) > sizeof(register_t)) - rv = *(int *)retval; - else - rv = *retval; - } + rsys_syscall(SYS_clock_nanosleep, &callarg, sizeof(callarg), retval); + if (sizeof(int) > sizeof(register_t)) + rv = *(int *)retval; + else + rv = *retval; return rv; } #ifdef RUMP_KERNEL_IS_LIBC @@ -7704,39 +7700,18 @@ struct sysent rump_sysent[] = { .sy_flags = SYCALL_NOSYS, .sy_call = (sy_call_t *)rumpns_sys_nomodule, }, /* 300 = fhstatfs */ -#if defined(SYSVSEM) || !defined(_KERNEL_OPT) { .sy_flags = SYCALL_NOSYS, .sy_call = (sy_call_t *)rumpns_sys_nomodule, }, /* 301 = ____semctl13 */ -#else - { - .sy_flags = SYCALL_NOSYS, - .sy_call = (sy_call_t *)rumpns_enosys, - }, /* 301 = filler */ -#endif -#if defined(SYSVMSG) || !defined(_KERNEL_OPT) { .sy_flags = SYCALL_NOSYS, .sy_call = (sy_call_t *)rumpns_sys_nomodule, }, /* 302 = __msgctl13 */ -#else - { - .sy_flags = SYCALL_NOSYS, - .sy_call = (sy_call_t *)rumpns_enosys, - }, /* 302 = filler */ -#endif -#if defined(SYSVSHM) || !defined(_KERNEL_OPT) { .sy_flags = SYCALL_NOSYS, .sy_call = (sy_call_t *)rumpns_sys_nomodule, }, /* 303 = __shmctl13 */ -#else - { - .sy_flags = SYCALL_NOSYS, - .sy_call = (sy_call_t *)rumpns_enosys, - }, /* 303 = filler */ -#endif { ns(struct sys_lchflags_args), .sy_call = (sy_call_t *)rumpns_enosys, diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h index 6b210927676f..14c701145bc7 100644 --- a/sys/sys/syscall.h +++ b/sys/sys/syscall.h @@ -1,10 +1,10 @@ -/* $NetBSD: syscall.h,v 1.284 2015/09/24 14:34:22 christos Exp $ */ +/* $NetBSD: syscall.h,v 1.285 2015/10/10 03:30:17 pgoyette Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.278 2015/06/18 15:16:12 pooka Exp + * created from NetBSD: syscalls.master,v 1.280 2015/10/10 03:27:30 pgoyette Exp */ #ifndef _SYS_SYSCALL_H_ @@ -826,27 +826,15 @@ /* syscall: "compat_20_fhstatfs" ret: "int" args: "const struct compat_30_fhandle *" "struct statfs12 *" */ #define SYS_compat_20_fhstatfs 300 -#if defined(SYSVSEM) || !defined(_KERNEL_OPT) /* syscall: "compat_50_____semctl13" ret: "int" args: "int" "int" "int" "..." */ #define SYS_compat_50_____semctl13 301 -#else - /* 301 is excluded ____semctl13 */ -#endif -#if defined(SYSVMSG) || !defined(_KERNEL_OPT) /* syscall: "compat_50___msgctl13" ret: "int" args: "int" "int" "struct msqid_ds *" */ #define SYS_compat_50___msgctl13 302 -#else - /* 302 is excluded __msgctl13 */ -#endif -#if defined(SYSVSHM) || !defined(_KERNEL_OPT) /* syscall: "compat_50___shmctl13" ret: "int" args: "int" "int" "struct shmid_ds13 *" */ #define SYS_compat_50___shmctl13 303 -#else - /* 303 is excluded __shmctl13 */ -#endif /* syscall: "lchflags" ret: "int" args: "const char *" "u_long" */ #define SYS_lchflags 304 diff --git a/sys/sys/syscallargs.h b/sys/sys/syscallargs.h index a07a72680d71..dbce2f313f68 100644 --- a/sys/sys/syscallargs.h +++ b/sys/sys/syscallargs.h @@ -1,10 +1,10 @@ -/* $NetBSD: syscallargs.h,v 1.268 2015/09/24 14:34:22 christos Exp $ */ +/* $NetBSD: syscallargs.h,v 1.269 2015/10/10 03:30:17 pgoyette Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.278 2015/06/18 15:16:12 pooka Exp + * created from NetBSD: syscalls.master,v 1.280 2015/10/10 03:27:30 pgoyette Exp */ #ifndef _SYS_SYSCALLARGS_H_ @@ -1898,7 +1898,6 @@ struct compat_20_sys_fhstatfs_args { }; check_syscall_args(compat_20_sys_fhstatfs) #endif /* !RUMP_CLIENT */ -#if defined(SYSVSEM) || !defined(_KERNEL_OPT) #ifndef RUMP_CLIENT struct compat_50_sys_____semctl13_args { @@ -1909,9 +1908,6 @@ struct compat_50_sys_____semctl13_args { }; check_syscall_args(compat_50_sys_____semctl13) #endif /* !RUMP_CLIENT */ -#else -#endif -#if defined(SYSVMSG) || !defined(_KERNEL_OPT) #ifndef RUMP_CLIENT struct compat_50_sys___msgctl13_args { @@ -1921,9 +1917,6 @@ struct compat_50_sys___msgctl13_args { }; check_syscall_args(compat_50_sys___msgctl13) #endif /* !RUMP_CLIENT */ -#else -#endif -#if defined(SYSVSHM) || !defined(_KERNEL_OPT) #ifndef RUMP_CLIENT struct compat_50_sys___shmctl13_args { @@ -1933,8 +1926,6 @@ struct compat_50_sys___shmctl13_args { }; check_syscall_args(compat_50_sys___shmctl13) #endif /* !RUMP_CLIENT */ -#else -#endif struct sys_lchflags_args { syscallarg(const char *) path; @@ -3680,21 +3671,12 @@ int compat_30_sys_fhstat(struct lwp *, const struct compat_30_sys_fhstat_args *, int compat_20_sys_fhstatfs(struct lwp *, const struct compat_20_sys_fhstatfs_args *, register_t *); -#if defined(SYSVSEM) || !defined(_KERNEL_OPT) int compat_50_sys_____semctl13(struct lwp *, const struct compat_50_sys_____semctl13_args *, register_t *); -#else -#endif -#if defined(SYSVMSG) || !defined(_KERNEL_OPT) int compat_50_sys___msgctl13(struct lwp *, const struct compat_50_sys___msgctl13_args *, register_t *); -#else -#endif -#if defined(SYSVSHM) || !defined(_KERNEL_OPT) int compat_50_sys___shmctl13(struct lwp *, const struct compat_50_sys___shmctl13_args *, register_t *); -#else -#endif int sys_lchflags(struct lwp *, const struct sys_lchflags_args *, register_t *); int sys_issetugid(struct lwp *, const void *, register_t *);