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/m88k | |
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/m88k')
-rw-r--r-- | sys/arch/m88k/m88k/sig_machdep.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/arch/m88k/m88k/sig_machdep.c b/sys/arch/m88k/m88k/sig_machdep.c index 7b9766ab7b5..579ac281b31 100644 --- a/sys/arch/m88k/m88k/sig_machdep.c +++ b/sys/arch/m88k/m88k/sig_machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sig_machdep.c,v 1.28 2018/04/12 17:13:43 deraadt Exp $ */ +/* $OpenBSD: sig_machdep.c,v 1.29 2018/07/10 04:19:59 guenther Exp $ */ /* * Copyright (c) 2014 Miodrag Vallat. * @@ -104,8 +104,7 @@ pid_t sigpid = 0; * Send an interrupt to process. */ void -sendsig(sig_t catcher, int sig, int mask, unsigned 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; @@ -144,7 +143,7 @@ sendsig(sig_t catcher, int sig, int mask, unsigned long code, int type, sf.sf_sc.sc_cookie = (long)sf.sf_scp ^ p->p_p->ps_sigcookie; if (psp->ps_siginfo & sigmask(sig)) - initsiginfo(&sf.sf_si, sig, code, type, val); + sf.sf_si = *ksip; /* * Copy the whole user context into signal context that we |