Module Name: src
Committed By: pgoyette
Date: Sat Sep 29 04:11:45 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.14 -r1.134.2.15 \
src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.134.2.13 -r1.134.2.14 \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.132.2.14 -r1.132.2.15 \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.13.2.13 -r1.13.2.14 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.132.2.13 -r1.132.2.14 \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.24.2.13 -r1.24.2.14 \
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.14 src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.15
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.134.2.14 Fri Sep 14 10:41:47 2018
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Sat Sep 29 04:11:45 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.134.2.14 2018/09/14 10:41:47 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.134.2.15 2018/09/29 04:11:45 pgoyette Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -479,17 +479,12 @@
/* syscall: "netbsd32_pwrite" ret: "netbsd32_ssize_t" args: "int" "netbsd32_voidp" "netbsd32_size_t" "int" "netbsd32_off_t" */
#define NETBSD32_SYS_netbsd32_pwrite 174
-#if defined(NTP) || !defined(_KERNEL_OPT)
/* syscall: "compat_30_netbsd32_ntp_gettime" ret: "int" args: "netbsd32_ntptimeval50p_t" */
#define NETBSD32_SYS_compat_30_netbsd32_ntp_gettime 175
/* syscall: "netbsd32_ntp_adjtime" ret: "int" args: "netbsd32_timexp_t" */
#define NETBSD32_SYS_netbsd32_ntp_adjtime 176
-#else
- /* 175 is excluded ntp_gettime */
- /* 176 is excluded ntp_adjtime */
-#endif
/* syscall: "netbsd32_setgid" ret: "int" args: "gid_t" */
#define NETBSD32_SYS_netbsd32_setgid 181
@@ -1032,13 +1027,9 @@
/* syscall: "compat_30_netbsd32___fhstat30" ret: "int" args: "netbsd32_fhandlep_t" "netbsd32_stat50p_t" */
#define NETBSD32_SYS_compat_30_netbsd32___fhstat30 392
-#if defined(NTP) || !defined(_KERNEL_OPT)
/* syscall: "compat_50_netbsd32_ntp_gettime" ret: "int" args: "netbsd32_ntptimeval50p_t" */
#define NETBSD32_SYS_compat_50_netbsd32_ntp_gettime 393
-#else
- /* 393 is excluded __ntp_gettime30 */
-#endif
/* syscall: "netbsd32___socket30" ret: "int" args: "int" "int" "int" */
#define NETBSD32_SYS_netbsd32___socket30 394
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.13 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.14
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.134.2.13 Fri Sep 14 10:41:47 2018
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Sat Sep 29 04:11:45 2018
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.13 2018/09/14 10:41:47 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.134.2.14 2018/09/29 04:11:45 pgoyette Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -908,7 +908,6 @@ struct netbsd32_pwrite_args {
syscallarg(netbsd32_off_t) offset;
};
check_syscall_args(netbsd32_pwrite)
-#if defined(NTP) || !defined(_KERNEL_OPT)
struct compat_30_netbsd32_ntp_gettime_args {
syscallarg(netbsd32_ntptimeval50p_t) ntvp;
@@ -919,8 +918,6 @@ 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;
@@ -2053,14 +2050,11 @@ struct compat_30_netbsd32___fhstat30_arg
syscallarg(netbsd32_stat50p_t) sb;
};
check_syscall_args(compat_30_netbsd32___fhstat30)
-#if defined(NTP) || !defined(_KERNEL_OPT)
struct compat_50_netbsd32_ntp_gettime_args {
syscallarg(netbsd32_ntptimeval50p_t) ntvp;
};
check_syscall_args(compat_50_netbsd32_ntp_gettime)
-#else
-#endif
struct netbsd32___socket30_args {
syscallarg(int) domain;
@@ -2927,13 +2921,10 @@ int netbsd32_pread(struct lwp *, const s
int netbsd32_pwrite(struct lwp *, const struct netbsd32_pwrite_args *, register_t *);
-#if defined(NTP) || !defined(_KERNEL_OPT)
int compat_30_netbsd32_ntp_gettime(struct lwp *, const struct compat_30_netbsd32_ntp_gettime_args *, register_t *);
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 *);
@@ -3286,11 +3277,8 @@ int netbsd32___getdents30(struct lwp *,
int compat_30_netbsd32___fhstat30(struct lwp *, const struct compat_30_netbsd32___fhstat30_args *, register_t *);
-#if defined(NTP) || !defined(_KERNEL_OPT)
int compat_50_netbsd32_ntp_gettime(struct lwp *, const struct compat_50_netbsd32_ntp_gettime_args *, register_t *);
-#else
-#endif
int netbsd32___socket30(struct lwp *, const struct netbsd32___socket30_args *, register_t *);
int netbsd32___getfh30(struct lwp *, const struct netbsd32___getfh30_args *, register_t *);
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.14 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.15
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.132.2.14 Fri Sep 14 10:41:47 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Sat Sep 29 04:11:45 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.14 2018/09/14 10:41:47 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.132.2.15 2018/09/29 04:11:45 pgoyette Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.14 2018/09/14 10:41:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.132.2.15 2018/09/29 04:11:45 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
@@ -203,13 +203,8 @@ const char *const netbsd32_syscallnames[
/* 172 */ "#172 (unimplemented)",
/* 173 */ "netbsd32_pread",
/* 174 */ "netbsd32_pwrite",
-#if defined(NTP) || !defined(_KERNEL_OPT)
/* 175 */ "compat_30_netbsd32_ntp_gettime",
/* 176 */ "netbsd32_ntp_adjtime",
-#else
- /* 175 */ "#175 (excluded ntp_gettime)",
- /* 176 */ "#176 (excluded ntp_adjtime)",
-#endif
/* 177 */ "#177 (unimplemented)",
/* 178 */ "#178 (unimplemented)",
/* 179 */ "#179 (unimplemented)",
@@ -426,11 +421,7 @@ const char *const netbsd32_syscallnames[
/* 390 */ "netbsd32___getdents30",
/* 391 */ "#391 (ignored old posix fadvise)",
/* 392 */ "compat_30_netbsd32___fhstat30",
-#if defined(NTP) || !defined(_KERNEL_OPT)
/* 393 */ "compat_50_netbsd32_ntp_gettime",
-#else
- /* 393 */ "#393 (excluded __ntp_gettime30)",
-#endif
/* 394 */ "netbsd32___socket30",
/* 395 */ "netbsd32___getfh30",
/* 396 */ "netbsd32___fhopen40",
@@ -733,13 +724,8 @@ const char *const altnetbsd32_syscallnam
/* 172 */ NULL, /* unimplemented */
/* 173 */ "pread",
/* 174 */ "pwrite",
-#if defined(NTP) || !defined(_KERNEL_OPT)
/* 175 */ NULL, /* compat_30_netbsd32_ntp_gettime */
/* 176 */ "ntp_adjtime",
-#else
- /* 175 */ NULL, /* excluded ntp_gettime */
- /* 176 */ NULL, /* excluded ntp_adjtime */
-#endif
/* 177 */ NULL, /* unimplemented */
/* 178 */ NULL, /* unimplemented */
/* 179 */ NULL, /* unimplemented */
@@ -956,11 +942,7 @@ const char *const altnetbsd32_syscallnam
/* 390 */ "getdents",
/* 391 */ NULL, /* ignored old posix fadvise */
/* 392 */ NULL, /* compat_30_netbsd32___fhstat30 */
-#if defined(NTP) || !defined(_KERNEL_OPT)
/* 393 */ NULL, /* compat_50_netbsd32_ntp_gettime */
-#else
- /* 393 */ NULL, /* excluded __ntp_gettime30 */
-#endif
/* 394 */ "socket",
/* 395 */ "getfh",
/* 396 */ "fhopen",
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.13 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.14
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.13.2.13 Fri Sep 14 10:41:47 2018
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Sat Sep 29 04:11:45 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.13 2018/09/14 10:41:47 pgoyette Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.14 2018/09/29 04:11:45 pgoyette Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.13 2018/09/14 10:41:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls_autoload.c,v 1.13.2.14 2018/09/29 04:11:45 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.13 src/sys/compat/netbsd32/netbsd32_sysent.c:1.132.2.14
--- src/sys/compat/netbsd32/netbsd32_sysent.c:1.132.2.13 Fri Sep 14 10:41:47 2018
+++ src/sys/compat/netbsd32/netbsd32_sysent.c Sat Sep 29 04:11:45 2018
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.132.2.13 2018/09/14 10:41:47 pgoyette Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.132.2.14 2018/09/29 04:11:45 pgoyette Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.120.2.17 2018/09/14 10:41:13 pgoyette Exp
+ * created from NetBSD: syscalls.master,v 1.120.2.18 2018/09/29 04:11:06 pgoyette Exp
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.132.2.13 2018/09/14 10:41:47 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_sysent.c,v 1.132.2.14 2018/09/29 04:11:45 pgoyette Exp $");
#if defined(_KERNEL_OPT)
#include "opt_compat_netbsd.h"
@@ -786,7 +786,6 @@ struct sysent netbsd32_sysent[] = {
.sy_flags = SYCALL_NARGS64_VAL(1) | SYCALL_ARG4_64,
.sy_call = (sy_call_t *)netbsd32_pwrite
}, /* 174 = netbsd32_pwrite */
-#if defined(NTP) || !defined(_KERNEL_OPT)
{
ns(struct compat_30_netbsd32_ntp_gettime_args),
.sy_call = (sy_call_t *)sys_nomodule
@@ -795,14 +794,6 @@ struct sysent netbsd32_sysent[] = {
ns(struct netbsd32_ntp_adjtime_args),
.sy_call = (sy_call_t *)netbsd32_ntp_adjtime
}, /* 176 = netbsd32_ntp_adjtime */
-#else
- {
- .sy_call = sys_nosys,
- }, /* 175 = filler */
- {
- .sy_call = sys_nosys,
- }, /* 176 = filler */
-#endif
{
.sy_call = sys_nosys,
}, /* 177 = filler */
@@ -1627,16 +1618,10 @@ struct sysent netbsd32_sysent[] = {
ns(struct compat_30_netbsd32___fhstat30_args),
.sy_call = (sy_call_t *)sys_nomodule
}, /* 392 = compat_30_netbsd32___fhstat30 */
-#if defined(NTP) || !defined(_KERNEL_OPT)
{
ns(struct compat_50_netbsd32_ntp_gettime_args),
.sy_call = (sy_call_t *)sys_nomodule
}, /* 393 = compat_50_netbsd32_ntp_gettime */
-#else
- {
- .sy_call = sys_nosys,
- }, /* 393 = filler */
-#endif
{
ns(struct netbsd32___socket30_args),
.sy_call = (sy_call_t *)netbsd32___socket30
Index: src/sys/compat/netbsd32/netbsd32_systrace_args.c
diff -u src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.24.2.13 src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.24.2.14
--- src/sys/compat/netbsd32/netbsd32_systrace_args.c:1.24.2.13 Fri Sep 14 10:41:47 2018
+++ src/sys/compat/netbsd32/netbsd32_systrace_args.c Sat Sep 29 04:11:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_systrace_args.c,v 1.24.2.13 2018/09/14 10:41:47 pgoyette Exp $ */
+/* $NetBSD: netbsd32_systrace_args.c,v 1.24.2.14 2018/09/29 04:11:45 pgoyette Exp $ */
/*
* System call argument to DTrace register array converstion.
@@ -1246,7 +1246,6 @@ systrace_args(register_t sysnum, const v
*n_args = 5;
break;
}
-#if defined(NTP) || !defined(_KERNEL_OPT)
/* netbsd32_ntp_gettime */
case 175: {
const struct compat_30_netbsd32_ntp_gettime_args *p = params;
@@ -1261,8 +1260,6 @@ systrace_args(register_t sysnum, const v
*n_args = 1;
break;
}
-#else
-#endif
/* netbsd32_setgid */
case 181: {
const struct netbsd32_setgid_args *p = params;
@@ -2772,7 +2769,6 @@ systrace_args(register_t sysnum, const v
*n_args = 2;
break;
}
-#if defined(NTP) || !defined(_KERNEL_OPT)
/* netbsd32_ntp_gettime */
case 393: {
const struct compat_50_netbsd32_ntp_gettime_args *p = params;
@@ -2780,8 +2776,6 @@ systrace_args(register_t sysnum, const v
*n_args = 1;
break;
}
-#else
-#endif
/* netbsd32___socket30 */
case 394: {
const struct netbsd32___socket30_args *p = params;
@@ -5511,7 +5505,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#if defined(NTP) || !defined(_KERNEL_OPT)
/* netbsd32_ntp_gettime */
case 175:
switch(ndx) {
@@ -5532,8 +5525,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#else
-#endif
/* netbsd32_setgid */
case 181:
switch(ndx) {
@@ -8117,7 +8108,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#if defined(NTP) || !defined(_KERNEL_OPT)
/* netbsd32_ntp_gettime */
case 393:
switch(ndx) {
@@ -8128,8 +8118,6 @@ systrace_entry_setargdesc(int sysnum, in
break;
};
break;
-#else
-#endif
/* netbsd32___socket30 */
case 394:
switch(ndx) {
@@ -10137,7 +10125,6 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "netbsd32_ssize_t";
break;
-#if defined(NTP) || !defined(_KERNEL_OPT)
/* netbsd32_ntp_gettime */
case 175:
if (ndx == 0 || ndx == 1)
@@ -10148,8 +10135,6 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#else
-#endif
/* netbsd32_setgid */
case 181:
if (ndx == 0 || ndx == 1)
@@ -11006,14 +10991,11 @@ systrace_return_setargdesc(int sysnum, i
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#if defined(NTP) || !defined(_KERNEL_OPT)
/* netbsd32_ntp_gettime */
case 393:
if (ndx == 0 || ndx == 1)
p = "int";
break;
-#else
-#endif
/* netbsd32___socket30 */
case 394:
if (ndx == 0 || ndx == 1)
