From owner-svn-src-head@FreeBSD.ORG  Wed Mar 14 15:52:24 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 771AD1065677;
	Wed, 14 Mar 2012 15:52:24 +0000 (UTC) (envelope-from jh@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 672668FC12;
	Wed, 14 Mar 2012 15:52:24 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q2EFqOEr020382;
	Wed, 14 Mar 2012 15:52:24 GMT (envelope-from jh@svn.freebsd.org)
Received: (from jh@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2EFqO4U020380;
	Wed, 14 Mar 2012 15:52:24 GMT (envelope-from jh@svn.freebsd.org)
Message-Id: <201203141552.q2EFqO4U020380@svn.freebsd.org>
From: Jaakko Heinonen <jh@FreeBSD.org>
Date: Wed, 14 Mar 2012 15:52:24 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232975 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 14 Mar 2012 15:52:24 -0000

Author: jh
Date: Wed Mar 14 15:52:23 2012
New Revision: 232975
URL: http://svn.freebsd.org/changeset/base/232975

Log:
  Add an assert for proctree_lock to proc_to_reap().
  
  Discussed with:	kib
  MFC after:	1 week

Modified:
  head/sys/kern/kern_exit.c

Modified: head/sys/kern/kern_exit.c
==============================================================================
--- head/sys/kern/kern_exit.c	Wed Mar 14 15:39:59 2012	(r232974)
+++ head/sys/kern/kern_exit.c	Wed Mar 14 15:52:23 2012	(r232975)
@@ -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) {