From owner-p4-projects@FreeBSD.ORG  Fri Jun 27 12:53:08 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0368A37B404; Fri, 27 Jun 2003 12:53:08 -0700 (PDT)
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 8E1E137B401
	for <perforce@freebsd.org>; Fri, 27 Jun 2003 12:53:07 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 32D9443FE0
	for <perforce@freebsd.org>; Fri, 27 Jun 2003 12:53:07 -0700 (PDT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h5RJr60U083301
	for <perforce@freebsd.org>; Fri, 27 Jun 2003 12:53:06 -0700 (PDT)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h5RJr6pD083289
	for perforce@freebsd.org; Fri, 27 Jun 2003 12:53:06 -0700 (PDT)
Date: Fri, 27 Jun 2003 12:53:06 -0700 (PDT)
Message-Id: <200306271953.h5RJr6pD083289@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 33754 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Fri, 27 Jun 2003 19:53:08 -0000

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

Change 33754 by jhb@jhb_laptop on 2003/06/27 12:52:44

	IFC @33750.

Affected files ...

.. //depot/projects/smpng/sys/vm/vm_map.c#38 integrate
.. //depot/user/jhb/acpipci/vm/vm_map.c#13 integrate

Differences ...

==== //depot/projects/smpng/sys/vm/vm_map.c#38 (text+ko) ====

@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.299 2003/06/25 05:31:02 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.300 2003/06/27 18:52:49 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -821,14 +821,10 @@
 		 * reference counting is insufficient to recognize
 		 * aliases with precision.) 
 		 */
-		if (object != kmem_object)
-			mtx_lock(&Giant);
 		VM_OBJECT_LOCK(object);
 		if (object->ref_count > 1 || object->shadow_count != 0)
 			vm_object_clear_flag(object, OBJ_ONEMAPPING);
 		VM_OBJECT_UNLOCK(object);
-		if (object != kmem_object)
-			mtx_unlock(&Giant);
 	}
 	else if ((prev_entry != &map->header) &&
 		 (prev_entry->eflags == protoeflags) &&

==== //depot/user/jhb/acpipci/vm/vm_map.c#13 (text+ko) ====

@@ -67,7 +67,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.299 2003/06/25 05:31:02 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/vm/vm_map.c,v 1.300 2003/06/27 18:52:49 alc Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -821,14 +821,10 @@
 		 * reference counting is insufficient to recognize
 		 * aliases with precision.) 
 		 */
-		if (object != kmem_object)
-			mtx_lock(&Giant);
 		VM_OBJECT_LOCK(object);
 		if (object->ref_count > 1 || object->shadow_count != 0)
 			vm_object_clear_flag(object, OBJ_ONEMAPPING);
 		VM_OBJECT_UNLOCK(object);
-		if (object != kmem_object)
-			mtx_unlock(&Giant);
 	}
 	else if ((prev_entry != &map->header) &&
 		 (prev_entry->eflags == protoeflags) &&