PERFORCE change 63146 for review

[Robert Watson]

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

Change 63146 by rwatson at rwatson_tislabs on 2004/10/13 09:42:37

	Correct a mis-merge: in the TrustedBSD MAC tree, the kernel uses
	a wrapper structure for System V SHM segment descriptions to avoid
	breaking the ABI.  I neglected to adapt a FreeBSD-derived change
	to use the wrapper.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/kern/sysv_shm.c#24 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/kern/sysv_shm.c#24 (text+ko) ====

@@ -405,7 +405,7 @@
 	rv = vm_map_find(&p->p_vmspace->vm_map, shmseg->u.shm_internal,
 		0, &attach_va, size, (flags & MAP_FIXED)?0:1, prot, prot, 0);
 	if (rv != KERN_SUCCESS) {
-		vm_object_deallocate(shmseg->shm_internal);
+		vm_object_deallocate(shmseg->u.shm_internal);
 		error = ENOMEM;
 		goto done2;
 	}
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message