PERFORCE change 92450 for review

Robert Watson rwatson at FreeBSD.org
Sun Feb 26 17:43:50 PST 2006


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

Change 92450 by rwatson at 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_ */


More information about the trustedbsd-cvs mailing list