diff options
| author | thorpej <thorpej@NetBSD.org> | 2021-11-01 05:07:15 +0000 |
|---|---|---|
| committer | thorpej <thorpej@NetBSD.org> | 2021-11-01 05:07:15 +0000 |
| commit | eb96f2ebad312da7489a018c02fd03c8dbe82bae (patch) | |
| tree | 30c44005eb1fa6d100b6bf3b3115aa0e02107671 /sys/compat/linux32 | |
| parent | 540021409c37ce67e3a28a40e3b15431d458d3cc (diff) | |
Use "stack_t" instead of "struct sigaltstack", as the former is the
newer standardized name. NFC.
Diffstat (limited to 'sys/compat/linux32')
| -rw-r--r-- | sys/compat/linux32/arch/amd64/linux32_machdep.c | 14 | ||||
| -rw-r--r-- | sys/compat/linux32/common/linux32_signal.c | 7 | ||||
| -rw-r--r-- | sys/compat/linux32/common/linux32_signal.h | 4 |
3 files changed, 13 insertions, 12 deletions
diff --git a/sys/compat/linux32/arch/amd64/linux32_machdep.c b/sys/compat/linux32/arch/amd64/linux32_machdep.c index 31843580fb1..e63619ef7b7 100644 --- a/sys/compat/linux32/arch/amd64/linux32_machdep.c +++ b/sys/compat/linux32/arch/amd64/linux32_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_machdep.c,v 1.46 2021/09/07 11:43:04 riastradh Exp $ */ +/* $NetBSD: linux32_machdep.c,v 1.47 2021/11/01 05:07:16 thorpej Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux32_machdep.c,v 1.46 2021/09/07 11:43:04 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_machdep.c,v 1.47 2021/11/01 05:07:16 thorpej Exp $"); #if defined(_KERNEL_OPT) #include "opt_user_ldt.h" @@ -79,7 +79,7 @@ extern char linux32_rt_sigcode[]; extern char linux32_esigcode[]; static void linux32_save_ucontext(struct lwp *, struct trapframe *, - const sigset_t *, struct sigaltstack *, struct linux32_ucontext *); + const sigset_t *, stack_t *, struct linux32_ucontext *); static void linux32_save_sigcontext(struct lwp *, struct trapframe *, const sigset_t *, struct linux32_sigcontext *); static void linux32_rt_sendsig(const ksiginfo_t *, const sigset_t *); @@ -107,7 +107,7 @@ linux32_old_sendsig(const ksiginfo_t *ksi, const sigset_t *mask) int onstack, error; int sig = ksi->ksi_signo; sig_t catcher = SIGACTION(p, sig).sa_handler; - struct sigaltstack *sas = &l->l_sigstk; + stack_t *sas = &l->l_sigstk; tf = l->l_md.md_regs; /* Do we need to jump onto the signal stack? */ @@ -178,7 +178,7 @@ linux32_rt_sendsig(const ksiginfo_t *ksi, const sigset_t *mask) linux32_siginfo_t *lsi; int sig = ksi->ksi_signo; sig_t catcher = SIGACTION(p, sig).sa_handler; - struct sigaltstack *sas = &l->l_sigstk; + stack_t *sas = &l->l_sigstk; tf = l->l_md.md_regs; /* Do we need to jump onto the signal stack? */ @@ -325,7 +325,7 @@ linux32_setregs(struct lwp *l, struct exec_package *pack, u_long stack) static void linux32_save_ucontext(struct lwp *l, struct trapframe *tf, - const sigset_t *mask, struct sigaltstack *sas, struct linux32_ucontext *uc) + const sigset_t *mask, stack_t *sas, struct linux32_ucontext *uc) { uc->uc_flags = 0; @@ -410,7 +410,7 @@ linux32_restore_sigcontext(struct lwp *l, struct linux32_sigcontext *scp, { struct trapframe *tf; struct proc *p = l->l_proc; - struct sigaltstack *sas = &l->l_sigstk; + stack_t *sas = &l->l_sigstk; struct pcb *pcb; sigset_t mask; ssize_t ss_gap; diff --git a/sys/compat/linux32/common/linux32_signal.c b/sys/compat/linux32/common/linux32_signal.c index 70f4e2bf7b3..842c01db03f 100644 --- a/sys/compat/linux32/common/linux32_signal.c +++ b/sys/compat/linux32/common/linux32_signal.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_signal.c,v 1.22 2021/09/19 22:30:28 thorpej Exp $ */ +/* $NetBSD: linux32_signal.c,v 1.23 2021/11/01 05:07:16 thorpej Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux32_signal.c,v 1.22 2021/09/19 22:30:28 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux32_signal.c,v 1.23 2021/11/01 05:07:16 thorpej Exp $"); #include <sys/param.h> #include <sys/ucred.h> @@ -234,7 +234,8 @@ native_to_linux32_sigaction(struct linux32_sigaction *lsa, const struct sigactio } void -native_to_linux32_sigaltstack(struct linux32_sigaltstack *lss, const struct sigaltstack *bss) +native_to_linux32_sigaltstack(struct linux32_sigaltstack *lss, + const stack_t *bss) { memset(lss, 0, sizeof(*lss)); NETBSD32PTR32(lss->ss_sp, bss->ss_sp); diff --git a/sys/compat/linux32/common/linux32_signal.h b/sys/compat/linux32/common/linux32_signal.h index 30b0b609698..49be4eae6ff 100644 --- a/sys/compat/linux32/common/linux32_signal.h +++ b/sys/compat/linux32/common/linux32_signal.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux32_signal.h,v 1.3 2011/11/18 04:08:56 christos Exp $ */ +/* $NetBSD: linux32_signal.h,v 1.4 2021/11/01 05:07:16 thorpej Exp $ */ /*- * Copyright (c) 2006 Emmanuel Dreyfus, all rights reserved. @@ -47,7 +47,7 @@ void linux32_to_native_sigaction(struct sigaction *, void native_to_linux32_sigaction(struct linux32_sigaction *, const struct sigaction *); void native_to_linux32_sigaltstack(struct linux32_sigaltstack *, - const struct sigaltstack *); + const stack_t *); void native_to_linux32_old_sigset(linux32_old_sigset_t *, const sigset_t *); void linux32_old_extra_to_native_sigset(sigset_t *, const linux32_old_sigset_t *, const unsigned long *); |
