The branch main has been updated by asomers:
URL:
https://cgit.FreeBSD.org/src/commit/?id=20321e622515aec35becb7de71ebe65021fd45b4
commit 20321e622515aec35becb7de71ebe65021fd45b4
Author: Alan Somers <asom...@freebsd.org>
AuthorDate: 2021-01-05 23:31:35 +0000
Commit: Alan Somers <asom...@freebsd.org>
CommitDate: 2021-01-08 02:50:32 +0000
Regenerate syscall files after reallocation of aio_writev/aio_readv
---
sys/compat/freebsd32/freebsd32_proto.h | 20 +++---
sys/compat/freebsd32/freebsd32_syscall.h | 6 +-
sys/compat/freebsd32/freebsd32_syscalls.c | 6 +-
sys/compat/freebsd32/freebsd32_sysent.c | 6 +-
sys/compat/freebsd32/freebsd32_systrace_args.c | 88 +++++++++++++-------------
sys/kern/init_sysent.c | 6 +-
sys/kern/syscalls.c | 6 +-
sys/kern/systrace_args.c | 88 +++++++++++++-------------
sys/sys/syscall.h | 6 +-
sys/sys/syscall.mk | 6 +-
sys/sys/sysproto.h | 20 +++---
11 files changed, 133 insertions(+), 125 deletions(-)
diff --git a/sys/compat/freebsd32/freebsd32_proto.h
b/sys/compat/freebsd32/freebsd32_proto.h
index 148f58050117..14a2fe794c94 100644
--- a/sys/compat/freebsd32/freebsd32_proto.h
+++ b/sys/compat/freebsd32/freebsd32_proto.h
@@ -251,12 +251,6 @@ struct freebsd32_lio_listio_args {
char nent_l_[PADL_(int)]; int nent; char nent_r_[PADR_(int)];
char sig_l_[PADL_(struct sigevent32 *)]; struct sigevent32 * sig; char
sig_r_[PADR_(struct sigevent32 *)];
};
-struct freebsd32_aio_writev_args {
- char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char
aiocbp_r_[PADR_(struct aiocb32 *)];
-};
-struct freebsd32_aio_readv_args {
- char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char
aiocbp_r_[PADR_(struct aiocb32 *)];
-};
struct freebsd32_lutimes_args {
char path_l_[PADL_(const char *)]; const char * path; char
path_r_[PADR_(const char *)];
char tptr_l_[PADL_(struct timeval32 *)]; struct timeval32 * tptr; char
tptr_r_[PADR_(struct timeval32 *)];
@@ -751,6 +745,12 @@ struct freebsd32___sysctlbyname_args {
char new_l_[PADL_(void *)]; void * new; char new_r_[PADR_(void *)];
char newlen_l_[PADL_(size_t)]; size_t newlen; char
newlen_r_[PADR_(size_t)];
};
+struct freebsd32_aio_writev_args {
+ char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char
aiocbp_r_[PADR_(struct aiocb32 *)];
+};
+struct freebsd32_aio_readv_args {
+ char aiocbp_l_[PADL_(struct aiocb32 *)]; struct aiocb32 * aiocbp; char
aiocbp_r_[PADR_(struct aiocb32 *)];
+};
#if !defined(PAD64_REQUIRED) && !defined(__amd64__)
#define PAD64_REQUIRED
#endif
@@ -795,8 +795,6 @@ int freebsd32_clock_getcpuclockid2(struct thread *, struct
freebsd32_clock_getcp
int freebsd32_aio_read(struct thread *, struct freebsd32_aio_read_args *);
int freebsd32_aio_write(struct thread *, struct freebsd32_aio_write_args *);
int freebsd32_lio_listio(struct thread *, struct freebsd32_lio_listio_args
*);
-int freebsd32_aio_writev(struct thread *, struct freebsd32_aio_writev_args
*);
-int freebsd32_aio_readv(struct thread *, struct freebsd32_aio_readv_args *);
int freebsd32_lutimes(struct thread *, struct freebsd32_lutimes_args *);
int freebsd32_preadv(struct thread *, struct freebsd32_preadv_args *);
int freebsd32_pwritev(struct thread *, struct freebsd32_pwritev_args *);
@@ -893,6 +891,8 @@ int freebsd32_kevent(struct thread *, struct
freebsd32_kevent_args *);
int freebsd32_cpuset_getdomain(struct thread *, struct
freebsd32_cpuset_getdomain_args *);
int freebsd32_cpuset_setdomain(struct thread *, struct
freebsd32_cpuset_setdomain_args *);
int freebsd32___sysctlbyname(struct thread *, struct
freebsd32___sysctlbyname_args *);
+int freebsd32_aio_writev(struct thread *, struct freebsd32_aio_writev_args
*);
+int freebsd32_aio_readv(struct thread *, struct freebsd32_aio_readv_args *);
#ifdef COMPAT_43
@@ -1382,8 +1382,6 @@ int freebsd11_freebsd32_fstatat(struct thread *,
struct freebsd11_freebsd32_fsta
#define FREEBSD32_SYS_AUE_freebsd32_aio_read AUE_AIO_READ
#define FREEBSD32_SYS_AUE_freebsd32_aio_write AUE_AIO_WRITE
#define FREEBSD32_SYS_AUE_freebsd32_lio_listio AUE_LIO_LISTIO
-#define FREEBSD32_SYS_AUE_freebsd32_aio_writev AUE_AIO_WRITEV
-#define FREEBSD32_SYS_AUE_freebsd32_aio_readv AUE_AIO_READV
#define FREEBSD32_SYS_AUE_freebsd11_freebsd32_getdents AUE_O_GETDENTS
#define FREEBSD32_SYS_AUE_freebsd32_lutimes AUE_LUTIMES
#define FREEBSD32_SYS_AUE_freebsd32_preadv AUE_PREADV
@@ -1476,6 +1474,8 @@ int freebsd11_freebsd32_fstatat(struct thread *,
struct freebsd11_freebsd32_fsta
#define FREEBSD32_SYS_AUE_freebsd32_cpuset_getdomain AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_cpuset_setdomain AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32___sysctlbyname AUE_SYSCTL
+#define FREEBSD32_SYS_AUE_freebsd32_aio_writev AUE_AIO_WRITEV
+#define FREEBSD32_SYS_AUE_freebsd32_aio_readv AUE_AIO_READV
#undef PAD_
#undef PADL_
diff --git a/sys/compat/freebsd32/freebsd32_syscall.h
b/sys/compat/freebsd32/freebsd32_syscall.h
index edb68b36096e..eea7e2f56968 100644
--- a/sys/compat/freebsd32/freebsd32_syscall.h
+++ b/sys/compat/freebsd32/freebsd32_syscall.h
@@ -229,8 +229,6 @@
#define FREEBSD32_SYS_freebsd32_aio_read 255
#define FREEBSD32_SYS_freebsd32_aio_write 256
#define FREEBSD32_SYS_freebsd32_lio_listio 257
-#define FREEBSD32_SYS_freebsd32_aio_writev 258
-#define FREEBSD32_SYS_freebsd32_aio_readv 259
#define FREEBSD32_SYS_freebsd11_freebsd32_getdents 272
#define FREEBSD32_SYS_lchmod 274
/* 275 is obsolete netbsd_lchown */
@@ -506,4 +504,6 @@
#define FREEBSD32_SYS_close_range 575
#define FREEBSD32_SYS_rpctls_syscall 576
#define FREEBSD32_SYS___specialfd 577
-#define FREEBSD32_SYS_MAXSYSCALL 578
+#define FREEBSD32_SYS_freebsd32_aio_writev 578
+#define FREEBSD32_SYS_freebsd32_aio_readv 579
+#define FREEBSD32_SYS_MAXSYSCALL 580
diff --git a/sys/compat/freebsd32/freebsd32_syscalls.c
b/sys/compat/freebsd32/freebsd32_syscalls.c
index ba36bd222f11..0311882f02d0 100644
--- a/sys/compat/freebsd32/freebsd32_syscalls.c
+++ b/sys/compat/freebsd32/freebsd32_syscalls.c
@@ -267,8 +267,8 @@ const char *freebsd32_syscallnames[] = {
"freebsd32_aio_read", /* 255 = freebsd32_aio_read */
"freebsd32_aio_write", /* 256 = freebsd32_aio_write */
"freebsd32_lio_listio", /* 257 = freebsd32_lio_listio */
- "freebsd32_aio_writev", /* 258 = freebsd32_aio_writev */
- "freebsd32_aio_readv", /* 259 = freebsd32_aio_readv */
+ "#258", /* 258 = nosys */
+ "#259", /* 259 = nosys */
"#260", /* 260 = nosys */
"#261", /* 261 = nosys */
"#262", /* 262 = nosys */
@@ -614,4 +614,6 @@ const char *freebsd32_syscallnames[] = {
"close_range", /* 575 = close_range */
"rpctls_syscall", /* 576 = rpctls_syscall */
"__specialfd", /* 577 = __specialfd */
+ "freebsd32_aio_writev", /* 578 = freebsd32_aio_writev */
+ "freebsd32_aio_readv", /* 579 = freebsd32_aio_readv */
};
diff --git a/sys/compat/freebsd32/freebsd32_sysent.c
b/sys/compat/freebsd32/freebsd32_sysent.c
index 91d6e27778d4..bec3a87c820a 100644
--- a/sys/compat/freebsd32/freebsd32_sysent.c
+++ b/sys/compat/freebsd32/freebsd32_sysent.c
@@ -320,8 +320,8 @@ struct sysent freebsd32_sysent[] = {
{ .sy_narg = AS(freebsd32_aio_read_args), .sy_call = (sy_call_t
*)freebsd32_aio_read, .sy_auevent = AUE_AIO_READ, .sy_flags = SYF_CAPENABLED,
.sy_thrcnt = SY_THR_STATIC }, /* 255 = freebsd32_aio_read */
{ .sy_narg = AS(freebsd32_aio_write_args), .sy_call = (sy_call_t
*)freebsd32_aio_write, .sy_auevent = AUE_AIO_WRITE, .sy_flags = SYF_CAPENABLED,
.sy_thrcnt = SY_THR_STATIC }, /* 256 = freebsd32_aio_write */
{ .sy_narg = AS(freebsd32_lio_listio_args), .sy_call = (sy_call_t
*)freebsd32_lio_listio, .sy_auevent = AUE_LIO_LISTIO, .sy_flags =
SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 257 =
freebsd32_lio_listio */
- { .sy_narg = AS(freebsd32_aio_writev_args), .sy_call = (sy_call_t
*)freebsd32_aio_writev, .sy_auevent = AUE_AIO_WRITEV, .sy_flags =
SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 258 =
freebsd32_aio_writev */
- { .sy_narg = AS(freebsd32_aio_readv_args), .sy_call = (sy_call_t
*)freebsd32_aio_readv, .sy_auevent = AUE_AIO_READV, .sy_flags = SYF_CAPENABLED,
.sy_thrcnt = SY_THR_STATIC }, /* 259 = freebsd32_aio_readv */
+ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 258 = nosys
*/
+ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 259 = nosys
*/
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 260 = nosys
*/
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 261 = nosys
*/
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 262 = nosys
*/
@@ -667,4 +667,6 @@ struct sysent freebsd32_sysent[] = {
{ .sy_narg = AS(close_range_args), .sy_call = (sy_call_t
*)sys_close_range, .sy_auevent = AUE_CLOSERANGE, .sy_flags = SYF_CAPENABLED,
.sy_thrcnt = SY_THR_STATIC }, /* 575 = close_range */
{ .sy_narg = AS(rpctls_syscall_args), .sy_call = (sy_call_t
*)lkmressys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT
}, /* 576 = rpctls_syscall */
{ .sy_narg = AS(__specialfd_args), .sy_call = (sy_call_t
*)sys___specialfd, .sy_auevent = AUE_SPECIALFD, .sy_flags = SYF_CAPENABLED,
.sy_thrcnt = SY_THR_STATIC }, /* 577 = __specialfd */
+ { .sy_narg = AS(freebsd32_aio_writev_args), .sy_call = (sy_call_t
*)freebsd32_aio_writev, .sy_auevent = AUE_AIO_WRITEV, .sy_flags =
SYF_CAPENABLED, .sy_thrcnt = SY_THR_STATIC }, /* 578 =
freebsd32_aio_writev */
+ { .sy_narg = AS(freebsd32_aio_readv_args), .sy_call = (sy_call_t
*)freebsd32_aio_readv, .sy_auevent = AUE_AIO_READV, .sy_flags = SYF_CAPENABLED,
.sy_thrcnt = SY_THR_STATIC }, /* 579 = freebsd32_aio_readv */
};
diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c
b/sys/compat/freebsd32/freebsd32_systrace_args.c
index 3d6b228709a8..c4f1602f885c 100644
--- a/sys/compat/freebsd32/freebsd32_systrace_args.c
+++ b/sys/compat/freebsd32/freebsd32_systrace_args.c
@@ -1284,20 +1284,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
*n_args = 4;
break;
}
- /* freebsd32_aio_writev */
- case 258: {
- struct freebsd32_aio_writev_args *p = params;
- uarg[0] = (intptr_t) p->aiocbp; /* struct aiocb32 * */
- *n_args = 1;
- break;
- }
- /* freebsd32_aio_readv */
- case 259: {
- struct freebsd32_aio_readv_args *p = params;
- uarg[0] = (intptr_t) p->aiocbp; /* struct aiocb32 * */
- *n_args = 1;
- break;
- }
/* lchmod */
case 274: {
struct lchmod_args *p = params;
@@ -3407,6 +3393,20 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
*n_args = 3;
break;
}
+ /* freebsd32_aio_writev */
+ case 578: {
+ struct freebsd32_aio_writev_args *p = params;
+ uarg[0] = (intptr_t) p->aiocbp; /* struct aiocb32 * */
+ *n_args = 1;
+ break;
+ }
+ /* freebsd32_aio_readv */
+ case 579: {
+ struct freebsd32_aio_readv_args *p = params;
+ uarg[0] = (intptr_t) p->aiocbp; /* struct aiocb32 * */
+ *n_args = 1;
+ break;
+ }
default:
*n_args = 0;
break;
@@ -5434,26 +5434,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
};
break;
- /* freebsd32_aio_writev */
- case 258:
- switch(ndx) {
- case 0:
- p = "userland struct aiocb32 *";
- break;
- default:
- break;
- };
- break;
- /* freebsd32_aio_readv */
- case 259:
- switch(ndx) {
- case 0:
- p = "userland struct aiocb32 *";
- break;
- default:
- break;
- };
- break;
/* lchmod */
case 274:
switch(ndx) {
@@ -9183,6 +9163,26 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
};
break;
+ /* freebsd32_aio_writev */
+ case 578:
+ switch(ndx) {
+ case 0:
+ p = "userland struct aiocb32 *";
+ break;
+ default:
+ break;
+ };
+ break;
+ /* freebsd32_aio_readv */
+ case 579:
+ switch(ndx) {
+ case 0:
+ p = "userland struct aiocb32 *";
+ break;
+ default:
+ break;
+ };
+ break;
default:
break;
};
@@ -9927,16 +9927,6 @@ systrace_return_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* freebsd32_aio_writev */
- case 258:
- if (ndx == 0 || ndx == 1)
- p = "int";
- break;
- /* freebsd32_aio_readv */
- case 259:
- if (ndx == 0 || ndx == 1)
- p = "int";
- break;
/* lchmod */
case 274:
if (ndx == 0 || ndx == 1)
@@ -11102,6 +11092,16 @@ systrace_return_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
if (ndx == 0 || ndx == 1)
p = "int";
break;
+ /* freebsd32_aio_writev */
+ case 578:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
+ /* freebsd32_aio_readv */
+ case 579:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
default:
break;
};
diff --git a/sys/kern/init_sysent.c b/sys/kern/init_sysent.c
index 775ae9f7fc7e..efd18ec5ce01 100644
--- a/sys/kern/init_sysent.c
+++ b/sys/kern/init_sysent.c
@@ -313,8 +313,8 @@ struct sysent sysent[] = {
{ .sy_narg = AS(aio_read_args), .sy_call = (sy_call_t *)sys_aio_read,
.sy_auevent = AUE_AIO_READ, .sy_flags = SYF_CAPENABLED, .sy_thrcnt =
SY_THR_STATIC }, /* 255 = aio_read */
{ .sy_narg = AS(aio_write_args), .sy_call = (sy_call_t *)sys_aio_write,
.sy_auevent = AUE_AIO_WRITE, .sy_flags = SYF_CAPENABLED, .sy_thrcnt =
SY_THR_STATIC }, /* 256 = aio_write */
{ .sy_narg = AS(lio_listio_args), .sy_call = (sy_call_t
*)sys_lio_listio, .sy_auevent = AUE_LIO_LISTIO, .sy_flags = SYF_CAPENABLED,
.sy_thrcnt = SY_THR_STATIC }, /* 257 = lio_listio */
- { .sy_narg = AS(aio_writev_args), .sy_call = (sy_call_t
*)sys_aio_writev, .sy_auevent = AUE_AIO_WRITEV, .sy_flags = SYF_CAPENABLED,
.sy_thrcnt = SY_THR_STATIC }, /* 258 = aio_writev */
- { .sy_narg = AS(aio_readv_args), .sy_call = (sy_call_t *)sys_aio_readv,
.sy_auevent = AUE_AIO_READV, .sy_flags = SYF_CAPENABLED, .sy_thrcnt =
SY_THR_STATIC }, /* 259 = aio_readv */
+ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 258 = nosys
*/
+ { .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 259 = nosys
*/
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 260 = nosys
*/
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 261 = nosys
*/
{ .sy_narg = 0, .sy_call = (sy_call_t *)nosys, .sy_auevent = AUE_NULL,
.sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT }, /* 262 = nosys
*/
@@ -633,4 +633,6 @@ struct sysent sysent[] = {
{ .sy_narg = AS(close_range_args), .sy_call = (sy_call_t
*)sys_close_range, .sy_auevent = AUE_CLOSERANGE, .sy_flags = SYF_CAPENABLED,
.sy_thrcnt = SY_THR_STATIC }, /* 575 = close_range */
{ .sy_narg = AS(rpctls_syscall_args), .sy_call = (sy_call_t
*)lkmressys, .sy_auevent = AUE_NULL, .sy_flags = 0, .sy_thrcnt = SY_THR_ABSENT
}, /* 576 = rpctls_syscall */
{ .sy_narg = AS(__specialfd_args), .sy_call = (sy_call_t
*)sys___specialfd, .sy_auevent = AUE_SPECIALFD, .sy_flags = SYF_CAPENABLED,
.sy_thrcnt = SY_THR_STATIC }, /* 577 = __specialfd */
+ { .sy_narg = AS(aio_writev_args), .sy_call = (sy_call_t
*)sys_aio_writev, .sy_auevent = AUE_AIO_WRITEV, .sy_flags = SYF_CAPENABLED,
.sy_thrcnt = SY_THR_STATIC }, /* 578 = aio_writev */
+ { .sy_narg = AS(aio_readv_args), .sy_call = (sy_call_t *)sys_aio_readv,
.sy_auevent = AUE_AIO_READV, .sy_flags = SYF_CAPENABLED, .sy_thrcnt =
SY_THR_STATIC }, /* 579 = aio_readv */
};
diff --git a/sys/kern/syscalls.c b/sys/kern/syscalls.c
index 8b17b9af24d6..88fa3aee980f 100644
--- a/sys/kern/syscalls.c
+++ b/sys/kern/syscalls.c
@@ -264,8 +264,8 @@ const char *syscallnames[] = {
"aio_read", /* 255 = aio_read */
"aio_write", /* 256 = aio_write */
"lio_listio", /* 257 = lio_listio */
- "aio_writev", /* 258 = aio_writev */
- "aio_readv", /* 259 = aio_readv */
+ "#258", /* 258 = nosys */
+ "#259", /* 259 = nosys */
"#260", /* 260 = nosys */
"#261", /* 261 = nosys */
"#262", /* 262 = nosys */
@@ -584,4 +584,6 @@ const char *syscallnames[] = {
"close_range", /* 575 = close_range */
"rpctls_syscall", /* 576 = rpctls_syscall */
"__specialfd", /* 577 = __specialfd */
+ "aio_writev", /* 578 = aio_writev */
+ "aio_readv", /* 579 = aio_readv */
};
diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c
index 936faddd8b11..7296b69787b0 100644
--- a/sys/kern/systrace_args.c
+++ b/sys/kern/systrace_args.c
@@ -1320,20 +1320,6 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
*n_args = 4;
break;
}
- /* aio_writev */
- case 258: {
- struct aio_writev_args *p = params;
- uarg[0] = (intptr_t) p->aiocbp; /* struct aiocb * */
- *n_args = 1;
- break;
- }
- /* aio_readv */
- case 259: {
- struct aio_readv_args *p = params;
- uarg[0] = (intptr_t) p->aiocbp; /* struct aiocb * */
- *n_args = 1;
- break;
- }
/* lchmod */
case 274: {
struct lchmod_args *p = params;
@@ -3399,6 +3385,20 @@ systrace_args(int sysnum, void *params, uint64_t *uarg,
int *n_args)
*n_args = 3;
break;
}
+ /* aio_writev */
+ case 578: {
+ struct aio_writev_args *p = params;
+ uarg[0] = (intptr_t) p->aiocbp; /* struct aiocb * */
+ *n_args = 1;
+ break;
+ }
+ /* aio_readv */
+ case 579: {
+ struct aio_readv_args *p = params;
+ uarg[0] = (intptr_t) p->aiocbp; /* struct aiocb * */
+ *n_args = 1;
+ break;
+ }
default:
*n_args = 0;
break;
@@ -5485,26 +5485,6 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
};
break;
- /* aio_writev */
- case 258:
- switch(ndx) {
- case 0:
- p = "userland struct aiocb *";
- break;
- default:
- break;
- };
- break;
- /* aio_readv */
- case 259:
- switch(ndx) {
- case 0:
- p = "userland struct aiocb *";
- break;
- default:
- break;
- };
- break;
/* lchmod */
case 274:
switch(ndx) {
@@ -9088,6 +9068,26 @@ systrace_entry_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
break;
};
break;
+ /* aio_writev */
+ case 578:
+ switch(ndx) {
+ case 0:
+ p = "userland struct aiocb *";
+ break;
+ default:
+ break;
+ };
+ break;
+ /* aio_readv */
+ case 579:
+ switch(ndx) {
+ case 0:
+ p = "userland struct aiocb *";
+ break;
+ default:
+ break;
+ };
+ break;
default:
break;
};
@@ -9854,16 +9854,6 @@ systrace_return_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
if (ndx == 0 || ndx == 1)
p = "int";
break;
- /* aio_writev */
- case 258:
- if (ndx == 0 || ndx == 1)
- p = "int";
- break;
- /* aio_readv */
- case 259:
- if (ndx == 0 || ndx == 1)
- p = "int";
- break;
/* lchmod */
case 274:
if (ndx == 0 || ndx == 1)
@@ -11034,6 +11024,16 @@ systrace_return_setargdesc(int sysnum, int ndx, char
*desc, size_t descsz)
if (ndx == 0 || ndx == 1)
p = "int";
break;
+ /* aio_writev */
+ case 578:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
+ /* aio_readv */
+ case 579:
+ if (ndx == 0 || ndx == 1)
+ p = "int";
+ break;
default:
break;
};
diff --git a/sys/sys/syscall.h b/sys/sys/syscall.h
index 9da639113a6f..3d2db9563e35 100644
--- a/sys/sys/syscall.h
+++ b/sys/sys/syscall.h
@@ -234,8 +234,6 @@
#define SYS_aio_read 255
#define SYS_aio_write 256
#define SYS_lio_listio 257
-#define SYS_aio_writev 258
-#define SYS_aio_readv 259
#define SYS_freebsd11_getdents 272
#define SYS_lchmod 274
/* 275 is obsolete netbsd_lchown */
@@ -515,4 +513,6 @@
#define SYS_close_range 575
#define SYS_rpctls_syscall 576
#define SYS___specialfd 577
-#define SYS_MAXSYSCALL 578
+#define SYS_aio_writev 578
+#define SYS_aio_readv 579
+#define SYS_MAXSYSCALL 580
diff --git a/sys/sys/syscall.mk b/sys/sys/syscall.mk
index cd2a595891e5..4c3e04ebd0f7 100644
--- a/sys/sys/syscall.mk
+++ b/sys/sys/syscall.mk
@@ -168,8 +168,6 @@ MIASM = \
aio_read.o \
aio_write.o \
lio_listio.o \
- aio_writev.o \
- aio_readv.o \
freebsd11_getdents.o \
lchmod.o \
lutimes.o \
@@ -420,4 +418,6 @@ MIASM = \
__realpathat.o \
close_range.o \
rpctls_syscall.o \
- __specialfd.o
+ __specialfd.o \
+ aio_writev.o \
+ aio_readv.o
diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h
index 24f76b1c4409..66060ab77f9a 100644
--- a/sys/sys/sysproto.h
+++ b/sys/sys/sysproto.h
@@ -714,12 +714,6 @@ struct lio_listio_args {
char nent_l_[PADL_(int)]; int nent; char nent_r_[PADR_(int)];
char sig_l_[PADL_(struct sigevent *)]; struct sigevent * sig; char
sig_r_[PADR_(struct sigevent *)];
};
-struct aio_writev_args {
- char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char
aiocbp_r_[PADR_(struct aiocb *)];
-};
-struct aio_readv_args {
- char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char
aiocbp_r_[PADR_(struct aiocb *)];
-};
struct lchmod_args {
char path_l_[PADL_(const char *)]; const char * path; char
path_r_[PADR_(const char *)];
char mode_l_[PADL_(mode_t)]; mode_t mode; char mode_r_[PADR_(mode_t)];
@@ -1847,6 +1841,12 @@ struct __specialfd_args {
char req_l_[PADL_(const void *)]; const void * req; char
req_r_[PADR_(const void *)];
char len_l_[PADL_(size_t)]; size_t len; char len_r_[PADR_(size_t)];
};
+struct aio_writev_args {
+ char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char
aiocbp_r_[PADR_(struct aiocb *)];
+};
+struct aio_readv_args {
+ char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char
aiocbp_r_[PADR_(struct aiocb *)];
+};
int nosys(struct thread *, struct nosys_args *);
void sys_sys_exit(struct thread *, struct sys_exit_args *);
int sys_fork(struct thread *, struct fork_args *);
@@ -2002,8 +2002,6 @@ int sys_lchown(struct thread *, struct lchown_args
*);
int sys_aio_read(struct thread *, struct aio_read_args *);
int sys_aio_write(struct thread *, struct aio_write_args *);
int sys_lio_listio(struct thread *, struct lio_listio_args *);
-int sys_aio_writev(struct thread *, struct aio_writev_args *);
-int sys_aio_readv(struct thread *, struct aio_readv_args *);
int sys_lchmod(struct thread *, struct lchmod_args *);
int sys_lutimes(struct thread *, struct lutimes_args *);
int sys_preadv(struct thread *, struct preadv_args *);
@@ -2241,6 +2239,8 @@ int sys___realpathat(struct thread *, struct
__realpathat_args *);
int sys_close_range(struct thread *, struct close_range_args *);
int sys_rpctls_syscall(struct thread *, struct rpctls_syscall_args *);
int sys___specialfd(struct thread *, struct __specialfd_args *);
+int sys_aio_writev(struct thread *, struct aio_writev_args *);
+int sys_aio_readv(struct thread *, struct aio_readv_args *);
#ifdef COMPAT_43
@@ -2915,8 +2915,6 @@ int freebsd12_closefrom(struct thread *, struct
freebsd12_closefrom_args *);
#define SYS_AUE_aio_read AUE_AIO_READ
#define SYS_AUE_aio_write AUE_AIO_WRITE
#define SYS_AUE_lio_listio AUE_LIO_LISTIO
-#define SYS_AUE_aio_writev AUE_AIO_WRITEV
-#define SYS_AUE_aio_readv AUE_AIO_READV
#define SYS_AUE_freebsd11_getdents AUE_O_GETDENTS
#define SYS_AUE_lchmod AUE_LCHMOD
#define SYS_AUE_lutimes AUE_LUTIMES
@@ -3175,6 +3173,8 @@ int freebsd12_closefrom(struct thread *, struct
freebsd12_closefrom_args *);
#define SYS_AUE_close_range AUE_CLOSERANGE
#define SYS_AUE_rpctls_syscall AUE_NULL
#define SYS_AUE___specialfd AUE_SPECIALFD
+#define SYS_AUE_aio_writev AUE_AIO_WRITEV
+#define SYS_AUE_aio_readv AUE_AIO_READV
#undef PAD_
#undef PADL_
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
