Module Name: src
Committed By: christos
Date: Tue Jun 18 01:42:44 UTC 2019
Modified Files:
src/sys/compat/freebsd: freebsd_syscall.h freebsd_syscallargs.h
freebsd_syscalls.c freebsd_sysent.c
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/sys/compat/freebsd/freebsd_syscall.h
cvs rdiff -u -r1.92 -r1.93 src/sys/compat/freebsd/freebsd_syscallargs.h \
src/sys/compat/freebsd/freebsd_sysent.c
cvs rdiff -u -r1.90 -r1.91 src/sys/compat/freebsd/freebsd_syscalls.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/freebsd/freebsd_syscall.h
diff -u src/sys/compat/freebsd/freebsd_syscall.h:1.89 src/sys/compat/freebsd/freebsd_syscall.h:1.90
--- src/sys/compat/freebsd/freebsd_syscall.h:1.89 Fri Aug 10 17:47:14 2018
+++ src/sys/compat/freebsd/freebsd_syscall.h Mon Jun 17 21:42:44 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: freebsd_syscall.h,v 1.89 2018/08/10 21:47:14 pgoyette Exp $ */
+/* $NetBSD: freebsd_syscall.h,v 1.90 2019/06/18 01:42:44 christos Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.72 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.73 2019/06/18 01:42:36 christos Exp
*/
#ifndef _FREEBSD_SYS_SYSCALL_H_
@@ -438,12 +438,17 @@
/* syscall: "setsid" ret: "int" args: */
#define FREEBSD_SYS_setsid 147
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
/* syscall: "quotactl" ret: "int" args: "char *" "int" "int" "void *" */
#define FREEBSD_SYS_quotactl 148
/* syscall: "oquota" ret: "int" args: */
#define FREEBSD_SYS_oquota 149
+#else
+ /* 148 is excluded compat_50_sys_quotactl */
+ /* 149 is excluded compat_43_sys_quota */
+#endif
/* syscall: "ogetsockname" ret: "int" args: "int" "void *" "int *" */
#define FREEBSD_SYS_ogetsockname 150
Index: src/sys/compat/freebsd/freebsd_syscallargs.h
diff -u src/sys/compat/freebsd/freebsd_syscallargs.h:1.92 src/sys/compat/freebsd/freebsd_syscallargs.h:1.93
--- src/sys/compat/freebsd/freebsd_syscallargs.h:1.92 Fri Aug 10 17:47:14 2018
+++ src/sys/compat/freebsd/freebsd_syscallargs.h Mon Jun 17 21:42:44 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: freebsd_syscallargs.h,v 1.92 2018/08/10 21:47:14 pgoyette Exp $ */
+/* $NetBSD: freebsd_syscallargs.h,v 1.93 2019/06/18 01:42:44 christos Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.72 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.73 2019/06/18 01:42:36 christos Exp
*/
#ifndef _FREEBSD_SYS_SYSCALLARGS_H_
@@ -300,8 +300,11 @@ struct compat_43_sys_getrlimit_args;
struct compat_43_sys_setrlimit_args;
struct compat_43_sys_killpg_args;
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
struct compat_50_sys_quotactl_args;
+#else
+#endif
struct compat_43_sys_getsockname_args;
@@ -879,10 +882,13 @@ int compat_43_sys_killpg(struct lwp *, c
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 *);
int compat_43_sys_quota(struct lwp *, const void *, register_t *);
+#else
+#endif
int compat_43_sys_getsockname(struct lwp *, const struct compat_43_sys_getsockname_args *, register_t *);
int compat_43_sys_getdirentries(struct lwp *, const struct compat_43_sys_getdirentries_args *, register_t *);
Index: src/sys/compat/freebsd/freebsd_sysent.c
diff -u src/sys/compat/freebsd/freebsd_sysent.c:1.92 src/sys/compat/freebsd/freebsd_sysent.c:1.93
--- src/sys/compat/freebsd/freebsd_sysent.c:1.92 Fri Aug 10 17:47:14 2018
+++ src/sys/compat/freebsd/freebsd_sysent.c Mon Jun 17 21:42:44 2019
@@ -1,20 +1,21 @@
-/* $NetBSD: freebsd_sysent.c,v 1.92 2018/08/10 21:47:14 pgoyette Exp $ */
+/* $NetBSD: freebsd_sysent.c,v 1.93 2019/06/18 01:42:44 christos Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.72 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.73 2019/06/18 01:42:36 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: freebsd_sysent.c,v 1.92 2018/08/10 21:47:14 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_sysent.c,v 1.93 2019/06/18 01:42:44 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ktrace.h"
#include "opt_ntp.h"
#include "opt_sysv.h"
#include "opt_compat_43.h"
+#include "opt_quota.h"
#endif
#include <sys/param.h>
#include <sys/systm.h>
@@ -691,6 +692,7 @@ struct sysent freebsd_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,
@@ -699,6 +701,14 @@ struct sysent freebsd_sysent[] = {
{
.sy_call = (sy_call_t *)compat_43_sys_quota
}, /* 149 = oquota */
+#else
+ {
+ .sy_call = sys_nosys,
+ }, /* 148 = filler */
+ {
+ .sy_call = sys_nosys,
+ }, /* 149 = filler */
+#endif
{
ns(struct compat_43_sys_getsockname_args),
.sy_flags = SYCALL_ARG_PTR,
Index: src/sys/compat/freebsd/freebsd_syscalls.c
diff -u src/sys/compat/freebsd/freebsd_syscalls.c:1.90 src/sys/compat/freebsd/freebsd_syscalls.c:1.91
--- src/sys/compat/freebsd/freebsd_syscalls.c:1.90 Fri Aug 10 17:47:14 2018
+++ src/sys/compat/freebsd/freebsd_syscalls.c Mon Jun 17 21:42:44 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: freebsd_syscalls.c,v 1.90 2018/08/10 21:47:14 pgoyette Exp $ */
+/* $NetBSD: freebsd_syscalls.c,v 1.91 2019/06/18 01:42:44 christos Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.72 2018/01/06 16:41:23 kamil Exp
+ * created from NetBSD: syscalls.master,v 1.73 2019/06/18 01:42:36 christos Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: freebsd_syscalls.c,v 1.90 2018/08/10 21:47:14 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: freebsd_syscalls.c,v 1.91 2019/06/18 01:42:44 christos Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -16,6 +16,7 @@ __KERNEL_RCSID(0, "$NetBSD: freebsd_sysc
#include "opt_ntp.h"
#include "opt_sysv.h"
#include "opt_compat_43.h"
+#include "opt_quota.h"
#endif
#include <sys/param.h>
#include <sys/systm.h>
@@ -187,8 +188,13 @@ const char *const freebsd_syscallnames[]
/* 145 */ "osetrlimit",
/* 146 */ "okillpg",
/* 147 */ "setsid",
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
/* 148 */ "quotactl",
/* 149 */ "oquota",
+#else
+ /* 148 */ "#148 (excluded compat_50_sys_quotactl)",
+ /* 149 */ "#149 (excluded compat_43_sys_quota)",
+#endif
/* 150 */ "ogetsockname",
/* 151 */ "#151 (unimplemented sem_lock)",
/* 152 */ "#152 (unimplemented sem_wakeup)",
@@ -757,8 +763,13 @@ const char *const altfreebsd_syscallname
/* 145 */ "setrlimit",
/* 146 */ "killpg",
/* 147 */ NULL, /* setsid */
+#if defined(QUOTA) || !defined(_KERNEL_OPT)
/* 148 */ NULL, /* quotactl */
/* 149 */ "quota",
+#else
+ /* 148 */ NULL, /* excluded compat_50_sys_quotactl */
+ /* 149 */ NULL, /* excluded compat_43_sys_quota */
+#endif
/* 150 */ "getsockname",
/* 151 */ NULL, /* unimplemented sem_lock */
/* 152 */ NULL, /* unimplemented sem_wakeup */
