d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freebsd32: rename struct wrusage32 to struct __wrusage32

Browse Source 
This matches struct __wrusage

Reviewed by:	kevans
This commit is contained in:
Brooks Davis 2021-11-17 20:12:24 +00:00
parent 0ebea13928
commit b35c2bca9f
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/compat/freebsd32/freebsd32.h
View File

@ -84,7 +84,7 @@ struct rusage32 {
int32_t ru_nivcsw;
};
struct wrusage32 {
struct __wrusage32 {
struct rusage32 wru_self;
struct rusage32 wru_children;
};

2
sys/compat/freebsd32/freebsd32_misc.c
View File

@ -225,7 +225,7 @@ freebsd32_wait4(struct thread *td, struct freebsd32_wait4_args *uap)
int
freebsd32_wait6(struct thread *td, struct freebsd32_wait6_args *uap)
{
struct wrusage32 wru32;
struct __wrusage32 wru32;
struct __wrusage wru, *wrup;
struct siginfo32 si32;
struct __siginfo si, *sip;

4
sys/compat/freebsd32/freebsd32_proto.h
View File

@ -603,7 +603,7 @@ struct freebsd32_wait6_args {
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 *)];
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 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 *)];
};
#else
@ -628,7 +628,7 @@ struct freebsd32_wait6_args {
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 *)];
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 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 *)];
};
#endif

8
sys/compat/freebsd32/freebsd32_systrace_args.c
View File

@ -2922,7 +2922,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
uarg[3] = p->id2; /* uint32_t */
uarg[4] = (intptr_t)p->status; /* int * */
iarg[5] = p->options; /* int */
uarg[6] = (intptr_t)p->wrusage; /* struct wrusage32 * */
uarg[6] = (intptr_t)p->wrusage; /* struct __wrusage32 * */
uarg[7] = (intptr_t)p->info; /* struct siginfo32 * */
*n_args = 8;
break;
@ -2959,7 +2959,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args)
uarg[2] = p->id2; /* uint32_t */
uarg[3] = (intptr_t)p->status; /* int * */
iarg[4] = p->options; /* int */
uarg[5] = (intptr_t)p->wrusage; /* struct wrusage32 * */
uarg[5] = (intptr_t)p->wrusage; /* struct __wrusage32 * */
uarg[6] = (intptr_t)p->info; /* struct siginfo32 * */
*n_args = 7;
break;
@ -8312,7 +8312,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "int";
break;
case 6:
p = "userland struct wrusage32 *";
p = "userland struct __wrusage32 *";
break;
case 7:
p = "userland struct siginfo32 *";
@ -8388,7 +8388,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz)
p = "int";
break;
case 5:
p = "userland struct wrusage32 *";
p = "userland struct __wrusage32 *";
break;
case 6:
p = "userland struct siginfo32 *";

4
sys/compat/freebsd32/syscalls.master
View File

@ -1035,7 +1035,7 @@
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, \
struct __wrusage32 *wrusage, \
struct siginfo32 *info); }
#else
530 AUE_POSIX_FALLOCATE STD { int freebsd32_posix_fallocate(int fd,\
@ -1048,7 +1048,7 @@
532 AUE_WAIT6 STD { int freebsd32_wait6(idtype_t idtype, \
uint32_t id1, uint32_t id2, \
int *status, int options, \
struct wrusage32 *wrusage, \
struct __wrusage32 *wrusage, \
struct siginfo32 *info); }
#endif
533 AUE_CAP_RIGHTS_LIMIT NOPROTO { \