From db612abe8df3355d1eb23bb3b50fdd97bc21e979 Mon Sep 17 00:00:00 2001
From: John Birrell <jb@FreeBSD.org>
Date: Tue, 22 Apr 2008 07:43:00 +0000
Subject: [PATCH] Add FreeBSD IDs to files that originate in FreeBSD.

---
 cddl/compat/opensolaris/include/devid.h               | 2 ++
 cddl/compat/opensolaris/include/libintl.h             | 2 ++
 cddl/compat/opensolaris/include/mnttab.h              | 2 ++
 cddl/compat/opensolaris/include/priv.h                | 2 ++
 cddl/compat/opensolaris/include/solaris.h             | 2 ++
 cddl/compat/opensolaris/include/zone.h                | 2 ++
 cddl/compat/opensolaris/lib/libumem/umem.c            | 2 ++
 cddl/compat/opensolaris/lib/libumem/umem.h            | 2 ++
 cddl/compat/opensolaris/misc/mkdirp.c                 | 2 ++
 sys/cddl/compat/opensolaris/kern/opensolaris_string.c | 2 ++
 sys/cddl/compat/opensolaris/rpc/xdr.h                 | 2 ++
 sys/cddl/compat/opensolaris/sys/acl.h                 | 2 ++
 sys/cddl/compat/opensolaris/sys/bitmap.h              | 2 ++
 sys/cddl/compat/opensolaris/sys/byteorder.h           | 2 ++
 sys/cddl/compat/opensolaris/sys/callb.h               | 2 ++
 sys/cddl/compat/opensolaris/sys/cpupart.h             | 2 ++
 sys/cddl/compat/opensolaris/sys/cpuvar.h              | 2 ++
 sys/cddl/compat/opensolaris/sys/dkio.h                | 2 ++
 sys/cddl/compat/opensolaris/sys/mntent.h              | 2 ++
 sys/cddl/compat/opensolaris/sys/objfs.h               | 2 ++
 sys/cddl/compat/opensolaris/sys/sysmacros.h           | 2 ++
 sys/cddl/compat/opensolaris/sys/taskq.h               | 2 ++
 sys/cddl/compat/opensolaris/sys/taskq_impl.h          | 2 ++
 23 files changed, 46 insertions(+)

diff --git a/cddl/compat/opensolaris/include/devid.h b/cddl/compat/opensolaris/include/devid.h
index 6718ce2b9fbc..205e461f8956 100644
--- a/cddl/compat/opensolaris/include/devid.h
+++ b/cddl/compat/opensolaris/include/devid.h
@@ -18,6 +18,8 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * $FreeBSD$
  */
 /*
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
diff --git a/cddl/compat/opensolaris/include/libintl.h b/cddl/compat/opensolaris/include/libintl.h
index 595434493e74..da13f4749081 100644
--- a/cddl/compat/opensolaris/include/libintl.h
+++ b/cddl/compat/opensolaris/include/libintl.h
@@ -1,3 +1,5 @@
+/* $FreeBSD$ */
+
 #ifndef	_LIBINTL_H_
 #define	_LIBINTL_H_
 
diff --git a/cddl/compat/opensolaris/include/mnttab.h b/cddl/compat/opensolaris/include/mnttab.h
index 6e7d28c1ee01..9d0bfc72b9a3 100644
--- a/cddl/compat/opensolaris/include/mnttab.h
+++ b/cddl/compat/opensolaris/include/mnttab.h
@@ -1,3 +1,5 @@
+/* $FreeBSD$ */
+
 #ifndef	_OPENSOLARIS_MNTTAB_H_
 #define	_OPENSOLARIS_MNTTAB_H_
 
diff --git a/cddl/compat/opensolaris/include/priv.h b/cddl/compat/opensolaris/include/priv.h
index 78eae1a3cda2..32696ae5668b 100644
--- a/cddl/compat/opensolaris/include/priv.h
+++ b/cddl/compat/opensolaris/include/priv.h
@@ -1,3 +1,5 @@
+/* $FreeBSD$ */
+
 #ifndef	_OPENSOLARIS_PRIV_H_
 #define	_OPENSOLARIS_PRIV_H_
 
diff --git a/cddl/compat/opensolaris/include/solaris.h b/cddl/compat/opensolaris/include/solaris.h
index fbdd8c680352..01f9d4776abc 100644
--- a/cddl/compat/opensolaris/include/solaris.h
+++ b/cddl/compat/opensolaris/include/solaris.h
@@ -1,3 +1,5 @@
+/* $FreeBSD$ */
+
 #ifndef	_SOLARIS_H_
 #define	_SOLARIS_H_
 
diff --git a/cddl/compat/opensolaris/include/zone.h b/cddl/compat/opensolaris/include/zone.h
index 487f02f6db49..8c377cf6574d 100644
--- a/cddl/compat/opensolaris/include/zone.h
+++ b/cddl/compat/opensolaris/include/zone.h
@@ -1,3 +1,5 @@
+/* $FreeBSD$ */
+
 #ifndef	_ZONE_H_
 #define	_ZONE_H_
 
diff --git a/cddl/compat/opensolaris/lib/libumem/umem.c b/cddl/compat/opensolaris/lib/libumem/umem.c
index e9662ce3c1e8..9dc101f2e65f 100644
--- a/cddl/compat/opensolaris/lib/libumem/umem.c
+++ b/cddl/compat/opensolaris/lib/libumem/umem.c
@@ -17,6 +17,8 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * $FreeBSD$
  */
 /*
  * Copyright 2006 Ricardo Correia.  All rights reserved.
diff --git a/cddl/compat/opensolaris/lib/libumem/umem.h b/cddl/compat/opensolaris/lib/libumem/umem.h
index 971cde36e1b2..da4b32fa551e 100644
--- a/cddl/compat/opensolaris/lib/libumem/umem.h
+++ b/cddl/compat/opensolaris/lib/libumem/umem.h
@@ -18,6 +18,8 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * $FreeBSD$
  */
 /*
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
diff --git a/cddl/compat/opensolaris/misc/mkdirp.c b/cddl/compat/opensolaris/misc/mkdirp.c
index 06cec5b5062f..76a90ad0ec30 100644
--- a/cddl/compat/opensolaris/misc/mkdirp.c
+++ b/cddl/compat/opensolaris/misc/mkdirp.c
@@ -18,6 +18,8 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * $FreeBSD$
  */
 
 /*	Copyright (c) 1988 AT&T	*/
diff --git a/sys/cddl/compat/opensolaris/kern/opensolaris_string.c b/sys/cddl/compat/opensolaris/kern/opensolaris_string.c
index 4448f3485ccf..de9169e9df2e 100644
--- a/sys/cddl/compat/opensolaris/kern/opensolaris_string.c
+++ b/sys/cddl/compat/opensolaris/kern/opensolaris_string.c
@@ -17,6 +17,8 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * $FreeBSD$
  */
 /*
  * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
diff --git a/sys/cddl/compat/opensolaris/rpc/xdr.h b/sys/cddl/compat/opensolaris/rpc/xdr.h
index d845c27cc4e8..5802f3f12baa 100644
--- a/sys/cddl/compat/opensolaris/rpc/xdr.h
+++ b/sys/cddl/compat/opensolaris/rpc/xdr.h
@@ -18,6 +18,8 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * $FreeBSD$
  */
 /*
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
diff --git a/sys/cddl/compat/opensolaris/sys/acl.h b/sys/cddl/compat/opensolaris/sys/acl.h
index 4fba7904f905..a7c9566dbc39 100644
--- a/sys/cddl/compat/opensolaris/sys/acl.h
+++ b/sys/cddl/compat/opensolaris/sys/acl.h
@@ -17,6 +17,8 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * $FreeBSD$
  */
 /*
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
diff --git a/sys/cddl/compat/opensolaris/sys/bitmap.h b/sys/cddl/compat/opensolaris/sys/bitmap.h
index d75b8bd1d91c..f3130dfb822f 100644
--- a/sys/cddl/compat/opensolaris/sys/bitmap.h
+++ b/sys/cddl/compat/opensolaris/sys/bitmap.h
@@ -17,6 +17,8 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/cddl/compat/opensolaris/sys/byteorder.h b/sys/cddl/compat/opensolaris/sys/byteorder.h
index 08a04cde3f22..a8f8bc2569e3 100644
--- a/sys/cddl/compat/opensolaris/sys/byteorder.h
+++ b/sys/cddl/compat/opensolaris/sys/byteorder.h
@@ -17,6 +17,8 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/cddl/compat/opensolaris/sys/callb.h b/sys/cddl/compat/opensolaris/sys/callb.h
index 1894beb4e80d..070d0f973bf9 100644
--- a/sys/cddl/compat/opensolaris/sys/callb.h
+++ b/sys/cddl/compat/opensolaris/sys/callb.h
@@ -18,6 +18,8 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * $FreeBSD$
  */
 /*
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
diff --git a/sys/cddl/compat/opensolaris/sys/cpupart.h b/sys/cddl/compat/opensolaris/sys/cpupart.h
index 29e0910826df..560339b0b35e 100644
--- a/sys/cddl/compat/opensolaris/sys/cpupart.h
+++ b/sys/cddl/compat/opensolaris/sys/cpupart.h
@@ -17,6 +17,8 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/cddl/compat/opensolaris/sys/cpuvar.h b/sys/cddl/compat/opensolaris/sys/cpuvar.h
index 11b591fadfd4..012954d0825b 100644
--- a/sys/cddl/compat/opensolaris/sys/cpuvar.h
+++ b/sys/cddl/compat/opensolaris/sys/cpuvar.h
@@ -17,6 +17,8 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * $FreeBSD$
  */
 
 /*
diff --git a/sys/cddl/compat/opensolaris/sys/dkio.h b/sys/cddl/compat/opensolaris/sys/dkio.h
index 89b6725d2898..a365c335c421 100644
--- a/sys/cddl/compat/opensolaris/sys/dkio.h
+++ b/sys/cddl/compat/opensolaris/sys/dkio.h
@@ -17,6 +17,8 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * $FreeBSD$
  */
 /*
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
diff --git a/sys/cddl/compat/opensolaris/sys/mntent.h b/sys/cddl/compat/opensolaris/sys/mntent.h
index 426f8ee1b8db..e4bbc9da225b 100644
--- a/sys/cddl/compat/opensolaris/sys/mntent.h
+++ b/sys/cddl/compat/opensolaris/sys/mntent.h
@@ -18,6 +18,8 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * $FreeBSD$
  */
 /*
  * Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
diff --git a/sys/cddl/compat/opensolaris/sys/objfs.h b/sys/cddl/compat/opensolaris/sys/objfs.h
index 3904f4c1ee3e..b656e7803edc 100644
--- a/sys/cddl/compat/opensolaris/sys/objfs.h
+++ b/sys/cddl/compat/opensolaris/sys/objfs.h
@@ -17,6 +17,8 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * $FreeBSD$
  */
 
 #ifndef _COMPAT_OPENSOLARIS_SYS_OBJFS_H
diff --git a/sys/cddl/compat/opensolaris/sys/sysmacros.h b/sys/cddl/compat/opensolaris/sys/sysmacros.h
index 3ce6c614faa8..a179c5f869da 100644
--- a/sys/cddl/compat/opensolaris/sys/sysmacros.h
+++ b/sys/cddl/compat/opensolaris/sys/sysmacros.h
@@ -18,6 +18,8 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * $FreeBSD$
  */
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
 /*	  All Rights Reserved  	*/
diff --git a/sys/cddl/compat/opensolaris/sys/taskq.h b/sys/cddl/compat/opensolaris/sys/taskq.h
index 2feefe3dc870..174018a5eeaa 100644
--- a/sys/cddl/compat/opensolaris/sys/taskq.h
+++ b/sys/cddl/compat/opensolaris/sys/taskq.h
@@ -18,6 +18,8 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * $FreeBSD$
  */
 /*
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
diff --git a/sys/cddl/compat/opensolaris/sys/taskq_impl.h b/sys/cddl/compat/opensolaris/sys/taskq_impl.h
index 02c56165b6cc..a9b59bb755e0 100644
--- a/sys/cddl/compat/opensolaris/sys/taskq_impl.h
+++ b/sys/cddl/compat/opensolaris/sys/taskq_impl.h
@@ -18,6 +18,8 @@
  * information: Portions Copyright [yyyy] [name of copyright owner]
  *
  * CDDL HEADER END
+ *
+ * $FreeBSD$
  */
 /*
  * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.