diff options
| -rw-r--r-- | sys/compat/freebsd32/freebsd32_proto.h | 10 | ||||
| -rw-r--r-- | sys/compat/freebsd32/freebsd32_systrace_args.c | 20 | ||||
| -rw-r--r-- | sys/compat/freebsd32/syscalls.master | 10 |
3 files changed, 20 insertions, 20 deletions
diff --git a/sys/compat/freebsd32/freebsd32_proto.h b/sys/compat/freebsd32/freebsd32_proto.h index 9b67675e3e05..7701d6ac0b26 100644 --- a/sys/compat/freebsd32/freebsd32_proto.h +++ b/sys/compat/freebsd32/freebsd32_proto.h @@ -340,17 +340,17 @@ struct freebsd32_sigaction_args { char oact_l_[PADL_(struct sigaction32 *)]; struct sigaction32 * oact; char oact_r_[PADR_(struct sigaction32 *)]; }; struct freebsd32_sigreturn_args { - char sigcntxp_l_[PADL_(const struct freebsd32_ucontext *)]; const struct freebsd32_ucontext * sigcntxp; char sigcntxp_r_[PADR_(const struct freebsd32_ucontext *)]; + char sigcntxp_l_[PADL_(const struct __ucontext32 *)]; const struct __ucontext32 * sigcntxp; char sigcntxp_r_[PADR_(const struct __ucontext32 *)]; }; struct freebsd32_getcontext_args { - char ucp_l_[PADL_(struct freebsd32_ucontext *)]; struct freebsd32_ucontext * ucp; char ucp_r_[PADR_(struct freebsd32_ucontext *)]; + char ucp_l_[PADL_(struct __ucontext32 *)]; struct __ucontext32 * ucp; char ucp_r_[PADR_(struct __ucontext32 *)]; }; struct freebsd32_setcontext_args { - char ucp_l_[PADL_(const struct freebsd32_ucontext *)]; const struct freebsd32_ucontext * ucp; char ucp_r_[PADR_(const struct freebsd32_ucontext *)]; + char ucp_l_[PADL_(const struct __ucontext32 *)]; const struct __ucontext32 * ucp; char ucp_r_[PADR_(const struct __ucontext32 *)]; }; struct freebsd32_swapcontext_args { - char oucp_l_[PADL_(struct freebsd32_ucontext *)]; struct freebsd32_ucontext * oucp; char oucp_r_[PADR_(struct freebsd32_ucontext *)]; - char ucp_l_[PADL_(const struct freebsd32_ucontext *)]; const struct freebsd32_ucontext * ucp; char ucp_r_[PADR_(const struct freebsd32_ucontext *)]; + char oucp_l_[PADL_(struct __ucontext32 *)]; struct __ucontext32 * oucp; char oucp_r_[PADR_(struct __ucontext32 *)]; + char ucp_l_[PADL_(const struct __ucontext32 *)]; const struct __ucontext32 * ucp; char ucp_r_[PADR_(const struct __ucontext32 *)]; }; struct freebsd32_ksem_timedwait_args { char id_l_[PADL_(semid_t)]; semid_t id; char id_r_[PADR_(semid_t)]; diff --git a/sys/compat/freebsd32/freebsd32_systrace_args.c b/sys/compat/freebsd32/freebsd32_systrace_args.c index 64e500aaad25..8cc005c47ef2 100644 --- a/sys/compat/freebsd32/freebsd32_systrace_args.c +++ b/sys/compat/freebsd32/freebsd32_systrace_args.c @@ -1956,29 +1956,29 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) /* freebsd32_sigreturn */ case 417: { struct freebsd32_sigreturn_args *p = params; - uarg[0] = (intptr_t)p->sigcntxp; /* const struct freebsd32_ucontext * */ + uarg[0] = (intptr_t)p->sigcntxp; /* const struct __ucontext32 * */ *n_args = 1; break; } /* freebsd32_getcontext */ case 421: { struct freebsd32_getcontext_args *p = params; - uarg[0] = (intptr_t)p->ucp; /* struct freebsd32_ucontext * */ + uarg[0] = (intptr_t)p->ucp; /* struct __ucontext32 * */ *n_args = 1; break; } /* freebsd32_setcontext */ case 422: { struct freebsd32_setcontext_args *p = params; - uarg[0] = (intptr_t)p->ucp; /* const struct freebsd32_ucontext * */ + uarg[0] = (intptr_t)p->ucp; /* const struct __ucontext32 * */ *n_args = 1; break; } /* freebsd32_swapcontext */ case 423: { struct freebsd32_swapcontext_args *p = params; - uarg[0] = (intptr_t)p->oucp; /* struct freebsd32_ucontext * */ - uarg[1] = (intptr_t)p->ucp; /* const struct freebsd32_ucontext * */ + uarg[0] = (intptr_t)p->oucp; /* struct __ucontext32 * */ + uarg[1] = (intptr_t)p->ucp; /* const struct __ucontext32 * */ *n_args = 2; break; } @@ -6566,7 +6566,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 417: switch (ndx) { case 0: - p = "userland const struct freebsd32_ucontext *"; + p = "userland const struct __ucontext32 *"; break; default: break; @@ -6576,7 +6576,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 421: switch (ndx) { case 0: - p = "userland struct freebsd32_ucontext *"; + p = "userland struct __ucontext32 *"; break; default: break; @@ -6586,7 +6586,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 422: switch (ndx) { case 0: - p = "userland const struct freebsd32_ucontext *"; + p = "userland const struct __ucontext32 *"; break; default: break; @@ -6596,10 +6596,10 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) case 423: switch (ndx) { case 0: - p = "userland struct freebsd32_ucontext *"; + p = "userland struct __ucontext32 *"; break; case 1: - p = "userland const struct freebsd32_ucontext *"; + p = "userland const struct __ucontext32 *"; break; default: break; diff --git a/sys/compat/freebsd32/syscalls.master b/sys/compat/freebsd32/syscalls.master index 2d3be2e971ce..e8927b05c24f 100644 --- a/sys/compat/freebsd32/syscalls.master +++ b/sys/compat/freebsd32/syscalls.master @@ -763,17 +763,17 @@ struct sigaction32 *act, \ struct sigaction32 *oact); } 417 AUE_SIGRETURN STD { int freebsd32_sigreturn( \ - const struct freebsd32_ucontext *sigcntxp); } + const struct __ucontext32 *sigcntxp); } 418 AUE_NULL UNIMPL __xstat 419 AUE_NULL UNIMPL __xfstat 420 AUE_NULL UNIMPL __xlstat 421 AUE_NULL STD { int freebsd32_getcontext( \ - struct freebsd32_ucontext *ucp); } + struct __ucontext32 *ucp); } 422 AUE_NULL STD { int freebsd32_setcontext( \ - const struct freebsd32_ucontext *ucp); } + const struct __ucontext32 *ucp); } 423 AUE_NULL STD { int freebsd32_swapcontext( \ - struct freebsd32_ucontext *oucp, \ - const struct freebsd32_ucontext *ucp); } + struct __ucontext32 *oucp, \ + const struct __ucontext32 *ucp); } 424 AUE_SWAPOFF UNIMPL swapoff 425 AUE_ACL_GET_LINK NOPROTO { int __acl_get_link(const char *path, \ acl_type_t type, struct acl *aclp); } |