Module Name: src Committed By: christos Date: Tue Jun 18 01:37:04 UTC 2019
Modified Files: src/sys/compat/netbsd32: netbsd32_compat_50.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.36 -r1.37 src/sys/compat/netbsd32/netbsd32_compat_50.c cvs rdiff -u -r1.140 -r1.141 src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.139 -r1.140 src/sys/compat/netbsd32/netbsd32_syscallargs.h \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.19 -r1.20 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.138 -r1.139 src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.30 -r1.31 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_50.c diff -u src/sys/compat/netbsd32/netbsd32_compat_50.c:1.36 src/sys/compat/netbsd32/netbsd32_compat_50.c:1.37 --- src/sys/compat/netbsd32/netbsd32_compat_50.c:1.36 Fri Mar 1 06:06:56 2019 +++ src/sys/compat/netbsd32/netbsd32_compat_50.c Mon Jun 17 21:37:03 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_compat_50.c,v 1.36 2019/03/01 11:06:56 pgoyette Exp $ */ +/* $NetBSD: netbsd32_compat_50.c,v 1.37 2019/06/18 01:37:03 christos Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -36,11 +36,12 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.36 2019/03/01 11:06:56 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_compat_50.c,v 1.37 2019/06/18 01:37:03 christos Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" -#include <opt_ntp.h> +#include "opt_ntp.h" +#include "opt_quota.h" #endif @@ -915,6 +916,7 @@ compat_50_netbsd32_getitimer(struct lwp return copyout(&s32it, SCARG_P32(uap, itv), sizeof(s32it)); } +#ifdef QUOTA int compat_50_netbsd32_quotactl(struct lwp *l, const struct compat_50_netbsd32_quotactl_args *uap, register_t *retval) { @@ -932,6 +934,7 @@ compat_50_netbsd32_quotactl(struct lwp * NETBSD32TOP_UAP(arg, void *); return (compat_50_sys_quotactl(l, &ua, retval)); } +#endif #ifdef NTP int @@ -1023,8 +1026,10 @@ static struct syscall_package compat_net (sy_call_t *)compat_50_netbsd32_setitimer }, { NETBSD32_SYS_compat_50_netbsd32_getitimer, 0, (sy_call_t *)compat_50_netbsd32_getitimer }, +#ifdef QUOTA { NETBSD32_SYS_compat_50_netbsd32_quotactl, 0, (sy_call_t *)compat_50_netbsd32_quotactl }, +#endif #ifdef NTP { NETBSD32_SYS_compat_50_netbsd32_ntp_gettime, 0, (sy_call_t *)compat_50_netbsd32_ntp_gettime }, Index: src/sys/compat/netbsd32/netbsd32_syscall.h diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.140 src/sys/compat/netbsd32/netbsd32_syscall.h:1.141 --- src/sys/compat/netbsd32/netbsd32_syscall.h:1.140 Sat Jan 26 21:08:40 2019 +++ src/sys/compat/netbsd32/netbsd32_syscall.h Mon Jun 17 21:37:04 2019 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscall.h,v 1.140 2019/01/27 02:08:40 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscall.h,v 1.141 2019/06/18 01:37:04 christos Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.126 2019/06/18 01:36:50 christos Exp */ #ifndef _NETBSD32_SYS_SYSCALL_H_ @@ -428,12 +428,17 @@ /* syscall: "setsid" ret: "int" args: */ #define NETBSD32_SYS_setsid 147 +#if defined(QUOTA) || !defined(_KERNEL_OPT) /* syscall: "compat_50_netbsd32_quotactl" ret: "int" args: "netbsd32_charp" "int" "int" "netbsd32_voidp" */ #define NETBSD32_SYS_compat_50_netbsd32_quotactl 148 /* syscall: "compat_43_oquota" ret: "int" args: */ #define NETBSD32_SYS_compat_43_oquota 149 +#else + /* 148 is excluded compat_netbsd32_quotactl */ + /* 149 is excluded compat_netbsd32_quota */ +#endif /* syscall: "compat_43_netbsd32_ogetsockname" ret: "int" args: "int" "netbsd32_voidp" "netbsd32_intp" */ #define NETBSD32_SYS_compat_43_netbsd32_ogetsockname 150 Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.139 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.140 --- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.139 Sat Jan 26 21:08:40 2019 +++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Mon Jun 17 21:37:04 2019 @@ -1,10 +1,10 @@ -/* $NetBSD: netbsd32_syscallargs.h,v 1.139 2019/01/27 02:08:40 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscallargs.h,v 1.140 2019/06/18 01:37:04 christos Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.126 2019/06/18 01:36:50 christos Exp */ #ifndef _NETBSD32_SYS_SYSCALLARGS_H_ @@ -793,6 +793,7 @@ struct compat_43_netbsd32_killpg_args { syscallarg(int) signum; }; check_syscall_args(compat_43_netbsd32_killpg) +#if defined(QUOTA) || !defined(_KERNEL_OPT) struct compat_50_netbsd32_quotactl_args { syscallarg(netbsd32_charp) path; @@ -801,6 +802,8 @@ struct compat_50_netbsd32_quotactl_args syscallarg(netbsd32_voidp) arg; }; check_syscall_args(compat_50_netbsd32_quotactl) +#else +#endif struct compat_43_netbsd32_ogetsockname_args { syscallarg(int) fdec; @@ -2890,10 +2893,13 @@ int compat_43_netbsd32_killpg(struct lwp int sys_setsid(struct lwp *, const void *, register_t *); +#if defined(QUOTA) || !defined(_KERNEL_OPT) int compat_50_netbsd32_quotactl(struct lwp *, const struct compat_50_netbsd32_quotactl_args *, register_t *); int compat_43_sys_quota(struct lwp *, const void *, register_t *); +#else +#endif int compat_43_netbsd32_ogetsockname(struct lwp *, const struct compat_43_netbsd32_ogetsockname_args *, register_t *); int netbsd32_nfssvc(struct lwp *, const struct netbsd32_nfssvc_args *, register_t *); Index: src/sys/compat/netbsd32/netbsd32_syscalls.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.139 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.140 --- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.139 Sat Jan 26 21:08:40 2019 +++ src/sys/compat/netbsd32/netbsd32_syscalls.c Mon Jun 17 21:37:04 2019 @@ -1,20 +1,21 @@ -/* $NetBSD: netbsd32_syscalls.c,v 1.139 2019/01/27 02:08:40 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscalls.c,v 1.140 2019/06/18 01:37:04 christos Exp $ */ /* * System call names. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.126 2019/06/18 01:36:50 christos Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.139 2019/01/27 02:08:40 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.140 2019/06/18 01:37:04 christos Exp $"); #if defined(_KERNEL_OPT) #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" #include "opt_ntp.h" #include "opt_compat_43.h" +#include "opt_quota.h" #endif #include <sys/param.h> #include <sys/systm.h> @@ -176,8 +177,13 @@ const char *const netbsd32_syscallnames[ /* 145 */ "compat_43_netbsd32_osetrlimit", /* 146 */ "compat_43_netbsd32_killpg", /* 147 */ "setsid", +#if defined(QUOTA) || !defined(_KERNEL_OPT) /* 148 */ "compat_50_netbsd32_quotactl", /* 149 */ "compat_43_oquota", +#else + /* 148 */ "#148 (excluded compat_netbsd32_quotactl)", + /* 149 */ "#149 (excluded compat_netbsd32_quota)", +#endif /* 150 */ "compat_43_netbsd32_ogetsockname", /* 151 */ "#151 (unimplemented)", /* 152 */ "#152 (unimplemented)", @@ -701,8 +707,13 @@ const char *const altnetbsd32_syscallnam /* 145 */ NULL, /* compat_43_netbsd32_osetrlimit */ /* 146 */ NULL, /* compat_43_netbsd32_killpg */ /* 147 */ NULL, /* setsid */ +#if defined(QUOTA) || !defined(_KERNEL_OPT) /* 148 */ NULL, /* compat_50_netbsd32_quotactl */ /* 149 */ NULL, /* compat_43_oquota */ +#else + /* 148 */ NULL, /* excluded compat_netbsd32_quotactl */ + /* 149 */ NULL, /* excluded compat_netbsd32_quota */ +#endif /* 150 */ NULL, /* compat_43_netbsd32_ogetsockname */ /* 151 */ NULL, /* unimplemented */ /* 152 */ NULL, /* unimplemented */ Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.19 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.20 --- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.19 Sat Jan 26 21:08:40 2019 +++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Mon Jun 17 21:37:04 2019 @@ -1,14 +1,14 @@ -/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.19 2019/01/27 02:08:40 pgoyette Exp $ */ +/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.20 2019/06/18 01:37:04 christos Exp $ */ /* * System call autoload table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.126 2019/06/18 01:36:50 christos Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.19 2019/01/27 02:08:40 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.20 2019/06/18 01:37:04 christos Exp $"); #include <sys/proc.h> static struct sc_autoload netbsd32_syscalls_autoload[] = { Index: src/sys/compat/netbsd32/netbsd32_sysent.c diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.138 src/sys/compat/netbsd32/netbsd32_sysent.c:1.139 --- src/sys/compat/netbsd32/netbsd32_sysent.c:1.138 Sat Jan 26 21:08:40 2019 +++ src/sys/compat/netbsd32/netbsd32_sysent.c Mon Jun 17 21:37:04 2019 @@ -1,19 +1,20 @@ -/* $NetBSD: netbsd32_sysent.c,v 1.138 2019/01/27 02:08:40 pgoyette Exp $ */ +/* $NetBSD: netbsd32_sysent.c,v 1.139 2019/06/18 01:37:04 christos Exp $ */ /* * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp + * created from NetBSD: syscalls.master,v 1.126 2019/06/18 01:36:50 christos Exp */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.138 2019/01/27 02:08:40 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.139 2019/06/18 01:37:04 christos Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" #include "opt_ntp.h" #include "opt_compat_43.h" +#include "opt_quota.h" #endif #include <sys/param.h> #include <sys/systm.h> @@ -687,6 +688,7 @@ struct sysent netbsd32_sysent[] = { { .sy_call = (sy_call_t *)sys_setsid }, /* 147 = setsid */ +#if defined(QUOTA) || !defined(_KERNEL_OPT) { ns(struct compat_50_netbsd32_quotactl_args), .sy_call = (sy_call_t *)sys_nomodule @@ -694,6 +696,14 @@ struct sysent netbsd32_sysent[] = { { .sy_call = (sy_call_t *)sys_nomodule }, /* 149 = compat_43_oquota */ +#else + { + .sy_call = sys_nosys, + }, /* 148 = filler */ + { + .sy_call = sys_nosys, + }, /* 149 = filler */ +#endif { ns(struct compat_43_netbsd32_ogetsockname_args), .sy_call = (sy_call_t *)sys_nomodule Index: src/sys/compat/netbsd32/netbsd32_systrace_args.c diff -u src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.30 src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.31 --- src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.30 Sat Jan 26 21:08:40 2019 +++ src/sys/compat/netbsd32/netbsd32_systrace_args.c Mon Jun 17 21:37:04 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_systrace_args.c,v 1.30 2019/01/27 02:08:40 pgoyette Exp $ */ +/* $NetBSD: netbsd32_systrace_args.c,v 1.31 2019/06/18 01:37:04 christos Exp $ */ /* * System call argument to DTrace register array converstion. @@ -1094,6 +1094,7 @@ systrace_args(register_t sysnum, const v *n_args = 0; break; } +#if defined(QUOTA) || !defined(_KERNEL_OPT) /* netbsd32_quotactl */ case 148: { const struct compat_50_netbsd32_quotactl_args *p = params; @@ -1109,6 +1110,8 @@ systrace_args(register_t sysnum, const v *n_args = 0; break; } +#else +#endif /* netbsd32_ogetsockname */ case 150: { const struct compat_43_netbsd32_ogetsockname_args *p = params; @@ -5240,6 +5243,7 @@ systrace_entry_setargdesc(int sysnum, in /* sys_setsid */ case 147: break; +#if defined(QUOTA) || !defined(_KERNEL_OPT) /* netbsd32_quotactl */ case 148: switch(ndx) { @@ -5262,6 +5266,8 @@ systrace_entry_setargdesc(int sysnum, in /* sys_quota */ case 149: break; +#else +#endif /* netbsd32_ogetsockname */ case 150: switch(ndx) { @@ -10049,6 +10055,7 @@ systrace_return_setargdesc(int sysnum, i break; /* sys_setsid */ case 147: +#if defined(QUOTA) || !defined(_KERNEL_OPT) /* netbsd32_quotactl */ case 148: if (ndx == 0 || ndx == 1) @@ -10056,6 +10063,8 @@ systrace_return_setargdesc(int sysnum, i break; /* sys_quota */ case 149: +#else +#endif /* netbsd32_ogetsockname */ case 150: if (ndx == 0 || ndx == 1)