aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrooks Davis <brooks@FreeBSD.org>2021-11-17 20:12:22 +0000
committerBrooks Davis <brooks@FreeBSD.org>2021-11-17 20:12:22 +0000
commit8ba369ed74007a52be045e4c40a1131e4842222e (patch)
tree70bfdf613841c06bbc57c192c6ce9026537f252e
parenta944d28d0edf7ceb1bef4d789dfa4e8e18331658 (diff)
downloadsrc-8ba369ed74007a52be045e4c40a1131e4842222e.tar.gz
src-8ba369ed74007a52be045e4c40a1131e4842222e.zip
freebsd32: [gs]etitimer's which arg is an int
Reviewed by: kevans
-rw-r--r--sys/compat/freebsd32/freebsd32_proto.h4
-rw-r--r--sys/compat/freebsd32/freebsd32_systrace_args.c8
-rw-r--r--sys/compat/freebsd32/syscalls.master4
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/compat/freebsd32/freebsd32_proto.h b/sys/compat/freebsd32/freebsd32_proto.h
index 0882731d656d..d358244c5d32 100644
--- a/sys/compat/freebsd32/freebsd32_proto.h
+++ b/sys/compat/freebsd32/freebsd32_proto.h
@@ -93,12 +93,12 @@ struct freebsd32_mprotect_args {
char prot_l_[PADL_(int)]; int prot; char prot_r_[PADR_(int)];
};
struct freebsd32_setitimer_args {
- char which_l_[PADL_(u_int)]; u_int which; char which_r_[PADR_(u_int)];
+ char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)];
char itv_l_[PADL_(const struct itimerval32 *)]; const struct itimerval32 * itv; char itv_r_[PADR_(const struct itimerval32 *)];
char oitv_l_[PADL_(struct itimerval32 *)]; struct itimerval32 * oitv; char oitv_r_[PADR_(struct itimerval32 *)];
};
struct freebsd32_getitimer_args {
- char which_l_[PADL_(u_int)]; u_int which; char which_r_[PADR_(u_int)];
+ char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)];
char itv_l_[PADL_(struct itimerval32 *)]; struct itimerval32 * itv; char itv_r_[PADR_(struct itimerval32 *)];
};
struct freebsd32_fcntl_args {
diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c
index 4fce6797062c..d22304859af1 100644
--- a/sys/compat/freebsd32/freebsd32_systrace_args.c
+++ b/sys/compat/freebsd32/freebsd32_systrace_args.c
@@ -502,7 +502,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
/* freebsd32_setitimer */
case 83: {
struct freebsd32_setitimer_args *p = params;
- uarg[0] = p->which; /* u_int */
+ iarg[0] = p->which; /* int */
uarg[1] = (intptr_t)p->itv; /* const struct itimerval32 * */
uarg[2] = (intptr_t)p->oitv; /* struct itimerval32 * */
*n_args = 3;
@@ -518,7 +518,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
/* freebsd32_getitimer */
case 86: {
struct freebsd32_getitimer_args *p = params;
- uarg[0] = p->which; /* u_int */
+ iarg[0] = p->which; /* int */
uarg[1] = (intptr_t)p->itv; /* struct itimerval32 * */
*n_args = 2;
break;
@@ -4198,7 +4198,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 83:
switch (ndx) {
case 0:
- p = "u_int";
+ p = "int";
break;
case 1:
p = "userland const struct itimerval32 *";
@@ -4224,7 +4224,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
case 86:
switch (ndx) {
case 0:
- p = "u_int";
+ p = "int";
break;
case 1:
p = "userland struct itimerval32 *";
diff --git a/sys/compat/freebsd32/syscalls.master b/sys/compat/freebsd32/syscalls.master
index 8cb962e90bce..328858071949 100644
--- a/sys/compat/freebsd32/syscalls.master
+++ b/sys/compat/freebsd32/syscalls.master
@@ -194,13 +194,13 @@
const gid_t *gidset); }
81 AUE_GETPGRP NOPROTO { int getpgrp(void); }
82 AUE_SETPGRP NOPROTO { int setpgid(int pid, int pgid); }
-83 AUE_SETITIMER STD { int freebsd32_setitimer(u_int which, \
+83 AUE_SETITIMER STD { int freebsd32_setitimer(int which, \
const struct itimerval32 *itv, \
struct itimerval32 *oitv); }
84 AUE_NULL OBSOL owait
; XXX implement
85 AUE_SWAPON NOPROTO { int swapon(const char *name); }
-86 AUE_GETITIMER STD { int freebsd32_getitimer(u_int which, \
+86 AUE_GETITIMER STD { int freebsd32_getitimer(int which, \
struct itimerval32 *itv); }
87 AUE_O_GETHOSTNAME OBSOL ogethostname
88 AUE_O_SETHOSTNAME OBSOL osethostname