diff options
| author | Philip Guenther <guenther@cvs.openbsd.org> | 2018-07-10 04:20:00 +0000 |
|---|---|---|
| committer | Philip Guenther <guenther@cvs.openbsd.org> | 2018-07-10 04:20:00 +0000 |
| commit | 84563ae4ac61f5d4628a59cc1f360bac3b358a91 (patch) | |
| tree | 9f1c9eefd3cc11188b6cb6067649b87f07cac5bd /sys/arch/socppc | |
| parent | 121f0ab6733b183e0cd858c2e7b05e1d87d20cfb (diff) | |
Move from sendsig() to its callers the initsiginfo() calls and
instead of passing sendsig() the code+type+val, pass a siginfo_t*
to copy from. Eliminate the indirection through struct emul for
sendsig(); we no longer have a SunOS4-compat version of sendsig()
ok deraadt@
Diffstat (limited to 'sys/arch/socppc')
| -rw-r--r-- | sys/arch/socppc/socppc/machdep.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/arch/socppc/socppc/machdep.c b/sys/arch/socppc/socppc/machdep.c index 830a2e24307..ef6cd748e55 100644 --- a/sys/arch/socppc/socppc/machdep.c +++ b/sys/arch/socppc/socppc/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.74 2018/04/12 17:13:44 deraadt Exp $ */ +/* $OpenBSD: machdep.c,v 1.75 2018/07/10 04:19:59 guenther Exp $ */ /* $NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $ */ /* @@ -468,8 +468,7 @@ setregs(struct proc *p, struct exec_package *pack, u_long stack, * Send a signal to process. */ void -sendsig(sig_t catcher, int sig, int mask, u_long code, int type, - union sigval val) +sendsig(sig_t catcher, int sig, sigset_t mask, const siginfo_t *ksip) { struct proc *p = curproc; struct trapframe *tf; @@ -502,7 +501,7 @@ sendsig(sig_t catcher, int sig, int mask, u_long code, int type, bcopy(tf, &frame.sf_sc.sc_frame, sizeof *tf); if (psp->ps_siginfo & sigmask(sig)) { frame.sf_sip = &fp->sf_si; - initsiginfo(&frame.sf_si, sig, code, type, val); + frame.sf_si = *ksip; } frame.sf_sc.sc_cookie = (long)&fp->sf_sc ^ p->p_p->ps_sigcookie; if (copyout(&frame, fp, sizeof frame) != 0) |