From owner-trustedbsd-cvs@FreeBSD.ORG Mon Feb 27 01:43:50 2006 Return-Path: X-Original-To: trustedbsd-cvs@freebsd.org Delivered-To: trustedbsd-cvs@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 90C8516A438 for ; Mon, 27 Feb 2006 01:43:50 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.FreeBSD.org (Postfix) with ESMTP id F18E343D48 for ; Mon, 27 Feb 2006 01:43:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: from mx2.freebsd.org (mx2.freebsd.org [216.136.204.119]) by cyrus.watson.org (Postfix) with ESMTP id D7D7246C1E for ; Sun, 26 Feb 2006 20:43:31 -0500 (EST) Received: from hub.freebsd.org (hub.freebsd.org [216.136.204.18]) by mx2.freebsd.org (Postfix) with ESMTP id 1E2F355403; Mon, 27 Feb 2006 01:43:49 +0000 (GMT) (envelope-from owner-perforce@freebsd.org) Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E13116A423; Mon, 27 Feb 2006 01:43:49 +0000 (GMT) X-Original-To: perforce@freebsd.org 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 9302D16A420 for ; Mon, 27 Feb 2006 01:43:48 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5780643D48 for ; Mon, 27 Feb 2006 01:43:48 +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 k1R1hmEu059096 for ; Mon, 27 Feb 2006 01:43:48 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 k1R1hm2l059093 for perforce@freebsd.org; Mon, 27 Feb 2006 01:43:48 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 27 Feb 2006 01:43:48 GMT Message-Id: <200602270143.k1R1hm2l059093@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 Cc: Subject: PERFORCE change 92450 for review X-BeenThere: trustedbsd-cvs@FreeBSD.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: TrustedBSD CVS and Perforce commit message list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 Feb 2006 01:43:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=92450 Change 92450 by rwatson@rwatson_peppercorn on 2006/02/27 01:43:22 A bit of localization: don't confuse matters by having a literal $FreeBSD$ in the source, or CVS will get upset later when we import it into FreeBSD. Do add a $P4$. Remove stuff specific to the FreeBSD kernel. Affected files ... .. //depot/projects/trustedbsd/openbsm/compat/queue.h#2 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/compat/queue.h#2 (text+ko) ==== @@ -27,7 +27,9 @@ * SUCH DAMAGE. * * @(#)queue.h 8.5 (Berkeley) 8/20/94 - * $FreeBSD: src/sys/sys/queue.h,v 1.63 2005/11/23 04:02:27 emaste Exp $ + * + * Derived from FreeBSD src/sys/sys/queue.h:1.63. + * $P4: //depot/projects/trustedbsd/openbsm/compat/queue.h#2 $ */ #ifndef _SYS_QUEUE_H_ @@ -537,50 +539,4 @@ QMD_TRACE_ELEM(&(elm)->field); \ } while (0) - -#ifdef _KERNEL - -/* - * XXX insque() and remque() are an old way of handling certain queues. - * They bogusly assumes that all queue heads look alike. - */ - -struct quehead { - struct quehead *qh_link; - struct quehead *qh_rlink; -}; - -#ifdef __CC_SUPPORTS___INLINE - -static __inline void -insque(void *a, void *b) -{ - struct quehead *element = (struct quehead *)a, - *head = (struct quehead *)b; - - element->qh_link = head->qh_link; - element->qh_rlink = head; - head->qh_link = element; - element->qh_link->qh_rlink = element; -} - -static __inline void -remque(void *a) -{ - struct quehead *element = (struct quehead *)a; - - element->qh_link->qh_rlink = element->qh_rlink; - element->qh_rlink->qh_link = element->qh_link; - element->qh_rlink = 0; -} - -#else /* !__CC_SUPPORTS___INLINE */ - -void insque(void *a, void *b); -void remque(void *a); - -#endif /* __CC_SUPPORTS___INLINE */ - -#endif /* _KERNEL */ - #endif /* !_SYS_QUEUE_H_ */