PERFORCE change 33754 for review

[John Baldwin]

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

Change 33754 by jhb at 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) &&