Module Name: src
Committed By: pgoyette
Date: Sat Sep 29 04:24:02 UTC 2018
Modified Files:
src/sys/compat/netbsd32 [pgoyette-compat]: 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.134.2.15 -r1.134.2.16 \
src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.134.2.14 -r1.134.2.15 \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.132.2.15 -r1.132.2.16 \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.13.2.14 -r1.13.2.15 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.132.2.14 -r1.132.2.15 \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.24.2.14 -r1.24.2.15 \
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_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.15 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.16
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.15 Sat Sep 29 04:11:45 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Sat Sep 29 04:24:02 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.134.2.15 2018/09/29 04:11:45 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.134.2.16 2018/09/29 04:24:02 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -482,9 +482,13 @@
/* syscall: "compat_30_netbsd32_ntp_gettime" ret: "int" args: "netbsd32_ntptimeval50p_t" */
#define NETBSD32_SYS_compat_30_netbsd32_ntp_gettime 175
+#if defined(NTP) || !defined(_KERNEL_OPT)
/* syscall: "netbsd32_ntp_adjtime" ret: "int" args: "netbsd32_timexp_t" */
#define NETBSD32_SYS_netbsd32_ntp_adjtime 176
+#else
+ /* 176 is excluded ntp_adjtime */
+#endif
/* syscall: "netbsd32_setgid" ret: "int" args: "gid_t" */
#define NETBSD32_SYS_netbsd32_setgid 181
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.14 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.15
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.14 Sat Sep 29 04:11:45 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Sat Sep 29 04:24:02 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.14 2018/09/29 04:11:45 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.15 2018/09/29 04:24:02 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -913,11 +913,14 @@ struct compat_30_netbsd32_ntp_gettime_ar
syscallarg(netbsd32_ntptimeval50p_t) ntvp;
};
check_syscall_args(compat_30_netbsd32_ntp_gettime)
+#if defined(NTP) || !defined(_KERNEL_OPT)
struct netbsd32_ntp_adjtime_args {
syscallarg(netbsd32_timexp_t) tp;
};
check_syscall_args(netbsd32_ntp_adjtime)
+#else
+#endif
struct netbsd32_setgid_args {
syscallarg(gid_t) gid;
@@ -2923,8 +2926,11 @@ int netbsd32_pwrite(struct lwp *, const
int compat_30_netbsd32_ntp_gettime(struct lwp *, const struct compat_30_netbsd32_ntp_gettime_args *, register_t *);
+#if defined(NTP) || !defined(_KERNEL_OPT)
int netbsd32_ntp_adjtime(struct lwp *, const struct netbsd32_ntp_adjtime_args *, register_t *);
+#else
+#endif
int netbsd32_setgid(struct lwp *, const struct netbsd32_setgid_args *, register_t *);
int netbsd32_setegid(struct lwp *, const struct netbsd32_setegid_args *, register_t *);
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.15 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.16
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.15 Sat Sep 29 04:11:45 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Sat Sep 29 04:24:02 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.15 2018/09/29 04:11:45 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.16 2018/09/29 04:24:02 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.15 2018/09/29 04:11:45 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.16 2018/09/29 04:24:02 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -204,7 +204,11 @@ const char *const netbsd32_syscallnames[
/* 173 */ "netbsd32_pread",
/* 174 */ "netbsd32_pwrite",
/* 175 */ "compat_30_netbsd32_ntp_gettime",
+#if defined(NTP) || !defined(_KERNEL_OPT)
/* 176 */ "netbsd32_ntp_adjtime",
+#else
+ /* 176 */ "#176 (excluded ntp_adjtime)",
+#endif
/* 177 */ "#177 (unimplemented)",
/* 178 */ "#178 (unimplemented)",
/* 179 */ "#179 (unimplemented)",
@@ -725,7 +729,11 @@ const char *const altnetbsd32_syscallnam
/* 173 */ "pread",
/* 174 */ "pwrite",
/* 175 */ NULL, /* compat_30_netbsd32_ntp_gettime */
+#if defined(NTP) || !defined(_KERNEL_OPT)
/* 176 */ "ntp_adjtime",
+#else
+ /* 176 */ NULL, /* excluded ntp_adjtime */
+#endif
/* 177 */ NULL, /* unimplemented */
/* 178 */ NULL, /* unimplemented */
/* 179 */ NULL, /* unimplemented */
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.14 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.15
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.14 Sat Sep 29 04:11:45 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Sat Sep 29 04:24:02 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.14 2018/09/29 04:11:45 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.15 2018/09/29 04:24:02 pgoyette Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.14 2018/09/29 04:11:45 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.15 2018/09/29 04:24:02 pgoyette 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.132.2.14 src/sys/compat/netbsd32/netbsd32_sysent.c:1.132.2.15
--- src/sys/compat/netbsd32/netbsd32_sysent.c:1.132.2.14 Sat Sep 29 04:11:45 2018
+++ src/sys/compat/netbsd32/netbsd32_sysent.c Sat Sep 29 04:24:02 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.132.2.14 2018/09/29 04:11:45 pgoyette Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.132.2.15 2018/09/29 04:24:02 pgoyette Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.19 2018/09/29 04:22:31 pgoyette Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.132.2.14 2018/09/29 04:11:45 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.132.2.15 2018/09/29 04:24:02 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -790,10 +790,16 @@ struct sysent netbsd32_sysent[] = {
ns(struct compat_30_netbsd32_ntp_gettime_args),
.sy_call = (sy_call_t *)sys_nomodule
}, /* 175 = compat_30_netbsd32_ntp_gettime */
+#if defined(NTP) || !defined(_KERNEL_OPT)
{
ns(struct netbsd32_ntp_adjtime_args),
.sy_call = (sy_call_t *)netbsd32_ntp_adjtime
}, /* 176 = netbsd32_ntp_adjtime */
+#else
+ {
+ .sy_call = sys_nosys,
+ }, /* 176 = filler */
+#endif
{
.sy_call = sys_nosys,
}, /* 177 = filler */
Index: src/sys/compat/netbsd32/netbsd32_systrace_args.c
diff -u src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.24.2.14 src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.24.2.15
--- src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.24.2.14 Sat Sep 29 04:11:45 2018
+++ src/sys/compat/netbsd32/netbsd32_systrace_args.c Sat Sep 29 04:24:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_systrace_args.c,v 1.24.2.14 2018/09/29 04:11:45 pgoyette Exp $ */
+/* $NetBSD: netbsd32_systrace_args.c,v 1.24.2.15 2018/09/29 04:24:02 pgoyette Exp $ */
/*
* System call argument to DTrace register array converstion.
@@ -1253,6 +1253,7 @@ systrace_args(register_t sysnum, const v
*n_args = 1;
break;
}
+#if defined(NTP) || !defined(_KERNEL_OPT)
/* netbsd32_ntp_adjtime */
case 176: {
const struct netbsd32_ntp_adjtime_args *p = params;
@@ -1260,6 +1261,8 @@ systrace_args(register_t sysnum, const v
*n_args = 1;
break;
}
+#else
+#endif
/* netbsd32_setgid */
case 181: {
const struct netbsd32_setgid_args *p = params;
@@ -5515,6 +5518,7 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
+#if defined(NTP) || !defined(_KERNEL_OPT)
/* netbsd32_ntp_adjtime */
case 176:
switch(ndx) {
@@ -5525,6 +5529,8 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
+#else
+#endif
/* netbsd32_setgid */
case 181:
switch(ndx) {
@@ -10130,11 +10136,14 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
+#if defined(NTP) || !defined(_KERNEL_OPT)
/* netbsd32_ntp_adjtime */
case 176:
if (ndx == 0 || ndx == 1)
p = "int";
break;
+#else
+#endif
/* netbsd32_setgid */
case 181:
if (ndx == 0 || ndx == 1)
