git: 9946c920a426 - main - freebsd32: wait6 and procctl take idtype_t
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 17 Nov 2021 20:22:16 UTC
The branch main has been updated by brooks:
URL: https://cgit.FreeBSD.org/src/commit/?id=9946c920a4267e5bef322239fa8484e715baca4c
commit 9946c920a4267e5bef322239fa8484e715baca4c
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2021-11-17 20:12:23 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2021-11-17 20:12:23 +0000
freebsd32: wait6 and procctl take idtype_t
Reviewed by: kevans
---
sys/compat/freebsd32/freebsd32_proto.h | 8 ++++----
sys/compat/freebsd32/freebsd32_systrace_args.c | 16 ++++++++--------
sys/compat/freebsd32/syscalls.master | 8 ++++----
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/sys/compat/freebsd32/freebsd32_proto.h b/sys/compat/freebsd32/freebsd32_proto.h
index def4391848b2..caccf13f02ec 100644
--- a/sys/compat/freebsd32/freebsd32_proto.h
+++ b/sys/compat/freebsd32/freebsd32_proto.h
@@ -597,7 +597,7 @@ struct freebsd32_posix_fadvise_args {
char advice_l_[PADL_(int)]; int advice; char advice_r_[PADR_(int)];
};
struct freebsd32_wait6_args {
- char idtype_l_[PADL_(int)]; int idtype; char idtype_r_[PADR_(int)];
+ char idtype_l_[PADL_(idtype_t)]; idtype_t idtype; char idtype_r_[PADR_(idtype_t)];
char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
char id1_l_[PADL_(uint32_t)]; uint32_t id1; char id1_r_[PADR_(uint32_t)];
char id2_l_[PADL_(uint32_t)]; uint32_t id2; char id2_r_[PADR_(uint32_t)];
@@ -623,7 +623,7 @@ struct freebsd32_posix_fadvise_args {
char advice_l_[PADL_(int)]; int advice; char advice_r_[PADR_(int)];
};
struct freebsd32_wait6_args {
- char idtype_l_[PADL_(int)]; int idtype; char idtype_r_[PADR_(int)];
+ char idtype_l_[PADL_(idtype_t)]; idtype_t idtype; char idtype_r_[PADR_(idtype_t)];
char id1_l_[PADL_(uint32_t)]; uint32_t id1; char id1_r_[PADR_(uint32_t)];
char id2_l_[PADL_(uint32_t)]; uint32_t id2; char id2_r_[PADR_(uint32_t)];
char status_l_[PADL_(int *)]; int * status; char status_r_[PADR_(int *)];
@@ -647,7 +647,7 @@ struct freebsd32_aio_mlock_args {
};
#ifdef PAD64_REQUIRED
struct freebsd32_procctl_args {
- char idtype_l_[PADL_(int)]; int idtype; char idtype_r_[PADR_(int)];
+ char idtype_l_[PADL_(idtype_t)]; idtype_t idtype; char idtype_r_[PADR_(idtype_t)];
char pad_l_[PADL_(int)]; int pad; char pad_r_[PADR_(int)];
char id1_l_[PADL_(uint32_t)]; uint32_t id1; char id1_r_[PADR_(uint32_t)];
char id2_l_[PADL_(uint32_t)]; uint32_t id2; char id2_r_[PADR_(uint32_t)];
@@ -656,7 +656,7 @@ struct freebsd32_procctl_args {
};
#else
struct freebsd32_procctl_args {
- char idtype_l_[PADL_(int)]; int idtype; char idtype_r_[PADR_(int)];
+ char idtype_l_[PADL_(idtype_t)]; idtype_t idtype; char idtype_r_[PADR_(idtype_t)];
char id1_l_[PADL_(uint32_t)]; uint32_t id1; char id1_r_[PADR_(uint32_t)];
char id2_l_[PADL_(uint32_t)]; uint32_t id2; char id2_r_[PADR_(uint32_t)];
char com_l_[PADL_(int)]; int com; char com_r_[PADR_(int)];
diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c
index 61a8e2e82a57..6764f370d4c9 100644
--- a/sys/compat/freebsd32/freebsd32_systrace_args.c
+++ b/sys/compat/freebsd32/freebsd32_systrace_args.c
@@ -2916,7 +2916,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
/* freebsd32_wait6 */
case 532: {
struct freebsd32_wait6_args *p = params;
- iarg[0] = p->idtype; /* int */
+ iarg[0] = p->idtype; /* idtype_t */
iarg[1] = p->pad; /* int */
uarg[2] = p->id1; /* uint32_t */
uarg[3] = p->id2; /* uint32_t */
@@ -2954,7 +2954,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
/* freebsd32_wait6 */
case 532: {
struct freebsd32_wait6_args *p = params;
- iarg[0] = p->idtype; /* int */
+ iarg[0] = p->idtype; /* idtype_t */
uarg[1] = p->id1; /* uint32_t */
uarg[2] = p->id2; /* uint32_t */
uarg[3] = (intptr_t)p->status; /* int * */
@@ -3066,7 +3066,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
/* freebsd32_procctl */
case 544: {
struct freebsd32_procctl_args *p = params;
- iarg[0] = p->idtype; /* int */
+ iarg[0] = p->idtype; /* idtype_t */
iarg[1] = p->pad; /* int */
uarg[2] = p->id1; /* uint32_t */
uarg[3] = p->id2; /* uint32_t */
@@ -3079,7 +3079,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
/* freebsd32_procctl */
case 544: {
struct freebsd32_procctl_args *p = params;
- iarg[0] = p->idtype; /* int */
+ iarg[0] = p->idtype; /* idtype_t */
uarg[1] = p->id1; /* uint32_t */
uarg[2] = p->id2; /* uint32_t */
iarg[3] = p->com; /* int */
@@ -8294,7 +8294,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 532:
switch (ndx) {
case 0:
- p = "int";
+ p = "idtype_t";
break;
case 1:
p = "int";
@@ -8373,7 +8373,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 532:
switch (ndx) {
case 0:
- p = "int";
+ p = "idtype_t";
break;
case 1:
p = "uint32_t";
@@ -8573,7 +8573,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 544:
switch (ndx) {
case 0:
- p = "int";
+ p = "idtype_t";
break;
case 1:
p = "int";
@@ -8599,7 +8599,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 544:
switch (ndx) {
case 0:
- p = "int";
+ p = "idtype_t";
break;
case 1:
p = "uint32_t";
diff --git a/sys/compat/freebsd32/syscalls.master b/sys/compat/freebsd32/syscalls.master
index de85234343c1..ca1a42cf4fad 100644
--- a/sys/compat/freebsd32/syscalls.master
+++ b/sys/compat/freebsd32/syscalls.master
@@ -1032,7 +1032,7 @@
uint32_t offset1, uint32_t offset2,\
uint32_t len1, uint32_t len2, \
int advice); }
-532 AUE_WAIT6 STD { int freebsd32_wait6(int idtype, int pad, \
+532 AUE_WAIT6 STD { int freebsd32_wait6(idtype_t idtype, int pad, \
uint32_t id1, uint32_t id2, \
int *status, int options, \
struct wrusage32 *wrusage, \
@@ -1045,7 +1045,7 @@
uint32_t offset1, uint32_t offset2,\
uint32_t len1, uint32_t len2, \
int advice); }
-532 AUE_WAIT6 STD { int freebsd32_wait6(int idtype, \
+532 AUE_WAIT6 STD { int freebsd32_wait6(idtype_t idtype, \
uint32_t id1, uint32_t id2, \
int *status, int options, \
struct wrusage32 *wrusage, \
@@ -1080,11 +1080,11 @@
543 AUE_AIO_MLOCK STD { int freebsd32_aio_mlock( \
struct aiocb32 *aiocbp); }
#ifdef PAD64_REQUIRED
-544 AUE_PROCCTL STD { int freebsd32_procctl(int idtype, int pad, \
+544 AUE_PROCCTL STD { int freebsd32_procctl(idtype_t idtype, int pad, \
uint32_t id1, uint32_t id2, int com, \
void *data); }
#else
-544 AUE_PROCCTL STD { int freebsd32_procctl(int idtype, \
+544 AUE_PROCCTL STD { int freebsd32_procctl(idtype_t idtype, \
uint32_t id1, uint32_t id2, int com, \
void *data); }
#endif