Correct the sharing of the signal handling state: stuff that should

be shared (p_sigignore, p_sigcatch, P_NOCLDSTOP, P_NOCLDWAIT) moves
to struct sigacts, wihle stuff that should be per rthread (ps_oldmask,
SAS_OLDMASK, ps_sigstk) moves to struct proc.  Treat the coredumping
state bits (ps_sig, ps_code, ps_type, ps_sigval) as per-rthread
until our locking around coredumping is better.

Oh, and remove the old SunOS-compat ps_usertramp member.

"I like the sound of this" tedu@

1 files changed, 5 insertions, 5 deletions

diff --git a/sys/kern/exec_elf.c b/sys/kern/exec_elf.c
index fe425ad2b36..92f3af0e761 100644
--- a/sys/kern/exec_elf.c
+++ b/sys/kern/exec_elf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: exec_elf.c,v 1.79 2011/04/05 12:50:15 guenther Exp $	*/
+/*	$OpenBSD: exec_elf.c,v 1.80 2011/04/15 04:52:40 guenther Exp $	*/
 
 /*
  * Copyright (c) 1996 Per Fogelstrom
@@ -1147,13 +1147,13 @@ ELFNAMEEND(coredump_notes)(struct proc *p, void *iocookie, size_t *sizep)
 
 		cpi.cpi_version = ELFCORE_PROCINFO_VERSION;
 		cpi.cpi_cpisize = sizeof(cpi);
-		cpi.cpi_signo = p->p_sigacts->ps_sig;
-		cpi.cpi_sigcode = p->p_sigacts->ps_code;
+		cpi.cpi_signo = p->p_sisig;
+		cpi.cpi_sigcode = p->p_sicode;
 
 		cpi.cpi_sigpend = p->p_siglist;
 		cpi.cpi_sigmask = p->p_sigmask;
-		cpi.cpi_sigignore = p->p_sigignore;
-		cpi.cpi_sigcatch = p->p_sigcatch;
+		cpi.cpi_sigignore = p->p_sigacts->ps_sigignore;
+		cpi.cpi_sigcatch = p->p_sigacts->ps_sigcatch;
 
 		cpi.cpi_pid = pr->ps_pid;
 		cpi.cpi_ppid = pr->ps_pptr->ps_pid;