summaryrefslogtreecommitdiff
path: root/sys/compat/linux
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2021-11-01 05:07:15 +0000
committerthorpej <thorpej@NetBSD.org>2021-11-01 05:07:15 +0000
commiteb96f2ebad312da7489a018c02fd03c8dbe82bae (patch)
tree30c44005eb1fa6d100b6bf3b3115aa0e02107671 /sys/compat/linux
parent540021409c37ce67e3a28a40e3b15431d458d3cc (diff)
Use "stack_t" instead of "struct sigaltstack", as the former is the
newer standardized name. NFC.
Diffstat (limited to 'sys/compat/linux')
-rw-r--r--sys/compat/linux/arch/aarch64/linux_machdep.c6
-rw-r--r--sys/compat/linux/arch/i386/linux_machdep.c15
-rw-r--r--sys/compat/linux/common/linux_signal.c12
-rw-r--r--sys/compat/linux/common/linux_signal.h5
4 files changed, 19 insertions, 19 deletions
diff --git a/sys/compat/linux/arch/aarch64/linux_machdep.c b/sys/compat/linux/arch/aarch64/linux_machdep.c
index 6387761c907..38b5639b34b 100644
--- a/sys/compat/linux/arch/aarch64/linux_machdep.c
+++ b/sys/compat/linux/arch/aarch64/linux_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_machdep.c,v 1.2 2021/10/09 07:01:34 ryo Exp $ */
+/* $NetBSD: linux_machdep.c,v 1.3 2021/11/01 05:07:16 thorpej Exp $ */
/*-
* Copyright (c) 2021 Ryo Shimizu <ryo@nerv.org>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.2 2021/10/09 07:01:34 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.3 2021/11/01 05:07:16 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -133,7 +133,7 @@ linux_sendsig(const ksiginfo_t *ksi, const sigset_t *mask)
struct lwp * const l = curlwp;
struct proc * const p = l->l_proc;
struct trapframe * const tf = lwp_trapframe(l);
- struct sigaltstack * const ss = &l->l_sigstk;
+ stack_t * const ss = &l->l_sigstk;
const int sig = ksi->ksi_signo;
const sig_t handler = SIGACTION(p, sig).sa_handler;
struct linux_rt_sigframe *u_sigframe, *tmp_sigframe;
diff --git a/sys/compat/linux/arch/i386/linux_machdep.c b/sys/compat/linux/arch/i386/linux_machdep.c
index e128ef75749..16216083029 100644
--- a/sys/compat/linux/arch/i386/linux_machdep.c
+++ b/sys/compat/linux/arch/i386/linux_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_machdep.c,v 1.168 2021/09/07 11:43:04 riastradh Exp $ */
+/* $NetBSD: linux_machdep.c,v 1.169 2021/11/01 05:07:16 thorpej Exp $ */
/*-
* Copyright (c) 1995, 2000, 2008, 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.168 2021/09/07 11:43:04 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.169 2021/11/01 05:07:16 thorpej Exp $");
#if defined(_KERNEL_OPT)
#include "opt_user_ldt.h"
@@ -109,7 +109,7 @@ extern struct disklist *x86_alldisks;
static struct biosdisk_info *fd2biosinfo(struct proc *, struct file *);
static void linux_save_ucontext(struct lwp *, struct trapframe *,
- const sigset_t *, struct sigaltstack *, struct linux_ucontext *);
+ const sigset_t *, stack_t *, struct linux_ucontext *);
static void linux_save_sigcontext(struct lwp *, struct trapframe *,
const sigset_t *, struct linux_sigcontext *);
static int linux_restore_sigcontext(struct lwp *,
@@ -175,7 +175,8 @@ linux_sendsig(const ksiginfo_t *ksi, const sigset_t *mask)
static void
-linux_save_ucontext(struct lwp *l, struct trapframe *tf, const sigset_t *mask, struct sigaltstack *sas, struct linux_ucontext *uc)
+linux_save_ucontext(struct lwp *l, struct trapframe *tf, const sigset_t *mask,
+ stack_t *sas, struct linux_ucontext *uc)
{
uc->uc_flags = 0;
uc->uc_link = NULL;
@@ -232,7 +233,7 @@ linux_rt_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? */
@@ -311,7 +312,7 @@ linux_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;
@@ -425,7 +426,7 @@ linux_restore_sigcontext(struct lwp *l, struct linux_sigcontext *scp,
register_t *retval)
{
struct proc *p = l->l_proc;
- struct sigaltstack *sas = &l->l_sigstk;
+ stack_t *sas = &l->l_sigstk;
struct trapframe *tf;
sigset_t mask;
ssize_t ss_gap;
diff --git a/sys/compat/linux/common/linux_signal.c b/sys/compat/linux/common/linux_signal.c
index 49d700267d1..4c0faf66cf0 100644
--- a/sys/compat/linux/common/linux_signal.c
+++ b/sys/compat/linux/common/linux_signal.c
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_signal.c,v 1.87 2021/10/27 16:40:05 thorpej Exp $ */
+/* $NetBSD: linux_signal.c,v 1.88 2021/11/01 05:07:16 thorpej Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.87 2021/10/27 16:40:05 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_signal.c,v 1.88 2021/11/01 05:07:16 thorpej Exp $");
#define COMPAT_LINUX 1
@@ -678,11 +678,11 @@ linux_sys_kill(struct lwp *l, const struct linux_sys_kill_args *uap, register_t
}
#ifdef LINUX_SS_ONSTACK
-static void linux_to_native_sigaltstack(struct sigaltstack *,
+static void linux_to_native_sigaltstack(stack_t *,
const struct linux_sigaltstack *);
static void
-linux_to_native_sigaltstack(struct sigaltstack *bss, const struct linux_sigaltstack *lss)
+linux_to_native_sigaltstack(stack_t *bss, const struct linux_sigaltstack *lss)
{
bss->ss_sp = lss->ss_sp;
bss->ss_size = lss->ss_size;
@@ -695,7 +695,7 @@ linux_to_native_sigaltstack(struct sigaltstack *bss, const struct linux_sigaltst
}
void
-native_to_linux_sigaltstack(struct linux_sigaltstack *lss, const struct sigaltstack *bss)
+native_to_linux_sigaltstack(struct linux_sigaltstack *lss, const stack_t *bss)
{
memset(lss, 0, sizeof(*lss));
lss->ss_sp = bss->ss_sp;
@@ -716,7 +716,7 @@ linux_sys_sigaltstack(struct lwp *l, const struct linux_sys_sigaltstack_args *ua
syscallarg(struct linux_sigaltstack *) oss;
} */
struct linux_sigaltstack ss;
- struct sigaltstack nss;
+ stack_t nss;
struct proc *p = l->l_proc;
int error = 0;
diff --git a/sys/compat/linux/common/linux_signal.h b/sys/compat/linux/common/linux_signal.h
index 6b9f39c3f3f..4cd86ea12fa 100644
--- a/sys/compat/linux/common/linux_signal.h
+++ b/sys/compat/linux/common/linux_signal.h
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_signal.h,v 1.33 2021/09/23 06:56:27 ryo Exp $ */
+/* $NetBSD: linux_signal.h,v 1.34 2021/11/01 05:07:16 thorpej Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -102,8 +102,7 @@ void linux_to_native_sigaction(struct sigaction *,
void native_to_linux_sigaction(struct linux_sigaction *,
const struct sigaction *);
-void native_to_linux_sigaltstack(struct linux_sigaltstack *,
- const struct sigaltstack *);
+void native_to_linux_sigaltstack(struct linux_sigaltstack *, const stack_t *);
int native_to_linux_si_code(int);
int native_to_linux_si_status(int, int);