Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt to SIGINFO changes.

This commit is contained in:
matt 2003-10-10 02:26:54 +00:00
parent 590ae9d0df
commit 25fb6de823
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/compat/linux/arch/alpha/linux_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_machdep.c,v 1.29 2003/09/26 12:02:57 simonb Exp $ */ /* $NetBSD: linux_machdep.c,v 1.30 2003/10/10 02:26:54 matt Exp $ */
/*- /*-
* Copyright (c) 1998 The NetBSD Foundation, Inc. * Copyright (c) 1998 The NetBSD Foundation, Inc.
@ -42,7 +42,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.29 2003/09/26 12:02:57 simonb Exp $"); __KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.30 2003/10/10 02:26:54 matt Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -118,10 +118,8 @@ linux_setregs(l, epp, stack)
#endif #endif
} }
void setup_linux_rt_sigframe(tf, sig, mask) void
struct trapframe *tf; setup_linux_rt_sigframe(struct trapframe *tf, int sig, const sigset_t *mask)
int sig;
sigset_t *mask;
{ {
struct lwp *l = curlwp; struct lwp *l = curlwp;
struct proc *p = l->l_proc; struct proc *p = l->l_proc;
@ -155,7 +153,7 @@ void setup_linux_rt_sigframe(tf, sig, mask)
/* /*
* Build the signal context to be used by sigreturn. * Build the signal context to be used by sigreturn.
*/ */
bzero(&sigframe.uc, sizeof(struct linux_ucontext)); memset(&sigframe.uc, 0, sizeof(struct linux_ucontext));
sigframe.uc.uc_mcontext.sc_onstack = onstack; sigframe.uc.uc_mcontext.sc_onstack = onstack;
/* Setup potentially partial signal mask in sc_mask. */ /* Setup potentially partial signal mask in sc_mask. */
@ -183,7 +181,7 @@ void setup_linux_rt_sigframe(tf, sig, mask)
* XXX Or we do the emuldata thing. * XXX Or we do the emuldata thing.
* XXX -erh * XXX -erh
*/ */
bzero(&sigframe.info, sizeof(struct linux_siginfo)); memset(&sigframe.info, 0, sizeof(struct linux_siginfo));
sigframe.info.lsi_signo = sig; sigframe.info.lsi_signo = sig;
sigframe.info.lsi_code = LINUX_SI_USER; sigframe.info.lsi_code = LINUX_SI_USER;
sigframe.info.lsi_pid = p->p_pid; sigframe.info.lsi_pid = p->p_pid;
@ -256,7 +254,7 @@ void setup_linux_sigframe(tf, sig, mask)
/* /*
* Build the signal context to be used by sigreturn. * Build the signal context to be used by sigreturn.
*/ */
bzero(&sigframe.sf_sc, sizeof(struct linux_ucontext)); memset(&sigframe.sf_sc, 0, sizeof(struct linux_ucontext));
sigframe.sf_sc.sc_onstack = onstack; sigframe.sf_sc.sc_onstack = onstack;
native_to_linux_old_sigset(&sigframe.sf_sc.sc_mask, mask); native_to_linux_old_sigset(&sigframe.sf_sc.sc_mask, mask);
sigframe.sf_sc.sc_pc = tf->tf_regs[FRAME_PC]; sigframe.sf_sc.sc_pc = tf->tf_regs[FRAME_PC];
@ -318,14 +316,12 @@ void setup_linux_sigframe(tf, sig, mask)
* specified pc, psl. * specified pc, psl.
*/ */
void void
linux_sendsig(sig, mask, code) linux_sendsig(const ksiginfo_t *ksi, const sigset_t *mask)
int sig;
const sigset_t *mask;
u_long code;
{ {
struct lwp *l = curlwp; struct lwp *l = curlwp;
struct proc *p = l->l_proc; struct proc *p = l->l_proc;
struct trapframe *tf = l->l_md.md_tf; struct trapframe *tf = l->l_md.md_tf;
const int sig = ksi->ksi_signo;
sig_t catcher = SIGACTION(p, sig).sa_handler; sig_t catcher = SIGACTION(p, sig).sa_handler;
#ifdef notyet #ifdef notyet
struct linux_emuldata *edp; struct linux_emuldata *edp;