From owner-p4-projects@FreeBSD.ORG  Mon Oct 24 20:52:02 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 73B9F16A421; Mon, 24 Oct 2005 20:52:02 +0000 (GMT)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4B41916A41F
	for <perforce@freebsd.org>; Mon, 24 Oct 2005 20:52:02 +0000 (GMT)
	(envelope-from alc@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 05ED143D45
	for <perforce@freebsd.org>; Mon, 24 Oct 2005 20:52:02 +0000 (GMT)
	(envelope-from alc@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j9OKq1Va044724
	for <perforce@freebsd.org>; Mon, 24 Oct 2005 20:52:01 GMT
	(envelope-from alc@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j9OKq1fe044721
	for perforce@freebsd.org; Mon, 24 Oct 2005 20:52:01 GMT
	(envelope-from alc@freebsd.org)
Date: Mon, 24 Oct 2005 20:52:01 GMT
Message-Id: <200510242052.j9OKq1fe044721@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	alc@freebsd.org using -f
From: Alan Cox <alc@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 85796 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Oct 2005 20:52:03 -0000

http://perforce.freebsd.org/chv.cgi?CH=85796

Change 85796 by alc@alc_sp01 on 2005/10/24 20:51:17

	Assert that the containing object is locked in preempt().

Affected files ...

.. //depot/projects/superpages/src/sys/vm/vm_reserve.c#6 edit

Differences ...

==== //depot/projects/superpages/src/sys/vm/vm_reserve.c#6 (text+ko) ====

@@ -414,6 +414,7 @@
 	vm_page_t p;
 
 	KASSERT(sp,("preempt: reservation is NULL"));
+	VM_OBJECT_LOCK_ASSERT(sp->object, MA_OWNED);
 
 	if (m) {
 		if (m->reserv->broken) reserve_lazy_update(m);