git: e07d37c7056a - main - sysent: regen
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 19 Mar 2024 23:16:01 UTC
The branch main has been updated by brooks:
URL: https://cgit.FreeBSD.org/src/commit/?id=e07d37c7056a549ce1ed5dd0dfdbeadfe1b82605
commit e07d37c7056a549ce1ed5dd0dfdbeadfe1b82605
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2024-03-19 22:04:37 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2024-03-19 23:13:27 +0000
sysent: regen
---
sys/compat/freebsd32/freebsd32_proto.h | 12 ++--
sys/compat/freebsd32/freebsd32_systrace_args.c | 76 ++++++++++++------------
sys/kern/systrace_args.c | 80 +++++++++++++-------------
sys/sys/sysproto.h | 40 ++++++-------
4 files changed, 104 insertions(+), 104 deletions(-)
diff --git a/sys/compat/freebsd32/freebsd32_proto.h b/sys/compat/freebsd32/freebsd32_proto.h
index c2d3a700eb6d..c56a5b55f06c 100644
--- a/sys/compat/freebsd32/freebsd32_proto.h
+++ b/sys/compat/freebsd32/freebsd32_proto.h
@@ -89,7 +89,7 @@ struct freebsd32_getitimer_args {
struct freebsd32_fcntl_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
- char arg_l_[PADL_(int32_t)]; int32_t arg; char arg_r_[PADR_(int32_t)];
+ char arg_l_[PADL_(intptr_t)]; intptr_t arg; char arg_r_[PADR_(intptr_t)];
};
struct freebsd32_select_args {
char nd_l_[PADL_(int)]; int nd; char nd_r_[PADR_(int)];
@@ -108,12 +108,12 @@ struct freebsd32_getrusage_args {
};
struct freebsd32_readv_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
- char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)];
+ char iovp_l_[PADL_(const struct iovec32 *)]; const struct iovec32 * iovp; char iovp_r_[PADR_(const struct iovec32 *)];
char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)];
};
struct freebsd32_writev_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
- char iovp_l_[PADL_(struct iovec32 *)]; struct iovec32 * iovp; char iovp_r_[PADR_(struct iovec32 *)];
+ char iovp_l_[PADL_(const struct iovec32 *)]; const struct iovec32 * iovp; char iovp_r_[PADR_(const struct iovec32 *)];
char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)];
};
struct freebsd32_settimeofday_args {
@@ -294,12 +294,12 @@ struct freebsd32_jail_args {
};
struct freebsd32_sigtimedwait_args {
char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)];
- char info_l_[PADL_(struct siginfo32 *)]; struct siginfo32 * info; char info_r_[PADR_(struct siginfo32 *)];
+ char info_l_[PADL_(struct __siginfo32 *)]; struct __siginfo32 * info; char info_r_[PADR_(struct __siginfo32 *)];
char timeout_l_[PADL_(const struct timespec32 *)]; const struct timespec32 * timeout; char timeout_r_[PADR_(const struct timespec32 *)];
};
struct freebsd32_sigwaitinfo_args {
char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)];
- char info_l_[PADL_(struct siginfo32 *)]; struct siginfo32 * info; char info_r_[PADR_(struct siginfo32 *)];
+ char info_l_[PADL_(struct __siginfo32 *)]; struct __siginfo32 * info; char info_r_[PADR_(struct __siginfo32 *)];
};
struct freebsd32_aio_waitcomplete_args {
char aiocbp_l_[PADL_(uint32_t *)]; uint32_t * aiocbp; char aiocbp_r_[PADR_(uint32_t *)];
@@ -574,7 +574,7 @@ struct freebsd32_wait6_args {
char status_l_[PADL_(int *)]; int * status; char status_r_[PADR_(int *)];
char options_l_[PADL_(int)]; int options; char options_r_[PADR_(int)];
char wrusage_l_[PADL_(struct __wrusage32 *)]; struct __wrusage32 * wrusage; char wrusage_r_[PADR_(struct __wrusage32 *)];
- char info_l_[PADL_(struct siginfo32 *)]; struct siginfo32 * info; char info_r_[PADR_(struct siginfo32 *)];
+ char info_l_[PADL_(struct __siginfo32 *)]; struct __siginfo32 * info; char info_r_[PADR_(struct __siginfo32 *)];
};
struct freebsd32_cap_ioctls_limit_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c
index f2617872a952..bfcf9a46b485 100644
--- a/sys/compat/freebsd32/freebsd32_systrace_args.c
+++ b/sys/compat/freebsd32/freebsd32_systrace_args.c
@@ -527,7 +527,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
struct freebsd32_fcntl_args *p = params;
iarg[a++] = p->fd; /* int */
iarg[a++] = p->cmd; /* int */
- iarg[a++] = p->arg; /* int32_t */
+ uarg[a++] = (intptr_t)p->arg; /* intptr_t */
*n_args = 3;
break;
}
@@ -643,7 +643,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 120: {
struct freebsd32_readv_args *p = params;
iarg[a++] = p->fd; /* int */
- uarg[a++] = (intptr_t)p->iovp; /* struct iovec32 * */
+ uarg[a++] = (intptr_t)p->iovp; /* const struct iovec32 * */
uarg[a++] = p->iovcnt; /* u_int */
*n_args = 3;
break;
@@ -652,7 +652,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 121: {
struct freebsd32_writev_args *p = params;
iarg[a++] = p->fd; /* int */
- uarg[a++] = (intptr_t)p->iovp; /* struct iovec32 * */
+ uarg[a++] = (intptr_t)p->iovp; /* const struct iovec32 * */
uarg[a++] = p->iovcnt; /* u_int */
*n_args = 3;
break;
@@ -1583,7 +1583,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 345: {
struct freebsd32_sigtimedwait_args *p = params;
uarg[a++] = (intptr_t)p->set; /* const sigset_t * */
- uarg[a++] = (intptr_t)p->info; /* struct siginfo32 * */
+ uarg[a++] = (intptr_t)p->info; /* struct __siginfo32 * */
uarg[a++] = (intptr_t)p->timeout; /* const struct timespec32 * */
*n_args = 3;
break;
@@ -1592,7 +1592,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 346: {
struct freebsd32_sigwaitinfo_args *p = params;
uarg[a++] = (intptr_t)p->set; /* const sigset_t * */
- uarg[a++] = (intptr_t)p->info; /* struct siginfo32 * */
+ uarg[a++] = (intptr_t)p->info; /* struct __siginfo32 * */
*n_args = 2;
break;
}
@@ -1600,7 +1600,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 347: {
struct __acl_get_file_args *p = params;
uarg[a++] = (intptr_t)p->path; /* const char * */
- iarg[a++] = p->type; /* acl_type_t */
+ iarg[a++] = p->type; /* __acl_type_t */
uarg[a++] = (intptr_t)p->aclp; /* struct acl * */
*n_args = 3;
break;
@@ -1609,7 +1609,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 348: {
struct __acl_set_file_args *p = params;
uarg[a++] = (intptr_t)p->path; /* const char * */
- iarg[a++] = p->type; /* acl_type_t */
+ iarg[a++] = p->type; /* __acl_type_t */
uarg[a++] = (intptr_t)p->aclp; /* struct acl * */
*n_args = 3;
break;
@@ -1618,7 +1618,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 349: {
struct __acl_get_fd_args *p = params;
iarg[a++] = p->filedes; /* int */
- iarg[a++] = p->type; /* acl_type_t */
+ iarg[a++] = p->type; /* __acl_type_t */
uarg[a++] = (intptr_t)p->aclp; /* struct acl * */
*n_args = 3;
break;
@@ -1627,7 +1627,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 350: {
struct __acl_set_fd_args *p = params;
iarg[a++] = p->filedes; /* int */
- iarg[a++] = p->type; /* acl_type_t */
+ iarg[a++] = p->type; /* __acl_type_t */
uarg[a++] = (intptr_t)p->aclp; /* struct acl * */
*n_args = 3;
break;
@@ -1636,7 +1636,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 351: {
struct __acl_delete_file_args *p = params;
uarg[a++] = (intptr_t)p->path; /* const char * */
- iarg[a++] = p->type; /* acl_type_t */
+ iarg[a++] = p->type; /* __acl_type_t */
*n_args = 2;
break;
}
@@ -1644,7 +1644,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 352: {
struct __acl_delete_fd_args *p = params;
iarg[a++] = p->filedes; /* int */
- iarg[a++] = p->type; /* acl_type_t */
+ iarg[a++] = p->type; /* __acl_type_t */
*n_args = 2;
break;
}
@@ -1652,7 +1652,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 353: {
struct __acl_aclcheck_file_args *p = params;
uarg[a++] = (intptr_t)p->path; /* const char * */
- iarg[a++] = p->type; /* acl_type_t */
+ iarg[a++] = p->type; /* __acl_type_t */
uarg[a++] = (intptr_t)p->aclp; /* struct acl * */
*n_args = 3;
break;
@@ -1661,7 +1661,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 354: {
struct __acl_aclcheck_fd_args *p = params;
iarg[a++] = p->filedes; /* int */
- iarg[a++] = p->type; /* acl_type_t */
+ iarg[a++] = p->type; /* __acl_type_t */
uarg[a++] = (intptr_t)p->aclp; /* struct acl * */
*n_args = 3;
break;
@@ -1985,7 +1985,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 425: {
struct __acl_get_link_args *p = params;
uarg[a++] = (intptr_t)p->path; /* const char * */
- iarg[a++] = p->type; /* acl_type_t */
+ iarg[a++] = p->type; /* __acl_type_t */
uarg[a++] = (intptr_t)p->aclp; /* struct acl * */
*n_args = 3;
break;
@@ -1994,7 +1994,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 426: {
struct __acl_set_link_args *p = params;
uarg[a++] = (intptr_t)p->path; /* const char * */
- iarg[a++] = p->type; /* acl_type_t */
+ iarg[a++] = p->type; /* __acl_type_t */
uarg[a++] = (intptr_t)p->aclp; /* struct acl * */
*n_args = 3;
break;
@@ -2003,7 +2003,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 427: {
struct __acl_delete_link_args *p = params;
uarg[a++] = (intptr_t)p->path; /* const char * */
- iarg[a++] = p->type; /* acl_type_t */
+ iarg[a++] = p->type; /* __acl_type_t */
*n_args = 2;
break;
}
@@ -2011,7 +2011,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 428: {
struct __acl_aclcheck_link_args *p = params;
uarg[a++] = (intptr_t)p->path; /* const char * */
- iarg[a++] = p->type; /* acl_type_t */
+ iarg[a++] = p->type; /* __acl_type_t */
uarg[a++] = (intptr_t)p->aclp; /* struct acl * */
*n_args = 3;
break;
@@ -2862,7 +2862,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
uarg[a++] = (intptr_t)p->status; /* int * */
iarg[a++] = p->options; /* int */
uarg[a++] = (intptr_t)p->wrusage; /* struct __wrusage32 * */
- uarg[a++] = (intptr_t)p->info; /* struct siginfo32 * */
+ uarg[a++] = (intptr_t)p->info; /* struct __siginfo32 * */
*n_args = 8;
break;
}
@@ -3236,7 +3236,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 573: {
struct sigfastblock_args *p = params;
iarg[a++] = p->cmd; /* int */
- uarg[a++] = (intptr_t)p->ptr; /* uint32_t * */
+ uarg[a++] = (intptr_t)p->ptr; /* void * */
*n_args = 2;
break;
}
@@ -4174,7 +4174,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "int";
break;
case 2:
- p = "int32_t";
+ p = "intptr_t";
break;
default:
break;
@@ -4379,7 +4379,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "int";
break;
case 1:
- p = "userland struct iovec32 *";
+ p = "userland const struct iovec32 *";
break;
case 2:
p = "u_int";
@@ -4395,7 +4395,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "int";
break;
case 1:
- p = "userland struct iovec32 *";
+ p = "userland const struct iovec32 *";
break;
case 2:
p = "u_int";
@@ -5865,7 +5865,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland const sigset_t *";
break;
case 1:
- p = "userland struct siginfo32 *";
+ p = "userland struct __siginfo32 *";
break;
case 2:
p = "userland const struct timespec32 *";
@@ -5881,7 +5881,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland const sigset_t *";
break;
case 1:
- p = "userland struct siginfo32 *";
+ p = "userland struct __siginfo32 *";
break;
default:
break;
@@ -5894,7 +5894,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland const char *";
break;
case 1:
- p = "acl_type_t";
+ p = "__acl_type_t";
break;
case 2:
p = "userland struct acl *";
@@ -5910,7 +5910,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland const char *";
break;
case 1:
- p = "acl_type_t";
+ p = "__acl_type_t";
break;
case 2:
p = "userland struct acl *";
@@ -5926,7 +5926,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "int";
break;
case 1:
- p = "acl_type_t";
+ p = "__acl_type_t";
break;
case 2:
p = "userland struct acl *";
@@ -5942,7 +5942,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "int";
break;
case 1:
- p = "acl_type_t";
+ p = "__acl_type_t";
break;
case 2:
p = "userland struct acl *";
@@ -5958,7 +5958,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland const char *";
break;
case 1:
- p = "acl_type_t";
+ p = "__acl_type_t";
break;
default:
break;
@@ -5971,7 +5971,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "int";
break;
case 1:
- p = "acl_type_t";
+ p = "__acl_type_t";
break;
default:
break;
@@ -5984,7 +5984,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland const char *";
break;
case 1:
- p = "acl_type_t";
+ p = "__acl_type_t";
break;
case 2:
p = "userland struct acl *";
@@ -6000,7 +6000,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "int";
break;
case 1:
- p = "acl_type_t";
+ p = "__acl_type_t";
break;
case 2:
p = "userland struct acl *";
@@ -6564,7 +6564,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland const char *";
break;
case 1:
- p = "acl_type_t";
+ p = "__acl_type_t";
break;
case 2:
p = "userland struct acl *";
@@ -6580,7 +6580,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland const char *";
break;
case 1:
- p = "acl_type_t";
+ p = "__acl_type_t";
break;
case 2:
p = "userland struct acl *";
@@ -6596,7 +6596,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland const char *";
break;
case 1:
- p = "acl_type_t";
+ p = "__acl_type_t";
break;
default:
break;
@@ -6609,7 +6609,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland const char *";
break;
case 1:
- p = "acl_type_t";
+ p = "__acl_type_t";
break;
case 2:
p = "userland struct acl *";
@@ -8179,7 +8179,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland struct __wrusage32 *";
break;
case 7 - _P_:
- p = "userland struct siginfo32 *";
+ p = "userland struct __siginfo32 *";
break;
default:
break;
@@ -8876,7 +8876,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "int";
break;
case 1:
- p = "userland uint32_t *";
+ p = "userland void *";
break;
default:
break;
diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c
index a7320cbe9377..59152b25177c 100644
--- a/sys/kern/systrace_args.c
+++ b/sys/kern/systrace_args.c
@@ -524,7 +524,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
struct fcntl_args *p = params;
iarg[a++] = p->fd; /* int */
iarg[a++] = p->cmd; /* int */
- iarg[a++] = p->arg; /* long */
+ uarg[a++] = (intptr_t)p->arg; /* intptr_t */
*n_args = 3;
break;
}
@@ -640,7 +640,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 120: {
struct readv_args *p = params;
iarg[a++] = p->fd; /* int */
- uarg[a++] = (intptr_t)p->iovp; /* struct iovec * */
+ uarg[a++] = (intptr_t)p->iovp; /* const struct iovec * */
uarg[a++] = p->iovcnt; /* u_int */
*n_args = 3;
break;
@@ -649,7 +649,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 121: {
struct writev_args *p = params;
iarg[a++] = p->fd; /* int */
- uarg[a++] = (intptr_t)p->iovp; /* struct iovec * */
+ uarg[a++] = (intptr_t)p->iovp; /* const struct iovec * */
uarg[a++] = p->iovcnt; /* u_int */
*n_args = 3;
break;
@@ -1457,7 +1457,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
/* aio_suspend */
case 315: {
struct aio_suspend_args *p = params;
- uarg[a++] = (intptr_t)p->aiocbp; /* struct aiocb * const * */
+ uarg[a++] = (intptr_t)p->aiocbp; /* const struct aiocb * const * */
iarg[a++] = p->nent; /* int */
uarg[a++] = (intptr_t)p->timeout; /* const struct timespec * */
*n_args = 3;
@@ -1624,7 +1624,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 345: {
struct sigtimedwait_args *p = params;
uarg[a++] = (intptr_t)p->set; /* const sigset_t * */
- uarg[a++] = (intptr_t)p->info; /* struct siginfo * */
+ uarg[a++] = (intptr_t)p->info; /* struct __siginfo * */
uarg[a++] = (intptr_t)p->timeout; /* const struct timespec * */
*n_args = 3;
break;
@@ -1633,7 +1633,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 346: {
struct sigwaitinfo_args *p = params;
uarg[a++] = (intptr_t)p->set; /* const sigset_t * */
- uarg[a++] = (intptr_t)p->info; /* struct siginfo * */
+ uarg[a++] = (intptr_t)p->info; /* struct __siginfo * */
*n_args = 2;
break;
}
@@ -1641,7 +1641,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 347: {
struct __acl_get_file_args *p = params;
uarg[a++] = (intptr_t)p->path; /* const char * */
- iarg[a++] = p->type; /* acl_type_t */
+ iarg[a++] = p->type; /* __acl_type_t */
uarg[a++] = (intptr_t)p->aclp; /* struct acl * */
*n_args = 3;
break;
@@ -1650,7 +1650,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 348: {
struct __acl_set_file_args *p = params;
uarg[a++] = (intptr_t)p->path; /* const char * */
- iarg[a++] = p->type; /* acl_type_t */
+ iarg[a++] = p->type; /* __acl_type_t */
uarg[a++] = (intptr_t)p->aclp; /* struct acl * */
*n_args = 3;
break;
@@ -1659,7 +1659,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 349: {
struct __acl_get_fd_args *p = params;
iarg[a++] = p->filedes; /* int */
- iarg[a++] = p->type; /* acl_type_t */
+ iarg[a++] = p->type; /* __acl_type_t */
uarg[a++] = (intptr_t)p->aclp; /* struct acl * */
*n_args = 3;
break;
@@ -1668,7 +1668,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 350: {
struct __acl_set_fd_args *p = params;
iarg[a++] = p->filedes; /* int */
- iarg[a++] = p->type; /* acl_type_t */
+ iarg[a++] = p->type; /* __acl_type_t */
uarg[a++] = (intptr_t)p->aclp; /* struct acl * */
*n_args = 3;
break;
@@ -1677,7 +1677,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 351: {
struct __acl_delete_file_args *p = params;
uarg[a++] = (intptr_t)p->path; /* const char * */
- iarg[a++] = p->type; /* acl_type_t */
+ iarg[a++] = p->type; /* __acl_type_t */
*n_args = 2;
break;
}
@@ -1685,7 +1685,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 352: {
struct __acl_delete_fd_args *p = params;
iarg[a++] = p->filedes; /* int */
- iarg[a++] = p->type; /* acl_type_t */
+ iarg[a++] = p->type; /* __acl_type_t */
*n_args = 2;
break;
}
@@ -1693,7 +1693,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 353: {
struct __acl_aclcheck_file_args *p = params;
uarg[a++] = (intptr_t)p->path; /* const char * */
- iarg[a++] = p->type; /* acl_type_t */
+ iarg[a++] = p->type; /* __acl_type_t */
uarg[a++] = (intptr_t)p->aclp; /* struct acl * */
*n_args = 3;
break;
@@ -1702,7 +1702,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 354: {
struct __acl_aclcheck_fd_args *p = params;
iarg[a++] = p->filedes; /* int */
- iarg[a++] = p->type; /* acl_type_t */
+ iarg[a++] = p->type; /* __acl_type_t */
uarg[a++] = (intptr_t)p->aclp; /* struct acl * */
*n_args = 3;
break;
@@ -2118,7 +2118,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 425: {
struct __acl_get_link_args *p = params;
uarg[a++] = (intptr_t)p->path; /* const char * */
- iarg[a++] = p->type; /* acl_type_t */
+ iarg[a++] = p->type; /* __acl_type_t */
uarg[a++] = (intptr_t)p->aclp; /* struct acl * */
*n_args = 3;
break;
@@ -2127,7 +2127,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 426: {
struct __acl_set_link_args *p = params;
uarg[a++] = (intptr_t)p->path; /* const char * */
- iarg[a++] = p->type; /* acl_type_t */
+ iarg[a++] = p->type; /* __acl_type_t */
uarg[a++] = (intptr_t)p->aclp; /* struct acl * */
*n_args = 3;
break;
@@ -2136,7 +2136,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 427: {
struct __acl_delete_link_args *p = params;
uarg[a++] = (intptr_t)p->path; /* const char * */
- iarg[a++] = p->type; /* acl_type_t */
+ iarg[a++] = p->type; /* __acl_type_t */
*n_args = 2;
break;
}
@@ -2144,7 +2144,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 428: {
struct __acl_aclcheck_link_args *p = params;
uarg[a++] = (intptr_t)p->path; /* const char * */
- iarg[a++] = p->type; /* acl_type_t */
+ iarg[a++] = p->type; /* __acl_type_t */
uarg[a++] = (intptr_t)p->aclp; /* struct acl * */
*n_args = 3;
break;
@@ -2959,7 +2959,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
uarg[a++] = (intptr_t)p->status; /* int * */
iarg[a++] = p->options; /* int */
uarg[a++] = (intptr_t)p->wrusage; /* struct __wrusage * */
- uarg[a++] = (intptr_t)p->info; /* struct siginfo * */
+ uarg[a++] = (intptr_t)p->info; /* struct __siginfo * */
*n_args = 6;
break;
}
@@ -3323,7 +3323,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
case 573: {
struct sigfastblock_args *p = params;
iarg[a++] = p->cmd; /* int */
- uarg[a++] = (intptr_t)p->ptr; /* uint32_t * */
+ uarg[a++] = (intptr_t)p->ptr; /* void * */
*n_args = 2;
break;
}
@@ -4261,7 +4261,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "int";
break;
case 2:
- p = "long";
+ p = "intptr_t";
break;
default:
break;
@@ -4466,7 +4466,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "int";
break;
case 1:
- p = "userland struct iovec *";
+ p = "userland const struct iovec *";
break;
case 2:
p = "u_int";
@@ -4482,7 +4482,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "int";
break;
case 1:
- p = "userland struct iovec *";
+ p = "userland const struct iovec *";
break;
case 2:
p = "u_int";
@@ -5760,7 +5760,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 315:
switch (ndx) {
case 0:
- p = "userland struct aiocb * const *";
+ p = "userland const struct aiocb * const *";
break;
case 1:
p = "int";
@@ -6016,7 +6016,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland const sigset_t *";
break;
case 1:
- p = "userland struct siginfo *";
+ p = "userland struct __siginfo *";
break;
case 2:
p = "userland const struct timespec *";
@@ -6032,7 +6032,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland const sigset_t *";
break;
case 1:
- p = "userland struct siginfo *";
+ p = "userland struct __siginfo *";
break;
default:
break;
@@ -6045,7 +6045,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland const char *";
break;
case 1:
- p = "acl_type_t";
+ p = "__acl_type_t";
break;
case 2:
p = "userland struct acl *";
@@ -6061,7 +6061,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland const char *";
break;
case 1:
- p = "acl_type_t";
+ p = "__acl_type_t";
break;
case 2:
p = "userland struct acl *";
@@ -6077,7 +6077,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "int";
break;
case 1:
- p = "acl_type_t";
+ p = "__acl_type_t";
break;
case 2:
p = "userland struct acl *";
@@ -6093,7 +6093,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "int";
break;
case 1:
- p = "acl_type_t";
+ p = "__acl_type_t";
break;
case 2:
p = "userland struct acl *";
@@ -6109,7 +6109,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland const char *";
break;
case 1:
- p = "acl_type_t";
+ p = "__acl_type_t";
break;
default:
break;
@@ -6122,7 +6122,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "int";
break;
case 1:
- p = "acl_type_t";
+ p = "__acl_type_t";
break;
default:
break;
@@ -6135,7 +6135,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland const char *";
break;
case 1:
- p = "acl_type_t";
+ p = "__acl_type_t";
break;
case 2:
p = "userland struct acl *";
@@ -6151,7 +6151,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "int";
break;
case 1:
- p = "acl_type_t";
+ p = "__acl_type_t";
break;
case 2:
p = "userland struct acl *";
@@ -6870,7 +6870,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland const char *";
break;
case 1:
- p = "acl_type_t";
+ p = "__acl_type_t";
break;
case 2:
p = "userland struct acl *";
@@ -6886,7 +6886,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland const char *";
break;
case 1:
- p = "acl_type_t";
+ p = "__acl_type_t";
break;
case 2:
p = "userland struct acl *";
@@ -6902,7 +6902,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland const char *";
break;
case 1:
- p = "acl_type_t";
+ p = "__acl_type_t";
break;
default:
break;
@@ -6915,7 +6915,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland const char *";
break;
case 1:
- p = "acl_type_t";
+ p = "__acl_type_t";
break;
case 2:
p = "userland struct acl *";
@@ -8358,7 +8358,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "userland struct __wrusage *";
break;
case 5:
- p = "userland struct siginfo *";
+ p = "userland struct __siginfo *";
break;
default:
break;
@@ -9021,7 +9021,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "int";
break;
case 1:
- p = "userland uint32_t *";
+ p = "userland void *";
break;
default:
break;
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index afec9d186a7a..3d4c30a89a82 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -313,7 +313,7 @@ struct dup2_args {
struct fcntl_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
- char arg_l_[PADL_(long)]; long arg; char arg_r_[PADR_(long)];
+ char arg_l_[PADL_(intptr_t)]; intptr_t arg; char arg_r_[PADR_(intptr_t)];
};
struct select_args {
char nd_l_[PADL_(int)]; int nd; char nd_r_[PADR_(int)];
@@ -377,12 +377,12 @@ struct getsockopt_args {
};
struct readv_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
- char iovp_l_[PADL_(struct iovec *)]; struct iovec * iovp; char iovp_r_[PADR_(struct iovec *)];
+ char iovp_l_[PADL_(const struct iovec *)]; const struct iovec * iovp; char iovp_r_[PADR_(const struct iovec *)];
char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)];
};
struct writev_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
- char iovp_l_[PADL_(struct iovec *)]; struct iovec * iovp; char iovp_r_[PADR_(struct iovec *)];
+ char iovp_l_[PADL_(const struct iovec *)]; const struct iovec * iovp; char iovp_r_[PADR_(const struct iovec *)];
char iovcnt_l_[PADL_(u_int)]; u_int iovcnt; char iovcnt_r_[PADR_(u_int)];
};
struct settimeofday_args {
@@ -777,7 +777,7 @@ struct aio_return_args {
char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char aiocbp_r_[PADR_(struct aiocb *)];
};
struct aio_suspend_args {
- char aiocbp_l_[PADL_(struct aiocb * const *)]; struct aiocb * const * aiocbp; char aiocbp_r_[PADR_(struct aiocb * const *)];
+ char aiocbp_l_[PADL_(const struct aiocb * const *)]; const struct aiocb * const * aiocbp; char aiocbp_r_[PADR_(const struct aiocb * const *)];
char nent_l_[PADL_(int)]; int nent; char nent_r_[PADR_(int)];
char timeout_l_[PADL_(const struct timespec *)]; const struct timespec * timeout; char timeout_r_[PADR_(const struct timespec *)];
};
@@ -862,49 +862,49 @@ struct sigpending_args {
};
struct sigtimedwait_args {
char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)];
- char info_l_[PADL_(struct siginfo *)]; struct siginfo * info; char info_r_[PADR_(struct siginfo *)];
+ char info_l_[PADL_(struct __siginfo *)]; struct __siginfo * info; char info_r_[PADR_(struct __siginfo *)];
char timeout_l_[PADL_(const struct timespec *)]; const struct timespec * timeout; char timeout_r_[PADR_(const struct timespec *)];
};
struct sigwaitinfo_args {
char set_l_[PADL_(const sigset_t *)]; const sigset_t * set; char set_r_[PADR_(const sigset_t *)];
- char info_l_[PADL_(struct siginfo *)]; struct siginfo * info; char info_r_[PADR_(struct siginfo *)];
+ char info_l_[PADL_(struct __siginfo *)]; struct __siginfo * info; char info_r_[PADR_(struct __siginfo *)];
};
struct __acl_get_file_args {
char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
- char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)];
+ char type_l_[PADL_(__acl_type_t)]; __acl_type_t type; char type_r_[PADR_(__acl_type_t)];
char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)];
};
struct __acl_set_file_args {
char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
- char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)];
+ char type_l_[PADL_(__acl_type_t)]; __acl_type_t type; char type_r_[PADR_(__acl_type_t)];
char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)];
};
struct __acl_get_fd_args {
char filedes_l_[PADL_(int)]; int filedes; char filedes_r_[PADR_(int)];
- char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)];
+ char type_l_[PADL_(__acl_type_t)]; __acl_type_t type; char type_r_[PADR_(__acl_type_t)];
char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)];
};
struct __acl_set_fd_args {
char filedes_l_[PADL_(int)]; int filedes; char filedes_r_[PADR_(int)];
- char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)];
+ char type_l_[PADL_(__acl_type_t)]; __acl_type_t type; char type_r_[PADR_(__acl_type_t)];
char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)];
};
struct __acl_delete_file_args {
char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
- char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)];
+ char type_l_[PADL_(__acl_type_t)]; __acl_type_t type; char type_r_[PADR_(__acl_type_t)];
};
struct __acl_delete_fd_args {
char filedes_l_[PADL_(int)]; int filedes; char filedes_r_[PADR_(int)];
- char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)];
+ char type_l_[PADL_(__acl_type_t)]; __acl_type_t type; char type_r_[PADR_(__acl_type_t)];
};
struct __acl_aclcheck_file_args {
char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
- char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)];
+ char type_l_[PADL_(__acl_type_t)]; __acl_type_t type; char type_r_[PADR_(__acl_type_t)];
char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)];
};
struct __acl_aclcheck_fd_args {
char filedes_l_[PADL_(int)]; int filedes; char filedes_r_[PADR_(int)];
- char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)];
+ char type_l_[PADL_(__acl_type_t)]; __acl_type_t type; char type_r_[PADR_(__acl_type_t)];
char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)];
};
struct extattrctl_args {
@@ -1130,21 +1130,21 @@ struct swapcontext_args {
};
struct __acl_get_link_args {
char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
- char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)];
+ char type_l_[PADL_(__acl_type_t)]; __acl_type_t type; char type_r_[PADR_(__acl_type_t)];
char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)];
};
struct __acl_set_link_args {
char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
- char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)];
+ char type_l_[PADL_(__acl_type_t)]; __acl_type_t type; char type_r_[PADR_(__acl_type_t)];
char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)];
};
struct __acl_delete_link_args {
char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
- char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)];
+ char type_l_[PADL_(__acl_type_t)]; __acl_type_t type; char type_r_[PADR_(__acl_type_t)];
};
struct __acl_aclcheck_link_args {
char path_l_[PADL_(const char *)]; const char * path; char path_r_[PADR_(const char *)];
- char type_l_[PADL_(acl_type_t)]; acl_type_t type; char type_r_[PADR_(acl_type_t)];
+ char type_l_[PADL_(__acl_type_t)]; __acl_type_t type; char type_r_[PADR_(__acl_type_t)];
char aclp_l_[PADL_(struct acl *)]; struct acl * aclp; char aclp_r_[PADR_(struct acl *)];
};
struct sigwait_args {
@@ -1597,7 +1597,7 @@ struct wait6_args {
char status_l_[PADL_(int *)]; int * status; char status_r_[PADR_(int *)];
char options_l_[PADL_(int)]; int options; char options_r_[PADR_(int)];
char wrusage_l_[PADL_(struct __wrusage *)]; struct __wrusage * wrusage; char wrusage_r_[PADR_(struct __wrusage *)];
- char info_l_[PADL_(struct siginfo *)]; struct siginfo * info; char info_r_[PADR_(struct siginfo *)];
+ char info_l_[PADL_(struct __siginfo *)]; struct __siginfo * info; char info_r_[PADR_(struct __siginfo *)];
};
struct cap_rights_limit_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];
@@ -1805,7 +1805,7 @@ struct shm_rename_args {
};
struct sigfastblock_args {
char cmd_l_[PADL_(int)]; int cmd; char cmd_r_[PADR_(int)];
- char ptr_l_[PADL_(uint32_t *)]; uint32_t * ptr; char ptr_r_[PADR_(uint32_t *)];
+ char ptr_l_[PADL_(void *)]; void * ptr; char ptr_r_[PADR_(void *)];
};
struct __realpathat_args {
char fd_l_[PADL_(int)]; int fd; char fd_r_[PADR_(int)];