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/sh | |
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/sh')
-rw-r--r-- | sys/arch/sh/sh/sh_machdep.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/arch/sh/sh/sh_machdep.c b/sys/arch/sh/sh/sh_machdep.c index 218db7f2e75..56f32389dac 100644 --- a/sys/arch/sh/sh/sh_machdep.c +++ b/sys/arch/sh/sh/sh_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sh_machdep.c,v 1.47 2018/04/12 17:13:44 deraadt Exp $ */ +/* $OpenBSD: sh_machdep.c,v 1.48 2018/07/10 04:19:59 guenther Exp $ */ /* $NetBSD: sh3_machdep.c,v 1.59 2006/03/04 01:13:36 uwe Exp $ */ /* @@ -448,8 +448,7 @@ struct sigframe { * Send an interrupt 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 sigframe *fp, frame; @@ -470,7 +469,7 @@ sendsig(sig_t catcher, int sig, int mask, u_long code, int type, bzero(&frame, sizeof(frame)); if (psp->ps_siginfo & sigmask(sig)) { - initsiginfo(&frame.sf_si, sig, code, type, val); + frame.sf_si = *ksip; sip = &fp->sf_si; } else sip = NULL; |