PERFORCE change 173917 for review

[Jonathan Anderson]

http://p4web.freebsd.org/chv.cgi?CH=173917

Change 173917 by jona at jona-capsicum-kent64 on 2010/01/29 18:36:01

	Fixed an assertion in vm_map_insert which led to unnecessary panic

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_map.c#11 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/sys/vm/vm_map.c#11 (text+ko) ====

@@ -1136,7 +1136,7 @@
 	    ((protoeflags & MAP_ENTRY_NEEDS_COPY) || object == NULL))) {
 		if (!(cow & MAP_ACC_CHARGED) && !swap_reserve(end - start))
 			return (KERN_RESOURCE_SHORTAGE);
-		KASSERT(object == NULL || (cow & MAP_ENTRY_NEEDS_COPY) ||
+		KASSERT(object == NULL || (protoeflags & MAP_ENTRY_NEEDS_COPY) ||
 		    object->uip == NULL,
 		    ("OVERCOMMIT: vm_map_insert o %p", object));
 		uip = curthread->td_ucred->cr_ruidinfo;