diff options
| author | Brooks Davis <brooks@FreeBSD.org> | 2021-11-17 20:12:21 +0000 |
|---|---|---|
| committer | Brooks Davis <brooks@FreeBSD.org> | 2021-11-17 20:12:21 +0000 |
| commit | b64f3dc26cbc7a55c4c839cfde4f876684563507 (patch) | |
| tree | 9b3f85a0095a8b6cdc3b432ce808099126f93a30 | |
| parent | b7fd86118fb5d41f61fdfa003d11e9367770ff0a (diff) | |
| download | src-b64f3dc26cbc7a55c4c839cfde4f876684563507.tar.gz src-b64f3dc26cbc7a55c4c839cfde4f876684563507.zip | |
syscalls: [gs]etitimer takes an int which
Match the function decleration which takes an int not a signed int.
No functional change as the range of valid values is 0-2.
Obtained from: CheriBSD
Reviewed by: kevans
| -rw-r--r-- | sys/kern/syscalls.master | 4 | ||||
| -rw-r--r-- | sys/kern/systrace_args.c | 8 | ||||
| -rw-r--r-- | sys/sys/sysproto.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index 39992e9c7430..a69b99cb0693 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -545,7 +545,7 @@ } 83 AUE_SETITIMER STD|CAPENABLED { int setitimer( - u_int which, + int which, _In_ const struct itimerval *itv, _Out_opt_ struct itimerval *oitv ); @@ -560,7 +560,7 @@ } 86 AUE_GETITIMER STD|CAPENABLED { int getitimer( - u_int which, + int which, _Out_ struct itimerval *itv ); } diff --git a/sys/kern/systrace_args.c b/sys/kern/systrace_args.c index de96b132824b..55788649de4f 100644 --- a/sys/kern/systrace_args.c +++ b/sys/kern/systrace_args.c @@ -499,7 +499,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) /* setitimer */ case 83: { struct setitimer_args *p = params; - uarg[0] = p->which; /* u_int */ + iarg[0] = p->which; /* int */ uarg[1] = (intptr_t)p->itv; /* const struct itimerval * */ uarg[2] = (intptr_t)p->oitv; /* struct itimerval * */ *n_args = 3; @@ -515,7 +515,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) /* getitimer */ case 86: { struct getitimer_args *p = params; - uarg[0] = p->which; /* u_int */ + iarg[0] = p->which; /* int */ uarg[1] = (intptr_t)p->itv; /* struct itimerval * */ *n_args = 2; break; @@ -4180,7 +4180,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 itimerval *"; @@ -4206,7 +4206,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 itimerval *"; diff --git a/sys/sys/sysproto.h b/sys/sys/sysproto.h index d29620ac2d7f..b6b33df7b9cc 100644 --- a/sys/sys/sysproto.h +++ b/sys/sys/sysproto.h @@ -299,7 +299,7 @@ struct setpgid_args { char pgid_l_[PADL_(int)]; int pgid; char pgid_r_[PADR_(int)]; }; struct 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 itimerval *)]; const struct itimerval * itv; char itv_r_[PADR_(const struct itimerval *)]; char oitv_l_[PADL_(struct itimerval *)]; struct itimerval * oitv; char oitv_r_[PADR_(struct itimerval *)]; }; @@ -310,7 +310,7 @@ struct swapon_args { char name_l_[PADL_(const char *)]; const char * name; char name_r_[PADR_(const char *)]; }; struct 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 itimerval *)]; struct itimerval * itv; char itv_r_[PADR_(struct itimerval *)]; }; struct getdtablesize_args { |