Description: 更新freebsd版本到13.3版本

IssueNo: https://gitee.com/openharmony/third_party_FreeBSD/issues/I9FL2B Feature Or Bugfix: Feature Binary Source: No Signed-off-by: hw_llm <liu.limin@huawei.com>
2026-07-01 08:11:39 -04:00 · 2024-04-10 17:59:11 +08:00
parent e3df2bb9e9
commit b4069abdba
200 changed files with 696 additions and 822 deletions
@@ -1,4 +1,3 @@
-$FreeBSD$

 This file documents formal review/approval requirements that have been
 approved by core.
@@ -1,4 +1,3 @@
-$FreeBSD$

 Please note that the content of this file is strictly advisory.
 No locks listed here are valid.  The only strict review requirements
@@ -3,7 +3,7 @@
        "Name"                  : "FreeBSD",
        "License"               : "BSD 2-Clause License",
        "License File"          : "COPYRIGHT",
-        "Version Number"        : "13.2",
+        "Version Number"        : "13.3",
        "Owner"                 : "tonghaoyang1@huawei.com",
        "Upstream URL"          : "http://www.freebsd.org/",
        "Description"           : "FreeBSD is an operating system used to power modern servers, desktops, and embedded platforms."
@@ -10,6 +10,27 @@ newline.  Entries should be separated by a newline.

 Changes to this file should not be MFCed.

+0644746d5091:
+	Add a new "syskrb5" mount option for Kerberized NFSv4.1/4.2 mounts.
+	Without this patch, a Kerberized NFSv4.1/4.2 mount must provide
+	a Kerberos credential for the client at mount time.
+	This patch uses a feature of NFSv4.1/4.2 called SP4_NONE, which
+	allows the state maintenance operations to be performed by any
+	authentication mechanism, so that these operations may be done via
+	AUTH_SYS instead of RPCSEC_GSS (KerberosV).  As such, no Kerberos
+	credential is required at mount time.
+	See mount_nfs(8).
+
+b4805d577787 and many others:
+	Add support so that nfsd(8), nfsuserd(8), mountd(8), gssd(8)
+	and rpc.tlsservd(8) can be run in an appropriately configured
+	vnet prison.  The vnet prison must be on its own file system,
+	have the "allow.nfsd" jail parameter set on it and enforce_statfs
+	cannot be set to "0".  Use of UDP and pNFS server configurations
+	are not permitted.  (ie. The nfsd command line options "-u", "-p"
+	and "-m" are not supported.)
+	See jail(8), nfsd(8) and mountd(8).
+
 68e86d5265bc,e58dfd0de589,59f5a5cb724e,6e272a78de36,4c4a4fd4a649,ba2ae2cca63a:
 	sendmail has been updated to the latest upstream version (8.17.1).
 	
@@ -399,5 +420,3 @@ r347532:
 	wirings (e.g., by mlock(2)).  Kernel wirings no long count towards
 	the global limit, which is renamed to vm.max_user_wired.  bhyve -S
 	allocates user-wired memory and is now subject to that limit.
-
-$FreeBSD$
@@ -1,4 +1,4 @@
- Updating Information for FreeBSD stable/13 users.
+ Updating Information for users of FreeBSD stable/13.

 This file is maintained and copyrighted by M. Warner Losh <imp@freebsd.org>.
 See end of file for further details.  For commonly done items, please see the
@@ -6,14 +6,58 @@ COMMON ITEMS: section later in the file.  These instructions assume that you
 basically know what you are doing.  If not, then please consult the FreeBSD
 handbook:

-    https://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/makeworld.html
+    https://docs.freebsd.org/en/books/handbook/cutting-edge/#makeworld

 Items affecting the ports and packages system can be found in
 /usr/ports/UPDATING.  Please read that file before updating system packages
 and/or ports.

-20230411:
-	13.2-RELEASE.
+20240305:
+	13.3-RELEASE.
+
+20240218:
+	Change 9b998db87c28 changed 'struct ieee80211vap' internals in net80211.
+	Given we do not have enough spares and the struct is allocated by
+	drivers, all wireless drivers have to be recompiled.
+	__FreeBSD_version is updated to 1303001 to track this change.
+
+20240207:
+	sendmail 8.18.1 has been imported and merged.  This version enforces
+	stricter RFC compliance by default, especially with respect to line
+	endings.  This may cause issues with receiving messages from
+	non-compliant MTAs; please see the first 8.18.1 release note in
+	contrib/sendmail/RELEASE_NOTES for mitigations.
+
+20230913:
+	Improvements to libtacplus(8) mean that tacplus.conf(5) now
+	follows POSIX shell syntax rules. This may cause TACACS+
+	authentication to fail if the shared secret contains a single
+	quote, double quote, or backslash character which isn't
+	already properly quoted or escaped.
+
+20230619:
+	To enable pf rdr rules for connections initiated from the host, pf
+	filter rules can be optionally enabled for packets delivered
+	locally. This can change the behavior of rules which match packets
+	delivered to lo0. To enable this feature:
+
+		sysctl net.pf.filter_local=1
+		service pf restart
+
+	When enabled, its best to ensure that packets delivered locally are not
+	filtered, e.g. by adding a 'skip on lo' rule.
+
+20230404:
+	llvm-objump is now always installed as objdump.  Previously there was
+	no /usr/bin/objdump unless the WITH_LLVM_BINUTILS knob was used.
+
+	Some LLVM objdump options have a different output format compared to
+	GNU objdump; readelf is available for inspecting ELF files, and GNU
+	objdump is available from the devel/binutils port or package.
+
+20230217:
+	Bump __FreeBSD_verion after various changes to LinuxKPI pci and 802.11
+	in order to help out-of-tree consumers to deal accordingly.

 20220701:
 	LinuxKPI pm.h changes require an update to the latest drm-kmod version
@@ -2558,5 +2602,3 @@ POSSIBILITY OF SUCH DAMAGE.

 Contact Warner Losh if you have any questions about your use of
 this document.
-
-$FreeBSD$
@@ -18,8 +18,7 @@
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)strcasecmp.c	5.6 (Berkeley) 6/27/88";
 #endif /* LIBC_SCCS and not lint */
-// #include <strings.h>
-// #include <ctype.h>
+
 /* Some environments don't define u_char -- WZV */
 #if 0
 #include <sys/types.h>
@@ -67,8 +66,7 @@ static u_char charmap[] = {
 	'\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377',
 };

-int strcasecmp(s1, s2)
-	char *s1, *s2;
+int strcasecmp(char *s1, char *s2)
 {
 	register u_char	*cm = charmap,
 			*us1 = (u_char *)s1,
@@ -80,9 +78,7 @@ int strcasecmp(s1, s2)
 	return(cm[*us1] - cm[*--us2]);
 }

-int strncasecmp(s1, s2, n)
-	char *s1, *s2;
-	register int n;
+int strncasecmp(char *s1, char *s2, register int n)
 {
 	register u_char	*cm = charmap,
 			*us1 = (u_char *)s1,
@@ -29,7 +29,6 @@
 * SUCH DAMAGE.
 *
 *	@(#)fts.h	8.3 (Berkeley) 8/14/94
- * $FreeBSD$
 */

 #ifndef	_FTS_H_
@@ -23,8 +23,6 @@
 * 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$
 */

 union IEEEl2bits {
@@ -1,7 +1,5 @@
 /*
 * MD header for contrib/gdtoa
- *
- * $FreeBSD$
 */

 /*
@@ -3,8 +3,6 @@
 *
 * This file can be generated by compiling and running contrib/gdtoa/qnan.c
 * on the target architecture after arith.h has been generated.
- *
- * $FreeBSD$
 */

 #define f_QNAN 0x7fc00000
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
 *
 * Copyright (c) 2002, 2003 David Schultz <das@FreeBSD.ORG>
 * All rights reserved.
@@ -24,8 +24,6 @@
 * 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$
 */

 #if defined(__VFP_FP__) || defined(__ARM_EABI__)
@@ -1,7 +1,5 @@
 /*
 * MD header for contrib/gdtoa
- *
- * $FreeBSD$
 */

 /*
@@ -5,8 +5,6 @@
 * on the target architecture after arith.h has been generated.
 *
 * XXX I don't have ARM hardware, so I just guessed.  --das
- *
- * $FreeBSD$
 */

 #define f_QNAN 0x7fc00000
@@ -1,8 +1,6 @@
 /*
 * Machine-independent glue to integrate David Gay's gdtoa
 * package into libc.
- *
- * $FreeBSD$
 */

 #include <pthread.h>
@@ -1,3 +1,5 @@
+/*	$OpenBSD: arc4random.c,v 1.58 2022/07/31 13:41:45 tb Exp $	*/
+
 /*
 * Copyright (c) 1996, David Mazieres <dm@uun.org>
 * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
@@ -1,3 +1,5 @@
+/*	$OpenBSD: arc4random.h,v 1.4 2015/01/15 06:57:18 deraadt Exp $	*/
+
 /*
 * Copyright (c) 1996, David Mazieres <dm@uun.org>
 * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
@@ -1,3 +1,5 @@
+/*	$OpenBSD: arc4random_uniform.c,v 1.3 2019/01/20 02:59:07 bcook Exp $	*/
+
 /*
 * Copyright (c) 2008, Damien Miller <djm@openbsd.org>
 *
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
 *
 * Copyright (c) 2003 Mike Barcroft <mike@FreeBSD.org>
 * Copyright (c) 2002 David Schultz <das@FreeBSD.ORG>
@@ -25,8 +25,6 @@
 * 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$
 */

 #ifndef _FPMATH_H_
@@ -5,7 +5,7 @@
 *	The Regents of the University of California.  All rights reserved.
 *
 * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
+ *
 * Portions of this software were developed by David Chisnall
 * under sponsorship from the FreeBSD Foundation.
 *
@@ -5,7 +5,7 @@
 *	The Regents of the University of California.  All rights reserved.
 *
 * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
+ *
 * Portions of this software were developed by David Chisnall
 * under sponsorship from the FreeBSD Foundation.
 *
@@ -5,7 +5,7 @@
 *	The Regents of the University of California.  All rights reserved.
 *
 * Copyright (c) 2011 The FreeBSD Foundation
- * All rights reserved.
+ *
 * Portions of this software were developed by David Chisnall
 * under sponsorship from the FreeBSD Foundation.
 *
@@ -11,8 +11,6 @@
 */

 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
 * See e_lgamma_r.c for complete comments.
 *
@@ -60,8 +60,6 @@
 */

 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <float.h>
 #include <math.h>

@@ -12,8 +12,6 @@
 */

 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
 * ld128 version of k_cos.c.  See ../src/k_cos.c for most comments.
 */
@@ -31,8 +31,6 @@
 */

 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
 * ld128 version of k_expl.h.  See ../ld80/s_expl.c for most comments.
 *
@@ -12,8 +12,6 @@
 */

 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
 * ld128 version of k_sin.c.  See ../src/k_sin.c for most comments.
 */
@@ -11,8 +11,6 @@
 */

 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
 * See s_erf.c for complete comments.
 *
@@ -29,8 +29,6 @@
 */

 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
 * ld128 version of s_expl.c.  See ../ld80/s_expl.c for most comments.
 */
@@ -27,8 +27,6 @@
 */

 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /**
 * Implementation of the natural logarithm of x for 128-bit format.
 *
@@ -14,8 +14,6 @@
 */

 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
 * See e_acosh.c for complete comments.
 *
@@ -12,8 +12,6 @@
 */

 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
 * See e_cosh.c for complete comments.
 *
@@ -11,8 +11,6 @@
 */

 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include "math.h"
 #include "math_private.h"

@@ -12,8 +12,6 @@
 */

 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
 * See e_sinh.c for complete comments.
 *
@@ -11,7 +11,6 @@

 /*
 * from: @(#)fdlibm.h 5.1 93/09/24
- * $FreeBSD$
 */

 #ifndef _MATH_PRIVATE_H_
@@ -13,8 +13,6 @@
 */

 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
 * See s_asinh.c for complete comments.
 *
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
 *
 * Copyright (c) 2004-2005 David Schultz <das@FreeBSD.ORG>
 * All rights reserved.
@@ -24,8 +24,6 @@
 * 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$
 */

 #include <float.h>
@@ -13,8 +13,6 @@
 */

 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 /*
 * See s_tanh.c for complete comments.
 *
@@ -1,5 +1,4 @@
 #	$NetBSD: Makefile,v 1.6 1997/05/08 21:11:11 gwr Exp $
-# $FreeBSD$

 FSCK=	${.CURDIR:H}/fsck
 .PATH: ${FSCK}
@@ -1,4 +1,3 @@
-# $FreeBSD$
 # Autogenerated - do NOT edit!

 DIRDEPS = \
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
 *
 * Copyright (C) 1995, 1997 Wolfgang Solfrank
 * Copyright (c) 1995 Martin Husemann
@@ -29,8 +29,6 @@
 #include <sys/cdefs.h>
 #ifndef lint
 __RCSID("$NetBSD: boot.c,v 1.22 2020/01/11 16:29:07 christos Exp $");
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */

 #include <sys/param.h>
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
 *
 * Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
 * Copyright (c) 1995 Martin Husemann
@@ -29,8 +29,6 @@
 #include <sys/cdefs.h>
 #ifndef lint
 __RCSID("$NetBSD: check.c,v 1.14 2006/06/05 16:51:18 christos Exp $");
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */

 #ifdef HAVE_LIBUTIL_H
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
 *
 * Copyright (c) 2019 Google LLC
 * Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
@@ -32,8 +32,6 @@
 #include <sys/cdefs.h>
 #ifndef lint
 __RCSID("$NetBSD: dir.c,v 1.20 2006/06/05 16:51:18 christos Exp $");
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */

 #include <assert.h>
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
 *
 * Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
 * Copyright (c) 1995 Martin Husemann
@@ -26,7 +26,6 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *	$NetBSD: dosfs.h,v 1.4 1997/01/03 14:32:48 ws Exp $
- * $FreeBSD$
 */

 #ifndef DOSFS_H
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
 *
 * Copyright (C) 1995, 1996, 1997 Wolfgang Solfrank
 * Copyright (c) 1995 Martin Husemann
@@ -24,7 +24,6 @@
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *	$NetBSD: ext.h,v 1.6 2000/04/25 23:02:51 jdolecek Exp $
- * $FreeBSD$
 */

 #ifndef EXT_H
@@ -30,8 +30,6 @@
 #include <sys/cdefs.h>
 #ifndef lint
 __RCSID("$NetBSD: fat.c,v 1.18 2006/06/05 16:51:18 christos Exp $");
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */

 // #include <sys/endian.h>
@@ -23,8 +23,6 @@
 .\" (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$
-.\"
 .Dd January 6, 2020
 .Dt FSCK_MSDOSFS 8
 .Os
@@ -29,8 +29,6 @@
 #include <sys/cdefs.h>
 #ifndef lint
 __RCSID("$NetBSD: main.c,v 1.10 1997/10/01 02:18:14 enami Exp $");
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */

 #include <stdlib.h>
@@ -1,4 +1,3 @@
-# $FreeBSD$

 .include <src.opts.mk>

@@ -1,4 +1,3 @@
-# $FreeBSD$
 # Autogenerated - do NOT edit!

 DIRDEPS = \
@@ -25,11 +25,6 @@
 * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
-
 #include <sys/param.h>
 #ifdef MAKEFS
 /* In the makefs case we only want struct disklabel */
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$NetBSD: mkfs_msdos.h,v 1.3 2015/10/16 17:38:17 christos Exp $	*/

 /*-
@@ -23,8 +23,6 @@
 .\" OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
 .\" IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD$
-.\"
 .Dd June 14, 2018
 .Dt NEWFS_MSDOS 8
 .Os
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
 *
 * Copyright (c) 1998 Robert Nordier
 * All rights reserved.
@@ -27,11 +27,6 @@
 * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
-
 #include <sys/param.h>
 #include <sys/stat.h>
 #include <err.h>
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
 * Copyright (c) 2013 Hans Petter Selasky. All rights reserved.
 *
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
 * Copyright (c) 2013 Hans Petter Selasky. All rights reserved.
 *
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
 * Copyright (c) 2011 Hans Petter Selasky. All rights reserved.
 *
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
 * Copyright (c) 2013 Hans Petter Selasky. All rights reserved.
 *
@@ -49,8 +49,6 @@
 */

 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/bus.h>
 #include "linux/module.h"
 #include "los_config.h"
@@ -1,4 +1,5 @@
-/*    $NetBSD: in_cksum_arm.S,v 1.2 2003/09/23 10:01:36 scw Exp $    */
+/*	$NetBSD: in_cksum_arm.S,v 1.2 2003/09/23 10:01:36 scw Exp $	*/
+
 /*-
 * Copyright 2003 Wasabi Systems, Inc.
 * All rights reserved.
@@ -38,8 +38,6 @@
 */

 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/kobj.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ * SPDX-License-Identifier: BSD-2-Clause
 *
 * Copyright (c) 2005 M. Warner Losh <imp@FreeBSD.org>
 *
@@ -25,8 +25,6 @@
 * 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$
 */

 #ifndef ARM_INCLUDE__BUS_H
@@ -13,8 +13,10 @@
 * functioning of this software in any circumstances.
 *
 * Ported to run under 386BSD by Julian Elischer (julian@tfs.com) Sept 1992
- *
- * $FreeBSD$
+ */
+
+/*
+ * SCSI general  interface description
 */

 #ifndef __INCLUDE_SCSI_ALL_H
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */

 #ifndef _LINUXKPI_ASM_ATOMIC_H_
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef _LINUXKPI_ASM_IO_H_
 #define _LINUXKPI_ASM_IO_H_
@@ -22,8 +22,6 @@
 * 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$
 */

 #ifndef _LINUXKPI_LINUX_ATOMIC_H_
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef __LINUX_COMPAT_H__
 #define __LINUX_COMPAT_H__
@@ -26,8 +26,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef	_LINUXKPI_LINUX_COMPILER_H_
 #define	_LINUXKPI_LINUX_COMPILER_H_
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef	_LINUXKPI_LINUX_COMPLETION_H_
 #define	_LINUXKPI_LINUX_COMPLETION_H_
@@ -26,8 +26,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef _LINUXKPI_LINUX_DELAY_H_
 #define	_LINUXKPI_LINUX_DELAY_H_
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef	_LINUXKPI_LINUX_DMA_MAPPING_H_
 #define _LINUXKPI_LINUX_DMA_MAPPING_H_
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef	_LINUXKPI_LINUX_ERRNO_H_
 #define	_LINUXKPI_LINUX_ERRNO_H_
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef	_LINUXKPI_LINUX_FS_H_
 #define	_LINUXKPI_LINUX_FS_H_
@@ -21,8 +21,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */

 #ifndef _LINUXKPI_LINUX_HRTIMER_H_
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef	_LINUXKPI_LINUX_INTERRUPT_H_
 #define	_LINUXKPI_LINUX_INTERRUPT_H_
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef	_LINUXKPI_LINUX_IO_H_
 #define	_LINUXKPI_LINUX_IO_H_
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef	_LINUXKPI_LINUX_IOCTL_H_
 #define	_LINUXKPI_LINUX_IOCTL_H_
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef	_LINUXKPI_LINUX_JIFFIES_H_
 #define	_LINUXKPI_LINUX_JIFFIES_H_
@@ -26,8 +26,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef	_LINUXKPI_LINUX_KERNEL_H_
 #define	_LINUXKPI_LINUX_KERNEL_H_
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef _LINUXKPI_LINUX_LIST_H_
 #define _LINUXKPI_LINUX_LIST_H_
@@ -47,7 +45,7 @@ extern "C" {
 #define LINUX_LIST_HEAD_INIT(name) { &(name), &(name) }

 #define LINUX_LIST_HEAD(name) \
-		struct list_head name = LINUX_LIST_HEAD_INIT(name)
+	struct list_head name = LINUX_LIST_HEAD_INIT(name)

 #ifndef LIST_HEAD_DEF
 #define	LIST_HEAD_DEF
@@ -120,7 +118,7 @@ list_replace_init(struct list_head *old, struct list_head *new)

 static inline void
 linux_list_add(struct list_head *new, struct list_head *prev,
-	struct list_head *next)
+    struct list_head *next)
 {

 	next->prev = new;
@@ -165,44 +163,44 @@ list_del_init(struct list_head *entry)

 #define list_for_each_entry(p, h, field)				\
 	for (p = list_entry((h)->next, typeof(*p), field); &(p)->field != (h); \
-		p = list_entry((p)->field.next, typeof(*p), field))
+	    p = list_entry((p)->field.next, typeof(*p), field))

 #define list_for_each_entry_safe(p, n, h, field)			\
 	for (p = list_entry((h)->next, typeof(*p), field),		\
-		n = list_entry((p)->field.next, typeof(*p), field); &(p)->field != (h);\
-		p = n, n = list_entry(n->field.next, typeof(*n), field))
+	    n = list_entry((p)->field.next, typeof(*p), field); &(p)->field != (h);\
+	    p = n, n = list_entry(n->field.next, typeof(*n), field))

 #define	list_for_each_entry_from(p, h, field) \
 	for ( ; &(p)->field != (h); \
-		p = list_entry((p)->field.next, typeof(*p), field))
+	    p = list_entry((p)->field.next, typeof(*p), field))

 #define	list_for_each_entry_continue(p, h, field)			\
 	for (p = list_next_entry((p), field); &(p)->field != (h);	\
-		p = list_next_entry((p), field))
+	    p = list_next_entry((p), field))

 #define	list_for_each_entry_safe_from(pos, n, head, member)			\
 	for (n = list_entry((pos)->member.next, typeof(*pos), member);		\
-		 &(pos)->member != (head);						\
-		 pos = n, n = list_entry(n->member.next, typeof(*n), member))
+	     &(pos)->member != (head);						\
+	     pos = n, n = list_entry(n->member.next, typeof(*n), member))

 #define	list_for_each_entry_reverse(p, h, field)			\
 	for (p = list_entry((h)->prev, typeof(*p), field); &(p)->field != (h); \
-		p = list_entry((p)->field.prev, typeof(*p), field))
+	    p = list_entry((p)->field.prev, typeof(*p), field))

 #define	list_for_each_entry_safe_reverse(p, n, h, field)		\
 	for (p = list_entry((h)->prev, typeof(*p), field),		\
-		n = list_entry((p)->field.prev, typeof(*p), field); &(p)->field != (h); \
-		p = n, n = list_entry(n->field.prev, typeof(*n), field))
+	    n = list_entry((p)->field.prev, typeof(*p), field); &(p)->field != (h); \
+	    p = n, n = list_entry(n->field.prev, typeof(*n), field))

 #define	list_for_each_entry_continue_reverse(p, h, field) \
 	for (p = list_entry((p)->field.prev, typeof(*p), field); &(p)->field != (h); \
-		p = list_entry((p)->field.prev, typeof(*p), field))
+	    p = list_entry((p)->field.prev, typeof(*p), field))

 #define	list_for_each_prev(p, h) for (p = (h)->prev; p != (h); p = (p)->prev)

 #define	list_for_each_entry_from_reverse(p, h, field)	\
 	for (; &p->field != (h);			\
-		 p = list_prev_entry(p, field))
+	     p = list_prev_entry(p, field))

 static inline void
 list_add(struct list_head *new, struct list_head *head)
@@ -243,7 +241,7 @@ list_rotate_to_front(struct list_head *entry, struct list_head *head)

 static inline void
 list_bulk_move_tail(struct list_head *head, struct list_head *first,
-	struct list_head *last)
+    struct list_head *last)
 {
 	first->prev->next = last->next;
 	last->next->prev = first->prev;
@@ -255,7 +253,7 @@ list_bulk_move_tail(struct list_head *head, struct list_head *first,

 static inline void
 linux_list_splice(const struct list_head *list, struct list_head *prev,
-	struct list_head *next)
+    struct list_head *next)
 {
 	struct list_head *first = NULL;
 	struct list_head *last = NULL;
@@ -307,7 +305,6 @@ struct hlist_head {
 struct hlist_node {
 	struct hlist_node *next, **pprev;
 };
-
 #define	HLIST_HEAD_INIT { }
 #define	HLIST_HEAD(name) struct hlist_head name = HLIST_HEAD_INIT
 #define	INIT_HLIST_HEAD(head) (head)->first = NULL
@@ -437,6 +434,20 @@ static inline int list_is_last(const struct list_head *list,
 	return list->next == head;
 }

+static inline size_t
+list_count_nodes(const struct list_head *list)
+{
+	const struct list_head *lh;
+	size_t count;
+
+	count = 0;
+	list_for_each(lh, list) {
+		count++;
+	}
+
+	return (count);
+}
+
 #define	hlist_entry(ptr, type, field)	container_of(ptr, type, field)

 #define	hlist_for_each(p, head)						\
@@ -450,26 +461,30 @@ static inline int list_is_last(const struct list_head *list,

 #define	hlist_for_each_entry(pos, head, member)				\
 	for (pos = hlist_entry_safe((head)->first, typeof(*(pos)), member);\
-		 pos;							\
-		 pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))
+	     pos;							\
+	     pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))

 #define	hlist_for_each_entry_continue(pos, member)			\
 	for (pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member); \
-		 (pos); 						\
-		 pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))
+	     (pos);							\
+	     pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))

 #define	hlist_for_each_entry_from(pos, member)				\
 	for (; (pos);								\
-		 pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))
+	     pos = hlist_entry_safe((pos)->member.next, typeof(*(pos)), member))

 #define	hlist_for_each_entry_safe(pos, n, head, member)			\
 	for (pos = hlist_entry_safe((head)->first, typeof(*(pos)), member); \
-		 (pos) && ({ n = (pos)->member.next; 1; }); 		\
-		 pos = hlist_entry_safe(n, typeof(*(pos)), member))
+	     (pos) && ({ n = (pos)->member.next; 1; });			\
+	     pos = hlist_entry_safe(n, typeof(*(pos)), member))

+#if defined(LINUXKPI_VERSION) && LINUXKPI_VERSION >= 51300
 extern void list_sort(void *priv, struct list_head *head, int (*cmp)(void *priv,
-	struct list_head *a, struct list_head *b));
-
+    const struct list_head *a, const struct list_head *b));
+#else
+extern void list_sort(void *priv, struct list_head *head, int (*cmp)(void *priv,
+    struct list_head *a, struct list_head *b));
+#endif

 #ifdef __cplusplus
 #if __cplusplus
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef	_LINUXKPI_LINUX_MODULE_H_
 #define	_LINUXKPI_LINUX_MODULE_H_
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef __LINUX_MODULEPARAM_H__
 #define __LINUX_MODULEPARAM_H__
@@ -24,8 +24,6 @@
 * 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$
 */
 #ifndef __LINUX_PAGEMAP_H__
 #define __LINUX_PAGEMAP_H__
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef	_LINUXKPI_LINUX_RBTREE_H_
 #define	_LINUXKPI_LINUX_RBTREE_H_
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef	_LINUXKPI_LINUX_RWSEM_H_
 #define	_LINUXKPI_LINUX_RWSEM_H_
@@ -27,8 +27,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef	_LINUXKPI_LINUX_SCATTERLIST_H_
 #define	_LINUXKPI_LINUX_SCATTERLIST_H_
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef	_LINUXKPI_LINUX_SCHED_H_
 #define	_LINUXKPI_LINUX_SCHED_H_
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef _LINUXKPI_LINUX_SEMAPHORE_H_
 #define _LINUXKPI_LINUX_SEMAPHORE_H_
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef	_LINUXKPI_LINUX_SLAB_H_
 #define	_LINUXKPI_LINUX_SLAB_H_
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef	_LINUXKPI_LINUX_SPINLOCK_H_
 #define	_LINUXKPI_LINUX_SPINLOCK_H_
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef __LINUXKPI_LINUX_STRING_H__
 #define __LINUXKPI_LINUX_STRING_H__
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef _LINUXKPI_LINUX_TIMER_H_
 #define	_LINUXKPI_LINUX_TIMER_H_
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef	_LINUXKPI_LINUX_TYPES_H_
 #define	_LINUXKPI_LINUX_TYPES_H_
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
 * Copyright (c) 2007 Luigi Rizzo - Universita` di Pisa. All rights reserved.
 * Copyright (c) 2007 Hans Petter Selasky. All rights reserved.
@@ -26,8 +26,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */

 #ifndef _LINUXKPI_LINUX_WAIT_H_
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */
 #ifndef	_LINUXKPI_LINUX_WORKQUEUE_H_
 #define	_LINUXKPI_LINUX_WORKQUEUE_H_
@@ -25,8 +25,6 @@
 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 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$
 */

 #include "linux/interrupt.h"
@@ -1,4 +1,3 @@
-/* $FreeBSD$ */
 /*-
 * Copyright (c) 2007 Luigi Rizzo - Universita` di Pisa. All rights reserved.
 * Copyright (c) 2007 Hans Petter Selasky. All rights reserved.
@@ -25,8 +25,6 @@
 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
 #include <sys/cdefs.h>
 #include <sys/types.h>
 #ifdef _KERNEL
@@ -16,7 +16,6 @@
 */

 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");

 #include <sys/types.h>
 #include <sys/param.h>
@@ -1,4 +1,3 @@
-/*	$FreeBSD$	*/
 /*	$KAME: rijndael-api-fst.h,v 1.6 2001/05/27 00:23:23 itojun Exp $	*/

 /*
--- a/Show More
+++ b/Show More