Date: Wed, 13 Oct 2004 09:43:23 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 63146 for review Message-ID: <200410130943.i9D9hNpj092169@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=63146 Change 63146 by rwatson@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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200410130943.i9D9hNpj092169>