From owner-p4-projects@FreeBSD.ORG Wed May 4 09:29:24 2005 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3774A16A4D0; Wed, 4 May 2005 09:29:24 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E261B16A4CE for ; Wed, 4 May 2005 09:29:23 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id B6A9F43D8C for ; Wed, 4 May 2005 09:29:23 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j449T32f033178 for ; Wed, 4 May 2005 09:29:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j449T3ca033175 for perforce@freebsd.org; Wed, 4 May 2005 09:29:03 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Wed, 4 May 2005 09:29:03 GMT Message-Id: <200505040929.j449T3ca033175@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 76476 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 May 2005 09:29:24 -0000 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 - * 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 -#include -#include - -#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_ */