Module Name: src
Committed By: christos
Date: Tue Jun 18 01:39:09 UTC 2019
Modified Files:
src/sys/compat/aoutm68k: aoutm68k_syscall.h aoutm68k_syscallargs.h
aoutm68k_syscalls.c aoutm68k_sysent.c
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/compat/aoutm68k/aoutm68k_syscall.h
cvs rdiff -u -r1.52 -r1.53 src/sys/compat/aoutm68k/aoutm68k_syscallargs.h
cvs rdiff -u -r1.51 -r1.52 src/sys/compat/aoutm68k/aoutm68k_syscalls.c
cvs rdiff -u -r1.56 -r1.57 src/sys/compat/aoutm68k/aoutm68k_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/aoutm68k/aoutm68k_syscall.h
diff -u src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.54 src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.55
--- src/sys/compat/aoutm68k/aoutm68k_syscall.h:1.54 Sat Jan 26 21:08:39 2019
+++ src/sys/compat/aoutm68k/aoutm68k_syscall.h Mon Jun 17 21:39:09 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: aoutm68k_syscall.h,v 1.54 2019/01/27 02:08:39 pgoyette Exp $ */
+/* $NetBSD: aoutm68k_syscall.h,v 1.55 2019/06/18 01:39:09 christos Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.41.2.1 2018/09/29 01:37:26 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.44 2019/06/18 01:39:01 christos Exp
*/
#ifndef _AOUTM68K_SYS_SYSCALL_H_
@@ -548,18 +548,25 @@
/* syscall: "setsid" ret: "int" args: */
#define AOUTM68K_SYS_setsid 147
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
/* syscall: "quotactl" ret: "int" args: "const char *" "int" "int" "void *" */
#define AOUTM68K_SYS_quotactl 148
-#if defined(COMPAT_43) || !defined(_KERNEL)
+#else
+ /* 148 is excluded compat_50_sys_quotactl */
+#endif
+#if (defined(QUOTA) && defined(COMPAT_43)) || !defined(_KERNEL_OPT)
/* syscall: "oquota" ret: "int" args: */
#define AOUTM68K_SYS_oquota 149
+#else
+ /* 149 is excluded compat_43_sys_quota */
+#endif
+#if defined(COMPAT_43) || !defined(_KERNEL_OPT)
/* syscall: "ogetsockname" ret: "int" args: "int" "void *" "int *" */
#define AOUTM68K_SYS_ogetsockname 150
#else
- /* 149 is excluded compat_43_sys_quota */
/* 150 is excluded compat_43_sys_getsockname */
#endif
/* 155 is excluded nfssvc */
Index: src/sys/compat/aoutm68k/aoutm68k_syscallargs.h
diff -u src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.52 src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.53
--- src/sys/compat/aoutm68k/aoutm68k_syscallargs.h:1.52 Sat Jan 26 21:08:39 2019
+++ src/sys/compat/aoutm68k/aoutm68k_syscallargs.h Mon Jun 17 21:39:09 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: aoutm68k_syscallargs.h,v 1.52 2019/01/27 02:08:39 pgoyette Exp $ */
+/* $NetBSD: aoutm68k_syscallargs.h,v 1.53 2019/06/18 01:39:09 christos Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.41.2.1 2018/09/29 01:37:26 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.44 2019/06/18 01:39:01 christos Exp
*/
#ifndef _AOUTM68K_SYS_SYSCALLARGS_H_
@@ -359,9 +359,15 @@ struct compat_43_sys_setrlimit_args;
struct compat_43_sys_killpg_args;
#else
#endif
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
struct compat_50_sys_quotactl_args;
-#if defined(COMPAT_43) || !defined(_KERNEL)
+#else
+#endif
+#if (defined(QUOTA) && defined(COMPAT_43)) || !defined(_KERNEL_OPT)
+#else
+#endif
+#if defined(COMPAT_43) || !defined(_KERNEL_OPT)
struct compat_43_sys_getsockname_args;
#else
@@ -1007,11 +1013,17 @@ int compat_43_sys_killpg(struct lwp *, c
#endif
int sys_setsid(struct lwp *, const void *, register_t *);
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
int compat_50_sys_quotactl(struct lwp *, const struct compat_50_sys_quotactl_args *, register_t *);
-#if defined(COMPAT_43) || !defined(_KERNEL)
+#else
+#endif
+#if (defined(QUOTA) && defined(COMPAT_43)) || !defined(_KERNEL_OPT)
int compat_43_sys_quota(struct lwp *, const void *, register_t *);
+#else
+#endif
+#if defined(COMPAT_43) || !defined(_KERNEL_OPT)
int compat_43_sys_getsockname(struct lwp *, const struct compat_43_sys_getsockname_args *, register_t *);
#else
Index: src/sys/compat/aoutm68k/aoutm68k_syscalls.c
diff -u src/sys/compat/aoutm68k/aoutm68k_syscalls.c:1.51 src/sys/compat/aoutm68k/aoutm68k_syscalls.c:1.52
--- src/sys/compat/aoutm68k/aoutm68k_syscalls.c:1.51 Sat Jan 26 21:08:39 2019
+++ src/sys/compat/aoutm68k/aoutm68k_syscalls.c Mon Jun 17 21:39:09 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: aoutm68k_syscalls.c,v 1.51 2019/01/27 02:08:39 pgoyette Exp $ */
+/* $NetBSD: aoutm68k_syscalls.c,v 1.52 2019/06/18 01:39:09 christos Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.41.2.1 2018/09/29 01:37:26 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.44 2019/06/18 01:39:01 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aoutm68k_syscalls.c,v 1.51 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aoutm68k_syscalls.c,v 1.52 2019/06/18 01:39:09 christos Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -18,6 +18,7 @@ __KERNEL_RCSID(0, "$NetBSD: aoutm68k_sys
#include "opt_compat_netbsd.h"
#include "opt_sysv.h"
#include "opt_compat_43.h"
+#include "opt_quota.h"
#endif
#include <sys/param.h>
#include <sys/systm.h>
@@ -299,12 +300,19 @@ const char *const aoutm68k_syscallnames[
/* 146 */ "#146 (excluded compat_43_sys_killpg)",
#endif
/* 147 */ "setsid",
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
/* 148 */ "quotactl",
-#if defined(COMPAT_43) || !defined(_KERNEL)
+#else
+ /* 148 */ "#148 (excluded compat_50_sys_quotactl)",
+#endif
+#if (defined(QUOTA) && defined(COMPAT_43)) || !defined(_KERNEL_OPT)
/* 149 */ "oquota",
- /* 150 */ "ogetsockname",
#else
/* 149 */ "#149 (excluded compat_43_sys_quota)",
+#endif
+#if defined(COMPAT_43) || !defined(_KERNEL_OPT)
+ /* 150 */ "ogetsockname",
+#else
/* 150 */ "#150 (excluded compat_43_sys_getsockname)",
#endif
/* 151 */ "#151 (unimplemented)",
@@ -1058,12 +1066,19 @@ const char *const altaoutm68k_syscallnam
/* 146 */ NULL, /* excluded compat_43_sys_killpg */
#endif
/* 147 */ NULL, /* setsid */
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
/* 148 */ NULL, /* quotactl */
-#if defined(COMPAT_43) || !defined(_KERNEL)
+#else
+ /* 148 */ NULL, /* excluded compat_50_sys_quotactl */
+#endif
+#if (defined(QUOTA) && defined(COMPAT_43)) || !defined(_KERNEL_OPT)
/* 149 */ "quota",
- /* 150 */ "getsockname",
#else
/* 149 */ NULL, /* excluded compat_43_sys_quota */
+#endif
+#if defined(COMPAT_43) || !defined(_KERNEL_OPT)
+ /* 150 */ "getsockname",
+#else
/* 150 */ NULL, /* excluded compat_43_sys_getsockname */
#endif
/* 151 */ NULL, /* unimplemented */
Index: src/sys/compat/aoutm68k/aoutm68k_sysent.c
diff -u src/sys/compat/aoutm68k/aoutm68k_sysent.c:1.56 src/sys/compat/aoutm68k/aoutm68k_sysent.c:1.57
--- src/sys/compat/aoutm68k/aoutm68k_sysent.c:1.56 Sat Jan 26 21:08:39 2019
+++ src/sys/compat/aoutm68k/aoutm68k_sysent.c Mon Jun 17 21:39:09 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: aoutm68k_sysent.c,v 1.56 2019/01/27 02:08:39 pgoyette Exp $ */
+/* $NetBSD: aoutm68k_sysent.c,v 1.57 2019/06/18 01:39:09 christos Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.41.2.1 2018/09/29 01:37:26 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.44 2019/06/18 01:39:01 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: aoutm68k_sysent.c,v 1.56 2019/01/27 02:08:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: aoutm68k_sysent.c,v 1.57 2019/06/18 01:39:09 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ktrace.h"
@@ -17,6 +17,7 @@ __KERNEL_RCSID(0, "$NetBSD: aoutm68k_sys
#include "opt_compat_netbsd.h"
#include "opt_sysv.h"
#include "opt_compat_43.h"
+#include "opt_quota.h"
#endif
#include <sys/param.h>
#include <sys/systm.h>
@@ -884,15 +885,27 @@ struct sysent aoutm68k_sysent[] = {
{
.sy_call = (sy_call_t *)sys_setsid
}, /* 147 = setsid */
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
{
ns(struct compat_50_sys_quotactl_args),
.sy_flags = SYCALL_ARG_PTR,
.sy_call = (sy_call_t *)compat_50_sys_quotactl
}, /* 148 = quotactl */
-#if defined(COMPAT_43) || !defined(_KERNEL)
+#else
+ {
+ .sy_call = sys_nosys,
+ }, /* 148 = filler */
+#endif
+#if (defined(QUOTA) && defined(COMPAT_43)) || !defined(_KERNEL_OPT)
{
.sy_call = (sy_call_t *)compat_43_sys_quota
}, /* 149 = oquota */
+#else
+ {
+ .sy_call = sys_nosys,
+ }, /* 149 = filler */
+#endif
+#if defined(COMPAT_43) || !defined(_KERNEL_OPT)
{
ns(struct compat_43_sys_getsockname_args),
.sy_flags = SYCALL_ARG_PTR,
@@ -901,9 +914,6 @@ struct sysent aoutm68k_sysent[] = {
#else
{
.sy_call = sys_nosys,
- }, /* 149 = filler */
- {
- .sy_call = sys_nosys,
}, /* 150 = filler */
#endif
{
