svn commit: r233281 - in stable/9/sys: i386/conf kern

[Jaakko Heinonen]

Author: jh
Date: Wed Mar 21 16:16:59 2012
New Revision: 233281
URL: http://svn.freebsd.org/changeset/base/233281

Log:
  MFC r232975: Add an assert for proctree_lock to proc_to_reap().

Modified:
  stable/9/sys/kern/kern_exit.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)
  stable/9/sys/fs/   (props changed)
  stable/9/sys/fs/ntfs/   (props changed)
  stable/9/sys/i386/conf/XENHVM   (props changed)

Modified: stable/9/sys/kern/kern_exit.c
==============================================================================
--- stable/9/sys/kern/kern_exit.c	Wed Mar 21 16:01:15 2012	(r233280)
+++ stable/9/sys/kern/kern_exit.c	Wed Mar 21 16:16:59 2012	(r233281)
@@ -814,6 +814,8 @@ proc_to_reap(struct thread *td, struct p
 {
 	struct proc *q;
 
+	sx_assert(&proctree_lock, SA_XLOCKED);
+
 	q = td->td_proc;
 	PROC_LOCK(p);
 	if (pid != WAIT_ANY && p->p_pid != pid && p->p_pgid != -pid) {