Date: Wed, 4 May 2005 09:29:03 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 76476 for review Message-ID: <200505040929.j449T3ca033175@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=76476 Change 76476 by rwatson@rwatson_paprika on 2005/05/04 09:28:24 Synchronize to version of ksem.h committed to CVS. Affected files ... .. //depot/projects/trustedbsd/mac/sys/posix4/ksem.h#7 edit Differences ... ==== //depot/projects/trustedbsd/mac/sys/posix4/ksem.h#7 (text+ko) ==== @@ -1,13 +1,7 @@ /*- * Copyright (c) 2002 Alfred Perlstein <alfred@FreeBSD.org> - * Copyright (c) 2003 Networks Associates Technology, Inc. * All rights reserved. * - * This software was developed for the FreeBSD Project in part by Network - * Associates Laboratories, the Security Research Division of Network - * Associates, Inc. under DARPA/SPAWAR contract N66001-01-C-8035 ("CBOSS"), - * as part of the DARPA CHATS research program. - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -28,24 +22,17 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $FreeBSD: src/sys/posix4/ksem.h,v 1.1 2005/05/03 20:21:24 rwatson Exp $ */ -/* - * ksem.h: kernel structure supporing global/inter-process - * POSIX 1003.1b semaphores. This structure was originally a part of the - * src/sys/kern/uipc_sem.c source. It had to be separated to be used with - * the MAC framework and policies. - */ +#ifndef _POSIX4_KSEM_H_ +#define _POSIX4_KSEM_H_ -#ifndef _KSEM_H_ -#define _KSEM_H_ +#ifndef _KERNEL +#error "no user-servicable parts inside" +#endif -#include <sys/condvar.h> -#include <sys/proc.h> -#include <sys/queue.h> - -#ifdef _KERNEL - struct kuser { pid_t ku_pid; LIST_ENTRY(kuser) ku_next; @@ -68,5 +55,4 @@ struct label *ks_label; /* MAC label */ }; -#endif /* _KERNEL */ -#endif /* !_KSEM_H */ +#endif /* !_POSIX4_KSEM_H_ */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200505040929.j449T3ca033175>