From owner-svn-src-projects@FreeBSD.ORG  Sun Jan  1 02:34:16 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8198E106564A;
	Sun,  1 Jan 2012 02:34:16 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6F0788FC08;
	Sun,  1 Jan 2012 02:34:16 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q012YGwI093403;
	Sun, 1 Jan 2012 02:34:16 GMT (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q012YGbj093397;
	Sun, 1 Jan 2012 02:34:16 GMT (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201201010234.q012YGbj093397@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Sun, 1 Jan 2012 02:34:16 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229166 - in projects/nfsv4.1-client/sys/fs: nfs
	nfsclient
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Jan 2012 02:34:16 -0000

Author: rmacklem
Date: Sun Jan  1 02:34:15 2012
New Revision: 229166
URL: http://svn.freebsd.org/changeset/base/229166

Log:
  Define the structure that stores an NFSv4.1 File Layout and add
  the function nfsrpc_layoutget() that does the LayoutGet Operation
  to fill it in. The function is untested at this point and the
  structure may need to change.

Modified:
  projects/nfsv4.1-client/sys/fs/nfs/nfs_commonport.c
  projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h
  projects/nfsv4.1-client/sys/fs/nfs/nfsclstate.h
  projects/nfsv4.1-client/sys/fs/nfs/nfsport.h
  projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c

Modified: projects/nfsv4.1-client/sys/fs/nfs/nfs_commonport.c
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfs/nfs_commonport.c	Sun Jan  1 01:08:51 2012	(r229165)
+++ projects/nfsv4.1-client/sys/fs/nfs/nfs_commonport.c	Sun Jan  1 02:34:15 2012	(r229166)
@@ -104,6 +104,7 @@ MALLOC_DEFINE(M_NEWNFSDIROFF, "NFSCL dir
     "New NFS directory offset data");
 MALLOC_DEFINE(M_NEWNFSDROLLBACK, "NFSD rollback",
     "New NFS local lock rollback");
+MALLOC_DEFINE(M_NEWNFSFLAYOUT, "NFSCL flayout", "NFSv4.1 File Layout");
 
 /*
  * Definition of mutex locks.

Modified: projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h	Sun Jan  1 01:08:51 2012	(r229165)
+++ projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h	Sun Jan  1 02:34:15 2012	(r229166)
@@ -73,6 +73,8 @@ struct nfsclsession;
 struct nfscllockowner;
 struct nfscllock;
 struct nfscldeleg;
+struct nfsclflayout;
+struct nfsclflayouthead;
 struct nfsv4lock;
 struct nfsvattr;
 struct nfs_vattr;
@@ -440,6 +442,9 @@ int nfsrpc_destroysession(struct nfsmoun
     struct ucred *, NFSPROC_T *);
 int nfsrpc_destroyclient(struct nfsmount *, struct nfsclclient *,
     struct ucred *, NFSPROC_T *);
+int nfsrpc_layoutget(vnode_t, int, uint64_t, uint64_t, uint64_t,
+    nfsv4stateid_t *, struct nfsclflayouthead *, struct ucred *,
+    NFSPROC_T *, void *);
 
 /* nfs_clstate.c */
 int nfscl_open(vnode_t, u_int8_t *, int, u_int32_t, int,

Modified: projects/nfsv4.1-client/sys/fs/nfs/nfsclstate.h
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfs/nfsclstate.h	Sun Jan  1 01:08:51 2012	(r229165)
+++ projects/nfsv4.1-client/sys/fs/nfs/nfsclstate.h	Sun Jan  1 02:34:15 2012	(r229166)
@@ -40,6 +40,8 @@ LIST_HEAD(nfsclhead, nfsclclient);
 LIST_HEAD(nfsclownerhead, nfsclowner);
 TAILQ_HEAD(nfscldeleghead, nfscldeleg);
 LIST_HEAD(nfscldeleghash, nfscldeleg);
+TAILQ_HEAD(nfsclflayouthead, nfsclflayout);
+LIST_HEAD(nfsclflayouthash, nfsclflayout);
 #define	NFSCLDELEGHASHSIZE	256
 #define	NFSCLDELEGHASH(c, f, l)						\
 	(&((c)->nfsc_deleghash[ncl_hash((f), (l)) % NFSCLDELEGHASHSIZE]))
@@ -198,6 +200,27 @@ struct nfscllockownerfh {
 };
 
 /*
+ * MALLOC'd to the correct length to accommodate the file handle list.
+ */
+struct nfsclflayout {
+	TAILQ_ENTRY(nfsclflayout)	nfsfl_list;
+	LIST_ENTRY(nfsclflayout)	nfsfl_hash;
+	struct nfsclclient		*nfsfl_clp;
+	struct nfsfh			*nfsfl_fhp;	/* FH of vnode */
+	nfsv4stateid_t			nfsfl_stateid;
+	uint8_t				nfsfl_dev[NFSX_V4DEVICEID];
+	uint64_t			nfsfl_off;
+	uint64_t			nfsfl_len;
+	uint64_t			nfsfl_patoff;
+	uint32_t			nfsfl_iomode;
+	uint32_t			nfsfl_util;
+	uint32_t			nfsfl_stripe1;
+	uint16_t			nfsfl_retonclose;
+	uint16_t			nfsfl_fhcnt;
+	struct nfsfh			*nfsfl_fh[1];	/* FH list for DS */
+};
+
+/*
  * Macro for incrementing the seqid#.
  */
 #define	NFSCL_INCRSEQID(s, n)	do { 					\

Modified: projects/nfsv4.1-client/sys/fs/nfs/nfsport.h
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfs/nfsport.h	Sun Jan  1 01:08:51 2012	(r229165)
+++ projects/nfsv4.1-client/sys/fs/nfs/nfsport.h	Sun Jan  1 02:34:15 2012	(r229166)
@@ -732,6 +732,7 @@ MALLOC_DECLARE(M_NEWNFSV4NODE);
 MALLOC_DECLARE(M_NEWNFSDIRECTIO);
 MALLOC_DECLARE(M_NEWNFSMNT);
 MALLOC_DECLARE(M_NEWNFSDROLLBACK);
+MALLOC_DECLARE(M_NEWNFSFLAYOUT);
 #define	M_NFSRVCACHE	M_NEWNFSRVCACHE
 #define	M_NFSDCLIENT	M_NEWNFSDCLIENT
 #define	M_NFSDSTATE	M_NEWNFSDSTATE
@@ -751,6 +752,7 @@ MALLOC_DECLARE(M_NEWNFSDROLLBACK);
 #define	M_NFSV4NODE	M_NEWNFSV4NODE
 #define	M_NFSDIRECTIO	M_NEWNFSDIRECTIO
 #define	M_NFSDROLLBACK	M_NEWNFSDROLLBACK
+#define	M_NFSFLAYOUT	M_NEWNFSFLAYOUT
 
 #define	NFSINT_SIGMASK(set) 						\
 	(SIGISMEMBER(set, SIGINT) || SIGISMEMBER(set, SIGTERM) ||	\

Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c	Sun Jan  1 01:08:51 2012	(r229165)
+++ projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c	Sun Jan  1 02:34:15 2012	(r229166)
@@ -4451,3 +4451,153 @@ nfsrpc_destroyclient(struct nfsmount *nm
 	return (error);
 }
 
+/*
+ * Do the NFSv4.1 LayoutGet.
+ */
+int
+nfsrpc_layoutget(vnode_t vp, int iomode, uint64_t offset, uint64_t len,
+    uint64_t minlen, nfsv4stateid_t *stateidp, struct nfsclflayouthead *flhp,
+    struct ucred *cred, NFSPROC_T *p, void *stuff)
+{
+	uint32_t *tl;
+	struct nfsrv_descript nfsd, *nd = &nfsd;
+	struct nfsfh *fhp;
+	struct nfsclflayout *flp, *nflp;
+	struct nfsnode *np;
+	nfsv4stateid_t st;
+	int cnt, error, fhcnt, fhlen, i, j, retonclose;
+	uint8_t *cp;
+
+	np = VTONFS(vp);
+	NFSCL_REQSTART(nd, NFSPROC_LAYOUTGET, vp);
+	NFSM_BUILD(tl, uint32_t *, 4 * NFSX_UNSIGNED + 3 * NFSX_HYPER +
+	    NFSX_STATEID);
+	*tl++ = newnfs_false;		/* Don't signal availability. */
+	*tl++ = txdr_unsigned(NFSLAYOUT_NFSV4_1_FILES);
+	*tl++ = txdr_unsigned(iomode);
+	txdr_hyper(offset, tl);
+	tl += 2;
+	txdr_hyper(len, tl);
+	tl += 2;
+	txdr_hyper(minlen, tl);
+	tl += 2;
+	*tl++ = stateidp->seqid;
+	*tl++ = stateidp->other[0];
+	*tl++ = stateidp->other[1];
+	*tl++ = stateidp->other[2];
+	*tl = txdr_unsigned(100000);	/* take a large layout list */
+	nd->nd_flag |= ND_USEGSSNAME;
+	error = nfscl_request(nd, vp, p, cred, stuff);
+	if (error)
+		return (error);
+	if (nd->nd_repstat == 0) {
+		NFSM_DISSECT(tl, uint32_t *, 2 * NFSX_UNSIGNED + NFSX_STATEID);
+		if (*tl++ != 0)
+			retonclose = 1;
+		else
+			retonclose = 0;
+printf("layg rcl=%d\n", retonclose);
+		st.seqid = *tl++;
+		st.other[0] = *tl++;
+		st.other[1] = *tl++;
+		st.other[2] = *tl++;
+		cnt = fxdr_unsigned(int, *tl);
+printf("layg cnt=%d\n", cnt);
+		if (cnt <= 0 || cnt > 10000) {
+			/* Don't accept more than 10000 layouts in reply. */
+			error = NFSERR_BADXDR;
+			goto nfsmout;
+		}
+		for (i = 0; i < cnt; i++) {
+			/* Dissect all the way to the file handle cnt. */
+			NFSM_DISSECT(tl, uint32_t *, 3 * NFSX_HYPER +
+			    6 * NFSX_UNSIGNED + NFSX_V4DEVICEID);
+			fhcnt = fxdr_unsigned(int, *(tl + 11 +
+			    NFSX_V4DEVICEID / NFSX_UNSIGNED));
+printf("fhcnt=%d\n", fhcnt);
+			if (fhcnt < 0 || fhcnt > 100) {
+				/* Don't accept more than 100 file handles. */
+				error = NFSERR_BADXDR;
+				goto nfsmout;
+			}
+			if (fhcnt > 1)
+				flp = malloc(sizeof(*flp) + (fhcnt - 1) *
+				    sizeof(struct nfsfh *),
+				    M_NFSFLAYOUT, M_WAITOK);
+			else
+				flp = malloc(sizeof(*flp),
+				    M_NFSFLAYOUT, M_WAITOK);
+			flp->nfsfl_fhcnt = 0;
+			fhlen = np->n_fhp->nfh_len;
+			if (fhlen > 1)
+				fhp = malloc(sizeof(*fhp) + fhlen - 1,
+				    M_NFSFH, M_WAITOK);
+			else
+				fhp = malloc(sizeof(*fhp), M_NFSFH,
+				    M_WAITOK);
+			fhp->nfh_len = fhlen;
+			NFSBCOPY(np->n_fhp->nfh_fh, fhp->nfh_fh, fhlen);
+			flp->nfsfl_fhp = fhp;
+			TAILQ_INSERT_HEAD(flhp, flp, nfsfl_list);
+			flp->nfsfl_retonclose = retonclose;
+			flp->nfsfl_stateid.seqid = st.seqid;
+			flp->nfsfl_stateid.other[0] = st.other[0];
+			flp->nfsfl_stateid.other[1] = st.other[1];
+			flp->nfsfl_stateid.other[2] = st.other[2];
+			flp->nfsfl_off = fxdr_hyper(tl); tl += 2;
+			flp->nfsfl_len = fxdr_hyper(tl); tl += 2;
+			flp->nfsfl_iomode = fxdr_unsigned(int, *tl++);
+printf("layg iom=%d\n", iomode);
+			if (fxdr_unsigned(int, *tl++) !=
+			    NFSLAYOUT_NFSV4_1_FILES) {
+				printf("NFSv4.1: got non-files layout\n");
+				error = NFSERR_BADXDR;
+				goto nfsmout;
+			}
+			NFSBCOPY(++tl, flp->nfsfl_dev, NFSX_V4DEVICEID);
+			tl += (NFSX_V4DEVICEID / NFSX_UNSIGNED);
+			flp->nfsfl_util = fxdr_unsigned(uint32_t, *tl++);
+			flp->nfsfl_stripe1 = fxdr_unsigned(uint32_t, *tl++);
+			flp->nfsfl_patoff = fxdr_hyper(tl); tl += 2;
+			if (fxdr_unsigned(int, *tl) != fhcnt) {
+				printf("EEK! bad fhcnt\n");
+				error = NFSERR_BADXDR;
+				goto nfsmout;
+			}
+			for (j = 0; j < fhcnt; j++) {
+				NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED);
+				fhlen = fxdr_unsigned(int, *tl);
+				if (fhlen <= 0 || fhlen > NFSX_V4FHMAX) {
+					error = NFSERR_BADXDR;
+					goto nfsmout;
+				}
+				if (fhlen > 1)
+					fhp = malloc(sizeof(*fhp) + fhlen - 1,
+					    M_NFSFH, M_WAITOK);
+				else
+					fhp = malloc(sizeof(*fhp), M_NFSFH,
+					    M_WAITOK);
+				flp->nfsfl_fh[j] = fhp;
+				flp->nfsfl_fhcnt++;
+				fhp->nfh_len = fhlen;
+				NFSM_DISSECT(cp, uint8_t *, NFSM_RNDUP(fhlen));
+				NFSBCOPY(cp, fhp->nfh_fh, fhlen);
+			}
+		}
+	}
+	if (nd->nd_repstat != 0 && error == 0)
+		error = nd->nd_repstat;
+nfsmout:
+	if (error != 0) {
+		TAILQ_FOREACH_SAFE(flp, flhp, nfsfl_list, nflp) {
+			for (i = 0; i < flp->nfsfl_fhcnt; i++)
+				free(flp->nfsfl_fh[i], M_NFSFH);
+			free(flp->nfsfl_fhp, M_NFSFH);
+			free(flp, M_NFSFLAYOUT);
+		}
+		TAILQ_INIT(flhp);
+	}
+	mbuf_freem(nd->nd_mrep);
+	return (error);
+}
+

From owner-svn-src-projects@FreeBSD.ORG  Sun Jan  1 03:38:37 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 58C8E106564A;
	Sun,  1 Jan 2012 03:38:37 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 465078FC0A;
	Sun,  1 Jan 2012 03:38:37 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q013cbOa095617;
	Sun, 1 Jan 2012 03:38:37 GMT (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q013cbK2095613;
	Sun, 1 Jan 2012 03:38:37 GMT (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201201010338.q013cbK2095613@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Sun, 1 Jan 2012 03:38:37 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229167 - in projects/nfsv4.1-client/sys/fs: nfs
	nfsclient
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Jan 2012 03:38:37 -0000

Author: rmacklem
Date: Sun Jan  1 03:38:36 2012
New Revision: 229167
URL: http://svn.freebsd.org/changeset/base/229167

Log:
  Redefine the NFSv4.1 File Layout structure as 2 structures, where
  the second one chains off the first in increasing offset order.
  This is necessary since the stateid changes for each LayoutGet
  Op. and the most up-to-date one must be used. It also simplified
  the coding of nfsrpc_layoutget().
  This function is still untested and it, along with the structures
  will continue to change for a while.

Modified:
  projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h
  projects/nfsv4.1-client/sys/fs/nfs/nfsclstate.h
  projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c

Modified: projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h	Sun Jan  1 02:34:15 2012	(r229166)
+++ projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h	Sun Jan  1 03:38:36 2012	(r229167)
@@ -73,8 +73,7 @@ struct nfsclsession;
 struct nfscllockowner;
 struct nfscllock;
 struct nfscldeleg;
-struct nfsclflayout;
-struct nfsclflayouthead;
+struct nfscllayout;
 struct nfsv4lock;
 struct nfsvattr;
 struct nfs_vattr;
@@ -443,8 +442,7 @@ int nfsrpc_destroysession(struct nfsmoun
 int nfsrpc_destroyclient(struct nfsmount *, struct nfsclclient *,
     struct ucred *, NFSPROC_T *);
 int nfsrpc_layoutget(vnode_t, int, uint64_t, uint64_t, uint64_t,
-    nfsv4stateid_t *, struct nfsclflayouthead *, struct ucred *,
-    NFSPROC_T *, void *);
+    struct nfscllayout *, struct ucred *, NFSPROC_T *, void *);
 
 /* nfs_clstate.c */
 int nfscl_open(vnode_t, u_int8_t *, int, u_int32_t, int,

Modified: projects/nfsv4.1-client/sys/fs/nfs/nfsclstate.h
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfs/nfsclstate.h	Sun Jan  1 02:34:15 2012	(r229166)
+++ projects/nfsv4.1-client/sys/fs/nfs/nfsclstate.h	Sun Jan  1 03:38:36 2012	(r229167)
@@ -40,8 +40,9 @@ LIST_HEAD(nfsclhead, nfsclclient);
 LIST_HEAD(nfsclownerhead, nfsclowner);
 TAILQ_HEAD(nfscldeleghead, nfscldeleg);
 LIST_HEAD(nfscldeleghash, nfscldeleg);
-TAILQ_HEAD(nfsclflayouthead, nfsclflayout);
-LIST_HEAD(nfsclflayouthash, nfsclflayout);
+TAILQ_HEAD(nfscllayouthead, nfscllayout);
+LIST_HEAD(nfscllayouthash, nfscllayout);
+LIST_HEAD(nfsclflayouthead, nfsclflayout);
 #define	NFSCLDELEGHASHSIZE	256
 #define	NFSCLDELEGHASH(c, f, l)						\
 	(&((c)->nfsc_deleghash[ncl_hash((f), (l)) % NFSCLDELEGHASHSIZE]))
@@ -200,14 +201,25 @@ struct nfscllockownerfh {
 };
 
 /*
+ * MALLOC'd to the correct length to accommodate the file handle.
+ */
+struct nfscllayout {
+	TAILQ_ENTRY(nfscllayout)	nfsly_list;
+	LIST_ENTRY(nfscllayout)		nfsly_hash;
+	nfsv4stateid_t			nfsly_stateid;
+	struct nfsclflayouthead		nfsly_flay;
+	struct nfsclclient		*nfsly_clp;
+	uint16_t			nfsly_retonclose;
+	uint16_t			nfsly_fhlen;
+	uint8_t				nfsly_fh[1];
+};
+
+/*
  * MALLOC'd to the correct length to accommodate the file handle list.
+ * These hang off of nfsly_flay, sorted in increasing offset order.
  */
 struct nfsclflayout {
-	TAILQ_ENTRY(nfsclflayout)	nfsfl_list;
-	LIST_ENTRY(nfsclflayout)	nfsfl_hash;
-	struct nfsclclient		*nfsfl_clp;
-	struct nfsfh			*nfsfl_fhp;	/* FH of vnode */
-	nfsv4stateid_t			nfsfl_stateid;
+	LIST_ENTRY(nfsclflayout)	nfsfl_list;
 	uint8_t				nfsfl_dev[NFSX_V4DEVICEID];
 	uint64_t			nfsfl_off;
 	uint64_t			nfsfl_len;
@@ -215,8 +227,7 @@ struct nfsclflayout {
 	uint32_t			nfsfl_iomode;
 	uint32_t			nfsfl_util;
 	uint32_t			nfsfl_stripe1;
-	uint16_t			nfsfl_retonclose;
-	uint16_t			nfsfl_fhcnt;
+	uint32_t			nfsfl_fhcnt;
 	struct nfsfh			*nfsfl_fh[1];	/* FH list for DS */
 };
 

Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c	Sun Jan  1 02:34:15 2012	(r229166)
+++ projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c	Sun Jan  1 03:38:36 2012	(r229167)
@@ -4456,19 +4456,19 @@ nfsrpc_destroyclient(struct nfsmount *nm
  */
 int
 nfsrpc_layoutget(vnode_t vp, int iomode, uint64_t offset, uint64_t len,
-    uint64_t minlen, nfsv4stateid_t *stateidp, struct nfsclflayouthead *flhp,
-    struct ucred *cred, NFSPROC_T *p, void *stuff)
+    uint64_t minlen, struct nfscllayout *lp, struct ucred *cred,
+    NFSPROC_T *p, void *stuff)
 {
 	uint32_t *tl;
 	struct nfsrv_descript nfsd, *nd = &nfsd;
 	struct nfsfh *fhp;
-	struct nfsclflayout *flp, *nflp;
+	struct nfsclflayout *flp, *nflp, *tflp;
 	struct nfsnode *np;
-	nfsv4stateid_t st;
-	int cnt, error, fhcnt, fhlen, i, j, retonclose;
+	int cnt, error, fhcnt, fhlen, i, j;
 	uint8_t *cp;
 
 	np = VTONFS(vp);
+	flp = NULL;
 	NFSCL_REQSTART(nd, NFSPROC_LAYOUTGET, vp);
 	NFSM_BUILD(tl, uint32_t *, 4 * NFSX_UNSIGNED + 3 * NFSX_HYPER +
 	    NFSX_STATEID);
@@ -4481,10 +4481,10 @@ nfsrpc_layoutget(vnode_t vp, int iomode,
 	tl += 2;
 	txdr_hyper(minlen, tl);
 	tl += 2;
-	*tl++ = stateidp->seqid;
-	*tl++ = stateidp->other[0];
-	*tl++ = stateidp->other[1];
-	*tl++ = stateidp->other[2];
+	*tl++ = lp->nfsly_stateid.seqid;
+	*tl++ = lp->nfsly_stateid.other[0];
+	*tl++ = lp->nfsly_stateid.other[1];
+	*tl++ = lp->nfsly_stateid.other[2];
 	*tl = txdr_unsigned(100000);	/* take a large layout list */
 	nd->nd_flag |= ND_USEGSSNAME;
 	error = nfscl_request(nd, vp, p, cred, stuff);
@@ -4492,15 +4492,14 @@ nfsrpc_layoutget(vnode_t vp, int iomode,
 		return (error);
 	if (nd->nd_repstat == 0) {
 		NFSM_DISSECT(tl, uint32_t *, 2 * NFSX_UNSIGNED + NFSX_STATEID);
-		if (*tl++ != 0)
-			retonclose = 1;
-		else
-			retonclose = 0;
-printf("layg rcl=%d\n", retonclose);
-		st.seqid = *tl++;
-		st.other[0] = *tl++;
-		st.other[1] = *tl++;
-		st.other[2] = *tl++;
+		if (*tl++ != 0) {
+			lp->nfsly_retonclose = 1;
+printf("layg setting retonclose\n");
+		}
+		lp->nfsly_stateid.seqid = *tl++;
+		lp->nfsly_stateid.other[0] = *tl++;
+		lp->nfsly_stateid.other[1] = *tl++;
+		lp->nfsly_stateid.other[2] = *tl++;
 		cnt = fxdr_unsigned(int, *tl);
 printf("layg cnt=%d\n", cnt);
 		if (cnt <= 0 || cnt > 10000) {
@@ -4528,22 +4527,6 @@ printf("fhcnt=%d\n", fhcnt);
 				flp = malloc(sizeof(*flp),
 				    M_NFSFLAYOUT, M_WAITOK);
 			flp->nfsfl_fhcnt = 0;
-			fhlen = np->n_fhp->nfh_len;
-			if (fhlen > 1)
-				fhp = malloc(sizeof(*fhp) + fhlen - 1,
-				    M_NFSFH, M_WAITOK);
-			else
-				fhp = malloc(sizeof(*fhp), M_NFSFH,
-				    M_WAITOK);
-			fhp->nfh_len = fhlen;
-			NFSBCOPY(np->n_fhp->nfh_fh, fhp->nfh_fh, fhlen);
-			flp->nfsfl_fhp = fhp;
-			TAILQ_INSERT_HEAD(flhp, flp, nfsfl_list);
-			flp->nfsfl_retonclose = retonclose;
-			flp->nfsfl_stateid.seqid = st.seqid;
-			flp->nfsfl_stateid.other[0] = st.other[0];
-			flp->nfsfl_stateid.other[1] = st.other[1];
-			flp->nfsfl_stateid.other[2] = st.other[2];
 			flp->nfsfl_off = fxdr_hyper(tl); tl += 2;
 			flp->nfsfl_len = fxdr_hyper(tl); tl += 2;
 			flp->nfsfl_iomode = fxdr_unsigned(int, *tl++);
@@ -4571,31 +4554,40 @@ printf("layg iom=%d\n", iomode);
 					error = NFSERR_BADXDR;
 					goto nfsmout;
 				}
-				if (fhlen > 1)
-					fhp = malloc(sizeof(*fhp) + fhlen - 1,
-					    M_NFSFH, M_WAITOK);
-				else
-					fhp = malloc(sizeof(*fhp), M_NFSFH,
-					    M_WAITOK);
+				fhp = malloc(sizeof(*fhp) + fhlen - 1,
+				    M_NFSFH, M_WAITOK);
 				flp->nfsfl_fh[j] = fhp;
 				flp->nfsfl_fhcnt++;
 				fhp->nfh_len = fhlen;
 				NFSM_DISSECT(cp, uint8_t *, NFSM_RNDUP(fhlen));
 				NFSBCOPY(cp, fhp->nfh_fh, fhlen);
 			}
+			if (LIST_EMPTY(&lp->nfsly_flay) ||
+			    LIST_FIRST(&lp->nfsly_flay)->nfsfl_off >=
+			    flp->nfsfl_off)
+				LIST_INSERT_HEAD(&lp->nfsly_flay, flp,
+				    nfsfl_list);
+			else {
+				nflp = LIST_FIRST(&lp->nfsly_flay);
+				tflp = LIST_NEXT(nflp, nfsfl_list);
+				while (tflp != NULL) {
+					if (tflp->nfsfl_off >= flp->nfsfl_off)
+						break;
+					nflp = tflp;
+					tflp = LIST_NEXT(tflp, nfsfl_list);
+				}
+				LIST_INSERT_AFTER(nflp, flp, nfsfl_list);
+			}
+			flp = NULL;
 		}
 	}
 	if (nd->nd_repstat != 0 && error == 0)
 		error = nd->nd_repstat;
 nfsmout:
-	if (error != 0) {
-		TAILQ_FOREACH_SAFE(flp, flhp, nfsfl_list, nflp) {
-			for (i = 0; i < flp->nfsfl_fhcnt; i++)
-				free(flp->nfsfl_fh[i], M_NFSFH);
-			free(flp->nfsfl_fhp, M_NFSFH);
-			free(flp, M_NFSFLAYOUT);
-		}
-		TAILQ_INIT(flhp);
+	if (error != 0 && flp != NULL) {
+		for (i = 0; i < flp->nfsfl_fhcnt; i++)
+			free(flp->nfsfl_fh[i], M_NFSFH);
+		free(flp, M_NFSFLAYOUT);
 	}
 	mbuf_freem(nd->nd_mrep);
 	return (error);

From owner-svn-src-projects@FreeBSD.ORG  Mon Jan  2 09:44:43 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4335E106566B;
	Mon,  2 Jan 2012 09:44:43 +0000 (UTC)
	(envelope-from gber@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3290B8FC0A;
	Mon,  2 Jan 2012 09:44:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q029ih03057776;
	Mon, 2 Jan 2012 09:44:43 GMT (envelope-from gber@svn.freebsd.org)
Received: (from gber@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q029ihSa057774;
	Mon, 2 Jan 2012 09:44:43 GMT (envelope-from gber@svn.freebsd.org)
Message-Id: <201201020944.q029ihSa057774@svn.freebsd.org>
From: Grzegorz Bernacki <gber@FreeBSD.org>
Date: Mon, 2 Jan 2012 09:44:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229266 - projects/armv6/sys/kern
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jan 2012 09:44:43 -0000

Author: gber
Date: Mon Jan  2 09:44:42 2012
New Revision: 229266
URL: http://svn.freebsd.org/changeset/base/229266

Log:
  Do not check next scheduled event on APs until smp is started.
  
  Obtained from: Marvell, Semihalf

Modified:
  projects/armv6/sys/kern/kern_clocksource.c

Modified: projects/armv6/sys/kern/kern_clocksource.c
==============================================================================
--- projects/armv6/sys/kern/kern_clocksource.c	Mon Jan  2 09:18:58 2012	(r229265)
+++ projects/armv6/sys/kern/kern_clocksource.c	Mon Jan  2 09:44:42 2012	(r229266)
@@ -295,7 +295,7 @@ getnextevent(struct bintime *event)
 	*event = state->nextevent;
 	c = curcpu;
 #ifdef SMP
-	if ((timer->et_flags & ET_FLAGS_PERCPU) == 0) {
+	if ((timer->et_flags & ET_FLAGS_PERCPU) == 0 && smp_started) {
 		CPU_FOREACH(cpu) {
 			if (curcpu == cpu)
 				continue;

From owner-svn-src-projects@FreeBSD.ORG  Mon Jan  2 09:48:47 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9BE9F106564A;
	Mon,  2 Jan 2012 09:48:47 +0000 (UTC)
	(envelope-from gber@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 703358FC0C;
	Mon,  2 Jan 2012 09:48:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q029ml2Q057934;
	Mon, 2 Jan 2012 09:48:47 GMT (envelope-from gber@svn.freebsd.org)
Received: (from gber@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q029mlXq057930;
	Mon, 2 Jan 2012 09:48:47 GMT (envelope-from gber@svn.freebsd.org)
Message-Id: <201201020948.q029mlXq057930@svn.freebsd.org>
From: Grzegorz Bernacki <gber@FreeBSD.org>
Date: Mon, 2 Jan 2012 09:48:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229267 - in projects/armv6: share/mk sys/arm/include
	sys/arm/mv
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jan 2012 09:48:47 -0000

Author: gber
Date: Mon Jan  2 09:48:46 2012
New Revision: 229267
URL: http://svn.freebsd.org/changeset/base/229267

Log:
  Set ARM_ARCH_6 when CPUTYPE is set to armv6.
  
  Different set of atomic function should be compiled when armv6 is used, so
  when userland is built it has to know which architecture it will be used for.
  Now CPUTYPE=armv6 is used to tell that kernel and userland are built for
  armv6.
  
  Obtained from: Marvell, Semihalf

Modified:
  projects/armv6/share/mk/bsd.cpu.mk
  projects/armv6/sys/arm/include/cpuconf.h
  projects/armv6/sys/arm/mv/std-pj4b.mv

Modified: projects/armv6/share/mk/bsd.cpu.mk
==============================================================================
--- projects/armv6/share/mk/bsd.cpu.mk	Mon Jan  2 09:44:42 2012	(r229266)
+++ projects/armv6/share/mk/bsd.cpu.mk	Mon Jan  2 09:48:46 2012	(r229267)
@@ -98,6 +98,8 @@ _CPUCFLAGS = -march=${CPUTYPE}
 #XXX: gcc doesn't seem to like -mcpu=xscale, and dies while rebuilding itself
 #_CPUCFLAGS = -mcpu=xscale
 _CPUCFLAGS = -march=armv5te -D__XSCALE__
+. elif ${CPUTYPE} == "armv6"
+_CPUCFLAGS = -march=${CPUTYPE} -DARM_ARCH_6
 .  else
 _CPUCFLAGS = -mcpu=${CPUTYPE}
 .  endif

Modified: projects/armv6/sys/arm/include/cpuconf.h
==============================================================================
--- projects/armv6/sys/arm/include/cpuconf.h	Mon Jan  2 09:44:42 2012	(r229266)
+++ projects/armv6/sys/arm/include/cpuconf.h	Mon Jan  2 09:48:46 2012	(r229267)
@@ -88,12 +88,6 @@
 #define	ARM_ARCH_5	0
 #endif
 
-#if defined(CPU_ARM11) || defined(CPU_MV_PJ4B)
-#define ARM_ARCH_6	1
-#else
-#define ARM_ARCH_6	0
-#endif
-
 #if defined(CPU_CORTEXA)
 #define ARM_ARCH_7A	1
 #else

Modified: projects/armv6/sys/arm/mv/std-pj4b.mv
==============================================================================
--- projects/armv6/sys/arm/mv/std-pj4b.mv	Mon Jan  2 09:44:42 2012	(r229266)
+++ projects/armv6/sys/arm/mv/std-pj4b.mv	Mon Jan  2 09:48:46 2012	(r229267)
@@ -2,6 +2,5 @@
 
 files		"../mv/files.mv"
 cpu		CPU_MV_PJ4B
-makeoptions	CONF_CFLAGS="-march=armv6"
 
 options		VM_MAXUSER_ADDRESS="(KERNBASE-(1024*1024*1024))"

From owner-svn-src-projects@FreeBSD.ORG  Mon Jan  2 09:51:13 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 02E21106564A;
	Mon,  2 Jan 2012 09:51:13 +0000 (UTC)
	(envelope-from gber@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id CBD338FC0C;
	Mon,  2 Jan 2012 09:51:12 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q029pCE8058055;
	Mon, 2 Jan 2012 09:51:12 GMT (envelope-from gber@svn.freebsd.org)
Received: (from gber@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q029pCVa058052;
	Mon, 2 Jan 2012 09:51:12 GMT (envelope-from gber@svn.freebsd.org)
Message-Id: <201201020951.q029pCVa058052@svn.freebsd.org>
From: Grzegorz Bernacki <gber@FreeBSD.org>
Date: Mon, 2 Jan 2012 09:51:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229268 - projects/armv6/sys/arm/arm
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jan 2012 09:51:13 -0000

Author: gber
Date: Mon Jan  2 09:51:12 2012
New Revision: 229268
URL: http://svn.freebsd.org/changeset/base/229268

Log:
  Little cleanup.
  
  Obtained from: Marvell, Semihalf

Modified:
  projects/armv6/sys/arm/arm/cpufunc.c
  projects/armv6/sys/arm/arm/mp_machdep.c

Modified: projects/armv6/sys/arm/arm/cpufunc.c
==============================================================================
--- projects/armv6/sys/arm/arm/cpufunc.c	Mon Jan  2 09:48:46 2012	(r229267)
+++ projects/armv6/sys/arm/arm/cpufunc.c	Mon Jan  2 09:51:12 2012	(r229268)
@@ -1352,14 +1352,12 @@ set_cpufuncs()
 		else
 			cpufuncs = pj4bv6_cpufuncs;
 
-		pj4b_config();
 		get_cachetype_cp15();
 		pmap_pte_init_mmu_v6();
 		goto out;
 	} else if (cputype == CPU_ID_ARM_88SV584X ||
 	    cputype == CPU_ID_MV88SV584X) {
 		cpufuncs = pj4bv6_cpufuncs;
-		pj4b_config();
 		get_cachetype_cp15();
 		pmap_pte_init_mmu_v6();
 		goto out;
@@ -2241,6 +2239,8 @@ pj4bv6_setup(char *args)
 {
 	int cpuctrl;
 
+	pj4b_config();
+
 	cpuctrl = CPU_CONTROL_MMU_ENABLE;
 #ifndef ARM32_DISABLE_ALIGNMENT_FAULTS
 	cpuctrl |= CPU_CONTROL_AFLT_ENABLE;
@@ -2278,6 +2278,8 @@ pj4bv7_setup(args)
 {
 	int cpuctrl;
 
+	pj4b_config();
+
 	cpuctrl = CPU_CONTROL_MMU_ENABLE;
 #ifndef ARM32_DISABLE_ALIGNMENT_FAULTS
 	cpuctrl |= CPU_CONTROL_AFLT_ENABLE;

Modified: projects/armv6/sys/arm/arm/mp_machdep.c
==============================================================================
--- projects/armv6/sys/arm/arm/mp_machdep.c	Mon Jan  2 09:48:46 2012	(r229267)
+++ projects/armv6/sys/arm/arm/mp_machdep.c	Mon Jan  2 09:51:12 2012	(r229268)
@@ -130,9 +130,7 @@ init_secondary(int cpu)
 {
 	struct pcpu *pc;
 
-	pj4b_config();
-
-	pj4bv6_setup(NULL);
+	cpu_setup(NULL);
 
 	setttb(pmap_pa);
 	cpu_tlb_flushID();
@@ -161,15 +159,11 @@ init_secondary(int cpu)
 
 	mtx_lock_spin(&ap_boot_mtx);
 
-	cpu_dcache_wbinv_all();
-	smp_cpus++;
-	cpu_dcache_wbinv_all();
+	atomic_store_rel_int(&smp_cpus, 1);
 
 	if (smp_cpus == mp_ncpus) {
 		/* enable IPI's, tlb shootdown, freezes etc */
-		cpu_dcache_wbinv_all();
 		atomic_store_rel_int(&smp_started, 1);
-		cpu_dcache_wbinv_all();
 		smp_active = 1;
 	}
 

From owner-svn-src-projects@FreeBSD.ORG  Mon Jan  2 09:53:47 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C22521065672;
	Mon,  2 Jan 2012 09:53:47 +0000 (UTC)
	(envelope-from gber@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B173D8FC13;
	Mon,  2 Jan 2012 09:53:47 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q029rlck058161;
	Mon, 2 Jan 2012 09:53:47 GMT (envelope-from gber@svn.freebsd.org)
Received: (from gber@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q029rlfG058159;
	Mon, 2 Jan 2012 09:53:47 GMT (envelope-from gber@svn.freebsd.org)
Message-Id: <201201020953.q029rlfG058159@svn.freebsd.org>
From: Grzegorz Bernacki <gber@FreeBSD.org>
Date: Mon, 2 Jan 2012 09:53:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229269 - projects/armv6/sys/arm/arm
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jan 2012 09:53:47 -0000

Author: gber
Date: Mon Jan  2 09:53:47 2012
New Revision: 229269
URL: http://svn.freebsd.org/changeset/base/229269

Log:
  Switch timers into idle mode when cpu is idle.
  
  Obtained from:	Marvell, Semihalf

Modified:
  projects/armv6/sys/arm/arm/machdep.c

Modified: projects/armv6/sys/arm/arm/machdep.c
==============================================================================
--- projects/armv6/sys/arm/arm/machdep.c	Mon Jan  2 09:51:12 2012	(r229268)
+++ projects/armv6/sys/arm/arm/machdep.c	Mon Jan  2 09:53:47 2012	(r229269)
@@ -348,7 +348,16 @@ cpu_est_clockrate(int cpu_id, uint64_t *
 void
 cpu_idle(int busy)
 {
+	
+	if (!busy) {
+		critical_enter();
+		cpu_idleclock();
+	}
 	cpu_sleep(0);
+	if (!busy) {
+		cpu_activeclock();
+		critical_exit();
+	}
 }
 
 int

From owner-svn-src-projects@FreeBSD.ORG  Mon Jan  2 09:56:41 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 597351065672;
	Mon,  2 Jan 2012 09:56:41 +0000 (UTC)
	(envelope-from andrew@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 476B58FC18;
	Mon,  2 Jan 2012 09:56:41 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q029ufB3058293;
	Mon, 2 Jan 2012 09:56:41 GMT (envelope-from andrew@svn.freebsd.org)
Received: (from andrew@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q029ufFB058288;
	Mon, 2 Jan 2012 09:56:41 GMT (envelope-from andrew@svn.freebsd.org)
Message-Id: <201201020956.q029ufFB058288@svn.freebsd.org>
From: Andrew Turner <andrew@FreeBSD.org>
Date: Mon, 2 Jan 2012 09:56:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229270 - in projects/arm_eabi/sys: conf libkern/arm
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jan 2012 09:56:41 -0000

Author: andrew
Date: Mon Jan  2 09:56:40 2012
New Revision: 229270
URL: http://svn.freebsd.org/changeset/base/229270

Log:
  Implement the required __aeabi_* functions by the Kernel

Added:
  projects/arm_eabi/sys/libkern/arm/ldivmod.S
  projects/arm_eabi/sys/libkern/arm/ldivmod_helper.c
Modified:
  projects/arm_eabi/sys/conf/files.arm
  projects/arm_eabi/sys/libkern/arm/divsi3.S

Modified: projects/arm_eabi/sys/conf/files.arm
==============================================================================
--- projects/arm_eabi/sys/conf/files.arm	Mon Jan  2 09:53:47 2012	(r229269)
+++ projects/arm_eabi/sys/conf/files.arm	Mon Jan  2 09:56:40 2012	(r229270)
@@ -63,6 +63,8 @@ geom/geom_mbr.c			optional	geom_mbr
 geom/geom_mbr_enc.c		optional	geom_mbr
 libkern/arm/divsi3.S		standard
 libkern/arm/ffs.S		standard
+libkern/arm/ldivmod.S		standard
+libkern/arm/ldivmod_helper.c	standard
 libkern/arm/muldi3.c		standard
 libkern/ashldi3.c		standard
 libkern/ashrdi3.c		standard

Modified: projects/arm_eabi/sys/libkern/arm/divsi3.S
==============================================================================
--- projects/arm_eabi/sys/libkern/arm/divsi3.S	Mon Jan  2 09:53:47 2012	(r229269)
+++ projects/arm_eabi/sys/libkern/arm/divsi3.S	Mon Jan  2 09:56:40 2012	(r229270)
@@ -49,6 +49,10 @@ ENTRY_NP(__modsi3)
 #endif
 	RET
 
+#ifdef __ARM_EABI__
+ENTRY_NP(__aeabi_uidiv)
+ENTRY_NP(__aeabi_uidivmod)
+#endif
 ENTRY_NP(__udivsi3)
 .L_udivide:				/* r0 = r0 / r1; r1 = r0 % r1 */
 	eor     r0, r1, r0 
@@ -71,6 +75,10 @@ ENTRY_NP(__udivsi3)
 	mov	r1, #0
 	RET
 
+#ifdef __ARM_EABI__
+ENTRY_NP(__aeabi_idiv)
+ENTRY_NP(__aeabi_idivmod)
+#endif
 ENTRY_NP(__divsi3)
 .L_divide:				/* r0 = r0 / r1; r1 = r0 % r1 */
 	eor     r0, r1, r0 

Added: projects/arm_eabi/sys/libkern/arm/ldivmod.S
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/arm_eabi/sys/libkern/arm/ldivmod.S	Mon Jan  2 09:56:40 2012	(r229270)
@@ -0,0 +1,48 @@
+/*
+ * Copyright (C) 2012 Andrew Turner
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY 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.
+ *
+ */
+
+#include <machine/asm.h>
+__FBSDID("$FreeBSD$");
+
+ENTRY_NP(__aeabi_ldivmod)
+	sub	sp, sp, #8	/* Space for the remainder */
+	stmfd	sp!, {sp, lr}	/* Sace the rem pointer and lr */
+	bl	PIC_SYM(_C_LABEL(__kern_ldivmod), PLT)
+	ldr	lr, [sp, #4]	/* Restore lr */
+	add	sp, sp, #8	/* Move sp to the remainder value */
+	ldmfd	sp!, {r2, r3}	/* Load the remainder */
+	RET
+
+ENTRY_NP(__aeabi_uldivmod)
+	sub	sp, sp, #8	/* Space for the remainder */
+	stmfd	sp!, {sp, lr}	/* Sace the rem pointer and lr */
+	bl	PIC_SYM(_C_LABEL(__qdivrem), PLT)
+	ldr	lr, [sp, #4]	/* Restore lr */
+	add	sp, sp, #8	/* Move sp to the remainder value */
+	ldmfd	sp!, {r2, r3}	/* Load the remainder */
+	RET
+

Added: projects/arm_eabi/sys/libkern/arm/ldivmod_helper.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/arm_eabi/sys/libkern/arm/ldivmod_helper.c	Mon Jan  2 09:56:40 2012	(r229270)
@@ -0,0 +1,50 @@
+/*
+ * Copyright (C) 2012 Andrew Turner
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY 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.
+ *
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <libkern/quad.h>
+
+/*
+ * Helper for __aeabi_ldivmod.
+ * TODO: __divdi3 calls __qdivrem. We should do the same and use the
+ * remainder value rather than re-calculating it.
+ */
+long long __kern_ldivmod(long long, long long, long long *);
+
+long long
+__kern_ldivmod(long long n, long long m, long long *rem)
+{
+	long long q;
+
+	q = __divdi3(n, m);	/* q = n / m */
+	*rem = n - m * q;
+
+	return q;
+}
+

From owner-svn-src-projects@FreeBSD.ORG  Mon Jan  2 09:58:40 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9A5BF106564A;
	Mon,  2 Jan 2012 09:58:40 +0000 (UTC)
	(envelope-from gber@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 8832A8FC0C;
	Mon,  2 Jan 2012 09:58:40 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q029wemD058387;
	Mon, 2 Jan 2012 09:58:40 GMT (envelope-from gber@svn.freebsd.org)
Received: (from gber@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q029weIU058383;
	Mon, 2 Jan 2012 09:58:40 GMT (envelope-from gber@svn.freebsd.org)
Message-Id: <201201020958.q029weIU058383@svn.freebsd.org>
From: Grzegorz Bernacki <gber@FreeBSD.org>
Date: Mon, 2 Jan 2012 09:58:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229271 - in projects/armv6/sys: arm/conf boot/fdt/dts
	dev/mge
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 02 Jan 2012 09:58:40 -0000

Author: gber
Date: Mon Jan  2 09:58:39 2012
New Revision: 229271
URL: http://svn.freebsd.org/changeset/base/229271

Log:
  Import files needed to build ARMADA XP kernel.
  
  Obtained from:	Marvell, Semihalf

Added:
  projects/armv6/sys/arm/conf/ARMADAXP
Modified:
  projects/armv6/sys/boot/fdt/dts/db88f78160.dts
  projects/armv6/sys/dev/mge/if_mge.c
  projects/armv6/sys/dev/mge/if_mgevar.h

Added: projects/armv6/sys/arm/conf/ARMADAXP
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/armv6/sys/arm/conf/ARMADAXP	Mon Jan  2 09:58:39 2012	(r229271)
@@ -0,0 +1,102 @@
+#
+# Custom kernel for Marvell Armada XP
+#
+# $FreeBSD$
+#
+
+ident		MV-88F78XX0
+include		"../mv/armadaxp/std.mv78x60"
+
+options 	SOC_MV_ARMADAXP
+makeoptions	MODULES_OVERRIDE=""
+
+makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
+makeoptions	WERROR="-Werror --save-temps"
+
+#options 	SCHED_ULE		#ULE scheduler
+options 	SCHED_4BSD		#4BSD scheduler
+options 	INET			#InterNETworking
+options 	INET6			#IPv6 communications protocols
+options 	FFS			#Berkeley Fast Filesystem
+options 	NFSCL			#Network Filesystem Client
+options 	NFSLOCKD		#Network Lock Manager
+options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
+options 	BOOTP
+options 	BOOTP_NFSROOT
+options 	BOOTP_NFSV3
+options 	BOOTP_WIRED_TO=mge0
+
+options 	GEOM_PART_GPT
+options 	ROOTDEVNAME=\"ufs:/dev/da0p1\"
+
+options 	SYSVSHM			#SYSV-style shared memory
+options 	SYSVMSG			#SYSV-style message queues
+options 	SYSVSEM			#SYSV-style semaphores
+options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
+options 	MUTEX_NOINLINE
+options 	RWLOCK_NOINLINE
+options 	NO_FFS_SNAPSHOT
+options 	NO_SWAPPING
+
+options 	SMP
+
+# Debugging
+#options 	VERBOSE_SYSINIT
+options 	ALT_BREAK_TO_DEBUGGER
+options 	DDB
+options 	GDB
+#options 	DIAGNOSTIC
+#options 	INVARIANTS		#Enable calls of extra sanity checking
+#options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
+options 	KDB
+options 	KDB_TRACE
+#options 	KTR
+#options 	KTR_VERBOSE=0
+#options 	KTR_ENTRIES=16384
+#options 	KTR_MASK=(KTR_SPARE2)
+#options 	KTR_COMPILE=KTR_ALL
+#options 	WITNESS			#Enable checks to detect deadlocks and cycles
+#options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
+#options 	WITNESS_KDB
+
+# Pseudo devices
+device		random
+device		pty
+device		loop
+device		md
+
+# USB
+options 	USB_DEBUG		# enable debug msgs
+device		usb
+device		ehci
+device		umass
+device		scbus
+device		pass
+device		da
+
+# SATA
+device		ata
+device		atadisk
+#device		mvs
+
+# Serial ports
+device		uart
+
+# I2C (TWSI)
+device		iic
+device		iicbus
+
+#Network
+device		ether
+device		mge			# Marvell Gigabit Ethernet controller
+device		mii
+device		e1000phy
+device		bpf
+options		HZ=1000
+options		DEVICE_POLLING
+device		vlan
+
+#FDT
+options 	FDT
+options 	FDT_DTB_STATIC
+makeoptions	FDT_DTS_FILE=db88f78160.dts

Modified: projects/armv6/sys/boot/fdt/dts/db88f78160.dts
==============================================================================
--- projects/armv6/sys/boot/fdt/dts/db88f78160.dts	Mon Jan  2 09:56:40 2012	(r229270)
+++ projects/armv6/sys/boot/fdt/dts/db88f78160.dts	Mon Jan  2 09:58:39 2012	(r229271)
@@ -74,7 +74,7 @@
 			interrupt-controller;
 			#address-cells = <0>;
 			#interrupt-cells = <1>;
-			reg = <0x20a00 0x200>;
+			reg = <0x20a00 0x500 0x21000 0x800>;
 			compatible = "mrvl,mpic";
 		};
 
@@ -253,10 +253,11 @@
 			compatible = "mrvl,ge";
 			reg = <0x72000 0x2000>;
 			ranges = <0x0 0x72000 0x2000>;
-			local-mac-address = [ 00 01 01 07 84 60 ];
+			local-mac-address = [ 00 04 01 07 84 60 ];
 			interrupts = <67 68 122 >;
 			interrupt-parent = <&MPIC>;
 			phy-handle = <&phy0>;
+			has-neta;
 
 			mdio@0 {
 				#address-cells = <1>;

Modified: projects/armv6/sys/dev/mge/if_mge.c
==============================================================================
--- projects/armv6/sys/dev/mge/if_mge.c	Mon Jan  2 09:56:40 2012	(r229270)
+++ projects/armv6/sys/dev/mge/if_mge.c	Mon Jan  2 09:58:39 2012	(r229271)
@@ -79,7 +79,6 @@ __FBSDID("$FreeBSD$");
 
 #include "miibus_if.h"
 
-/* PHY registers are in the address space of the first mge unit */
 static struct mge_softc *sc_mge0 = NULL;
 
 static int mge_probe(device_t dev);
@@ -107,7 +106,10 @@ static uint32_t mge_rx_ipg(uint32_t val,
 static void mge_ver_params(struct mge_softc *sc);
 
 static void mge_intrs_ctrl(struct mge_softc *sc, int enable);
+static void mge_intr_rxtx(void *arg);
 static void mge_intr_rx(void *arg);
+static void mge_intr_rx_check(struct mge_softc *sc, uint32_t int_cause,
+    uint32_t int_cause_ext);
 static int mge_intr_rx_locked(struct mge_softc *sc, int count);
 static void mge_intr_tx(void *arg);
 static void mge_intr_tx_locked(struct mge_softc *sc);
@@ -174,15 +176,14 @@ static struct resource_spec res_spec[] =
 	{ SYS_RES_IRQ, 0, RF_ACTIVE | RF_SHAREABLE },
 	{ SYS_RES_IRQ, 1, RF_ACTIVE | RF_SHAREABLE },
 	{ SYS_RES_IRQ, 2, RF_ACTIVE | RF_SHAREABLE },
-	{ SYS_RES_IRQ, 3, RF_ACTIVE | RF_SHAREABLE },
-	{ SYS_RES_IRQ, 4, RF_ACTIVE | RF_SHAREABLE },
 	{ -1, 0 }
 };
 
 static struct {
 	driver_intr_t *handler;
 	char * description;
-} mge_intrs[MGE_INTR_COUNT] = {
+} mge_intrs[MGE_INTR_COUNT + 1] = {
+	{ mge_intr_rxtx,"GbE aggregated interrupt" },
 	{ mge_intr_rx,	"GbE receive interrupt" },
 	{ mge_intr_tx,	"GbE transmit interrupt" },
 	{ mge_intr_misc,"GbE misc interrupt" },
@@ -261,8 +262,9 @@ mge_ver_params(struct mge_softc *sc)
 	uint32_t d, r;
 
 	soc_id(&d, &r);
-	if (d == MV_DEV_88F6281 || d == MV_DEV_MV78100 ||
-	    d == MV_DEV_MV78100_Z0) {
+	if (d == MV_DEV_88F6281 || d == MV_DEV_88F6781 ||
+	    d == MV_DEV_MV78100_Z0 ||
+	    (d & MV_DEV_FAMILY_MASK) == MV_DEV_DISCOVERY) {
 		sc->mge_ver = 2;
 		sc->mge_mtu = 0x4e8;
 		sc->mge_tfut_ipg_max = 0xFFFF;
@@ -279,6 +281,15 @@ mge_ver_params(struct mge_softc *sc)
 		sc->mge_tx_tok_cfg = 0x3FFFFFFF;
 		sc->mge_tx_tok_cnt = 0x3FFFFFFF;
 	}
+	if (d == MV_DEV_88RC8180)
+		sc->mge_intr_cnt = 1;
+	else
+		sc->mge_intr_cnt = 2;
+
+	if (d == MV_DEV_MV78160 || d == MV_DEV_MV78260 || d == MV_DEV_MV78460)
+		sc->mge_hw_csum = 0;
+	else
+		sc->mge_hw_csum = 1;
 }
 
 static void
@@ -443,7 +454,7 @@ mge_alloc_desc_dma(struct mge_softc *sc,
 
 	/* Allocate a busdma tag for mbufs. */
 	error = bus_dma_tag_create(NULL,	/* parent */
-	    8, 0,				/* alignment, boundary */
+	    1, 0,				/* alignment, boundary */
 	    BUS_SPACE_MAXADDR_32BIT,		/* lowaddr */
 	    BUS_SPACE_MAXADDR,			/* highaddr */
 	    NULL, NULL,				/* filtfunc, filtfuncarg */
@@ -685,9 +696,12 @@ mge_attach(device_t dev)
 	if_initname(ifp, device_get_name(dev), device_get_unit(dev));
 	ifp->if_softc = sc;
 	ifp->if_flags = IFF_SIMPLEX | IFF_MULTICAST | IFF_BROADCAST;
-	ifp->if_capabilities = IFCAP_HWCSUM | IFCAP_VLAN_MTU;
+	ifp->if_capabilities = IFCAP_VLAN_MTU;
+	if (sc->mge_hw_csum) {
+		ifp->if_capabilities |= IFCAP_HWCSUM;
+		ifp->if_hwassist = MGE_CHECKSUM_FEATURES;
+	}
 	ifp->if_capenable = ifp->if_capabilities;
-	ifp->if_hwassist = MGE_CHECKSUM_FEATURES;
 
 #ifdef DEVICE_POLLING
 	/* Advertise that polling is supported */
@@ -721,13 +735,15 @@ mge_attach(device_t dev)
 	MGE_WRITE(sc, MGE_REG_PHYDEV, miisc->mii_phy);
 
 	/* Attach interrupt handlers */
-	for (i = 0; i < 2; ++i) {
-		error = bus_setup_intr(dev, sc->res[1 + i],
-		    INTR_TYPE_NET | INTR_MPSAFE, NULL, *mge_intrs[i].handler,
-		    sc, &sc->ih_cookie[i]);
+	/* TODO: review flags, in part. mark RX as INTR_ENTROPY ? */
+	for (i = 1; i <= sc->mge_intr_cnt; ++i) {
+		error = bus_setup_intr(dev, sc->res[i],
+		    INTR_TYPE_NET | INTR_MPSAFE,
+		    NULL, *mge_intrs[(sc->mge_intr_cnt == 1 ? 0 : i)].handler,
+		    sc, &sc->ih_cookie[i - 1]);
 		if (error) {
 			device_printf(dev, "could not setup %s\n",
-			    mge_intrs[i].description);
+			    mge_intrs[(sc->mge_intr_cnt == 1 ? 0 : i)].description);
 			mge_detach(dev);
 			return (error);
 		}
@@ -752,14 +768,14 @@ mge_detach(device_t dev)
         callout_drain(&sc->wd_callout);
 
 	/* Stop and release all interrupts */
-	for (i = 0; i < 2; ++i) {
+	for (i = 0; i < sc->mge_intr_cnt; ++i) {
 		if (!sc->ih_cookie[i])
 			continue;
 
 		error = bus_teardown_intr(dev, sc->res[1 + i], sc->ih_cookie[i]);
 		if (error)
 			device_printf(dev, "could not release %s\n",
-			    mge_intrs[i].description);
+			    mge_intrs[(sc->mge_intr_cnt == 1 ? 0 : i + 1)].description);
 	}
 
 	/* Detach network interface */
@@ -987,6 +1003,41 @@ mge_init_locked(void *arg)
 }
 
 static void
+mge_intr_rxtx(void *arg)
+{
+	struct mge_softc *sc = arg;
+	uint32_t int_cause, int_cause_ext;
+
+	MGE_GLOBAL_LOCK(sc);
+
+#ifdef DEVICE_POLLING
+	if (sc->ifp->if_capenable & IFCAP_POLLING) {
+		MGE_GLOBAL_UNLOCK(sc);
+		return;
+	}
+#endif
+
+	/* Get interrupt cause */
+	int_cause = MGE_READ(sc, MGE_PORT_INT_CAUSE);
+	int_cause_ext = MGE_READ(sc, MGE_PORT_INT_CAUSE_EXT);
+
+	/* Check for Transmit interrupt */
+	if (int_cause_ext & (MGE_PORT_INT_EXT_TXBUF0 |
+	    MGE_PORT_INT_EXT_TXUR)) {
+		MGE_WRITE(sc, MGE_PORT_INT_CAUSE_EXT, ~(int_cause_ext &
+		    (MGE_PORT_INT_EXT_TXBUF0 | MGE_PORT_INT_EXT_TXUR)));
+		mge_intr_tx_locked(sc);
+	}
+
+	MGE_TRANSMIT_UNLOCK(sc);
+
+	/* Check for Receive interrupt */
+	mge_intr_rx_check(sc, int_cause, int_cause_ext);
+
+	MGE_RECEIVE_UNLOCK(sc);
+}
+
+static void
 mge_intr_err(void *arg)
 {
 	struct mge_softc *sc = arg;
@@ -1024,11 +1075,20 @@ mge_intr_rx(void *arg) {
 	int_cause = MGE_READ(sc, MGE_PORT_INT_CAUSE);
 	int_cause_ext = MGE_READ(sc, MGE_PORT_INT_CAUSE_EXT);
 
+	mge_intr_rx_check(sc, int_cause, int_cause_ext);
+
+	MGE_RECEIVE_UNLOCK(sc);
+}
+
+static void
+mge_intr_rx_check(struct mge_softc *sc, uint32_t int_cause,
+    uint32_t int_cause_ext)
+{
 	/* Check for resource error */
 	if (int_cause & MGE_PORT_INT_RXERRQ0) {
 		mge_reinit_rx(sc);
 		MGE_WRITE(sc, MGE_PORT_INT_CAUSE,
-		    int_cause & ~MGE_PORT_INT_RXERRQ0);
+		    ~(int_cause & MGE_PORT_INT_RXERRQ0));
 	}
 
 	int_cause &= MGE_PORT_INT_RXQ0;
@@ -1039,11 +1099,8 @@ mge_intr_rx(void *arg) {
 		MGE_WRITE(sc, MGE_PORT_INT_CAUSE_EXT, ~int_cause_ext);
 		mge_intr_rx_locked(sc, -1);
 	}
-
-	MGE_RECEIVE_UNLOCK(sc);
 }
 
-
 static int
 mge_intr_rx_locked(struct mge_softc *sc, int count)
 {
@@ -1134,8 +1191,8 @@ mge_intr_tx(void *arg)
 
 	/* Ack the interrupt */
 	int_cause_ext = MGE_READ(sc, MGE_PORT_INT_CAUSE_EXT);
-	MGE_WRITE(sc, MGE_PORT_INT_CAUSE_EXT,
-	    int_cause_ext & ~MGE_PORT_INT_EXT_TXBUF0);
+	MGE_WRITE(sc, MGE_PORT_INT_CAUSE_EXT, ~(int_cause_ext &
+	    (MGE_PORT_INT_EXT_TXBUF0 | MGE_PORT_INT_EXT_TXUR)));
 
 	mge_intr_tx_locked(sc);
 
@@ -1404,12 +1461,12 @@ mge_encap(struct mge_softc *sc, struct m
 		dw->mge_desc->byte_count = segs[seg].ds_len;
 		dw->mge_desc->buffer = segs[seg].ds_addr;
 		dw->buffer = m0;
-		dw->mge_desc->cmd_status = MGE_TX_LAST | MGE_TX_FIRST |
-		    MGE_TX_ETH_CRC | MGE_TX_EN_INT | MGE_TX_PADDING |
-		    MGE_DMA_OWNED;
-
+		dw->mge_desc->cmd_status = 0;
 		if (seg == 0)
 			mge_offload_setup_descriptor(sc, dw);
+		dw->mge_desc->cmd_status |= MGE_TX_LAST | MGE_TX_FIRST |
+		    MGE_TX_ETH_CRC | MGE_TX_EN_INT | MGE_TX_PADDING |
+		    MGE_DMA_OWNED;
 	}
 
 	bus_dmamap_sync(sc->mge_desc_dtag, dw->desc_dmap,

Modified: projects/armv6/sys/dev/mge/if_mgevar.h
==============================================================================
--- projects/armv6/sys/dev/mge/if_mgevar.h	Mon Jan  2 09:56:40 2012	(r229270)
+++ projects/armv6/sys/dev/mge/if_mgevar.h	Mon Jan  2 09:58:39 2012	(r229271)
@@ -103,6 +103,9 @@ struct mge_softc {
 	uint32_t	mge_tx_tok_cnt;
 	uint16_t	mge_mtu;
 	int		mge_ver;
+	int		mge_intr_cnt;
+	uint8_t		mge_hw_csum;
+
 };
 
 

From owner-svn-src-projects@FreeBSD.ORG  Wed Jan  4 02:01:30 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D4149106564A;
	Wed,  4 Jan 2012 02:01:30 +0000 (UTC)
	(envelope-from sbruno@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B635C8FC0A;
	Wed,  4 Jan 2012 02:01:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0421URe054370;
	Wed, 4 Jan 2012 02:01:30 GMT (envelope-from sbruno@svn.freebsd.org)
Received: (from sbruno@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0421U3Z054340;
	Wed, 4 Jan 2012 02:01:30 GMT (envelope-from sbruno@svn.freebsd.org)
Message-Id: <201201040201.q0421U3Z054340@svn.freebsd.org>
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Wed, 4 Jan 2012 02:01:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229455 - in projects/bhyve: . bin/chio bin/ed bin/ps
	bin/sh bin/stty bin/test cddl/contrib/opensolaris/cmd/dtrace
	cddl/contrib/opensolaris/cmd/zdb
	cddl/contrib/opensolaris/cmd/zfs cddl...
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Jan 2012 02:01:30 -0000

Author: sbruno
Date: Wed Jan  4 02:01:27 2012
New Revision: 229455
URL: http://svn.freebsd.org/changeset/base/229455

Log:
  IFC to head to catch up the bhyve branch
  
  Approved by:	grehan@

Added:
  projects/bhyve/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c
     - copied unchanged from r229449, head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c
  projects/bhyve/contrib/compiler-rt/lib/int_endianness.h
     - copied unchanged from r229449, head/contrib/compiler-rt/lib/int_endianness.h
  projects/bhyve/contrib/compiler-rt/lib/int_math.h
     - copied unchanged from r229449, head/contrib/compiler-rt/lib/int_math.h
  projects/bhyve/contrib/compiler-rt/lib/int_types.h
     - copied unchanged from r229449, head/contrib/compiler-rt/lib/int_types.h
  projects/bhyve/contrib/compiler-rt/lib/int_util.c
     - copied unchanged from r229449, head/contrib/compiler-rt/lib/int_util.c
  projects/bhyve/contrib/compiler-rt/lib/int_util.h
     - copied unchanged from r229449, head/contrib/compiler-rt/lib/int_util.h
  projects/bhyve/contrib/compiler-rt/lib/mulodi4.c
     - copied unchanged from r229449, head/contrib/compiler-rt/lib/mulodi4.c
  projects/bhyve/contrib/compiler-rt/lib/mulosi4.c
     - copied unchanged from r229449, head/contrib/compiler-rt/lib/mulosi4.c
  projects/bhyve/contrib/compiler-rt/lib/muloti4.c
     - copied unchanged from r229449, head/contrib/compiler-rt/lib/muloti4.c
  projects/bhyve/contrib/gperf/configure.ac
     - copied unchanged from r229449, head/contrib/gperf/configure.ac
  projects/bhyve/contrib/gperf/doc/configure.ac
     - copied unchanged from r229449, head/contrib/gperf/doc/configure.ac
  projects/bhyve/contrib/gperf/lib/configure.ac
     - copied unchanged from r229449, head/contrib/gperf/lib/configure.ac
  projects/bhyve/contrib/gperf/lib/getline.cc
     - copied unchanged from r229449, head/contrib/gperf/lib/getline.cc
  projects/bhyve/contrib/gperf/lib/getline.h
     - copied unchanged from r229449, head/contrib/gperf/lib/getline.h
  projects/bhyve/contrib/gperf/src/config.h_vms
     - copied unchanged from r229449, head/contrib/gperf/src/config.h_vms
  projects/bhyve/contrib/gperf/src/configure.ac
     - copied unchanged from r229449, head/contrib/gperf/src/configure.ac
  projects/bhyve/contrib/gperf/src/input.cc
     - copied unchanged from r229449, head/contrib/gperf/src/input.cc
  projects/bhyve/contrib/gperf/src/input.h
     - copied unchanged from r229449, head/contrib/gperf/src/input.h
  projects/bhyve/contrib/gperf/src/keyword-list.cc
     - copied unchanged from r229449, head/contrib/gperf/src/keyword-list.cc
  projects/bhyve/contrib/gperf/src/keyword-list.h
     - copied unchanged from r229449, head/contrib/gperf/src/keyword-list.h
  projects/bhyve/contrib/gperf/src/keyword-list.icc
     - copied unchanged from r229449, head/contrib/gperf/src/keyword-list.icc
  projects/bhyve/contrib/gperf/src/keyword.cc
     - copied unchanged from r229449, head/contrib/gperf/src/keyword.cc
  projects/bhyve/contrib/gperf/src/keyword.h
     - copied unchanged from r229449, head/contrib/gperf/src/keyword.h
  projects/bhyve/contrib/gperf/src/keyword.icc
     - copied unchanged from r229449, head/contrib/gperf/src/keyword.icc
  projects/bhyve/contrib/gperf/src/output.cc
     - copied unchanged from r229449, head/contrib/gperf/src/output.cc
  projects/bhyve/contrib/gperf/src/output.h
     - copied unchanged from r229449, head/contrib/gperf/src/output.h
  projects/bhyve/contrib/gperf/src/positions.cc
     - copied unchanged from r229449, head/contrib/gperf/src/positions.cc
  projects/bhyve/contrib/gperf/src/positions.h
     - copied unchanged from r229449, head/contrib/gperf/src/positions.h
  projects/bhyve/contrib/gperf/src/positions.icc
     - copied unchanged from r229449, head/contrib/gperf/src/positions.icc
  projects/bhyve/contrib/gperf/src/search.cc
     - copied unchanged from r229449, head/contrib/gperf/src/search.cc
  projects/bhyve/contrib/gperf/src/search.h
     - copied unchanged from r229449, head/contrib/gperf/src/search.h
     - copied from r229449, head/contrib/libarchive/
  projects/bhyve/contrib/libc++/
     - copied from r229449, head/contrib/libc++/
     - copied from r229449, head/contrib/libcxxrt/
  projects/bhyve/contrib/openpam/bin/pamtest/
     - copied from r229449, head/contrib/openpam/bin/pamtest/
  projects/bhyve/contrib/openpam/bin/su/su.1
     - copied unchanged from r229449, head/contrib/openpam/bin/su/su.1
  projects/bhyve/contrib/openpam/doc/man/openpam_subst.3
     - copied unchanged from r229449, head/contrib/openpam/doc/man/openpam_subst.3
  projects/bhyve/contrib/openpam/lib/openpam_check_owner_perms.c
     - copied unchanged from r229449, head/contrib/openpam/lib/openpam_check_owner_perms.c
  projects/bhyve/contrib/openpam/lib/openpam_constants.c
     - copied unchanged from r229449, head/contrib/openpam/lib/openpam_constants.c
  projects/bhyve/contrib/openpam/lib/openpam_constants.h
     - copied unchanged from r229449, head/contrib/openpam/lib/openpam_constants.h
  projects/bhyve/contrib/openpam/lib/openpam_debug.h
     - copied unchanged from r229449, head/contrib/openpam/lib/openpam_debug.h
  projects/bhyve/contrib/openpam/lib/openpam_strlcmp.h
     - copied unchanged from r229449, head/contrib/openpam/lib/openpam_strlcmp.h
  projects/bhyve/contrib/openpam/lib/openpam_strlcpy.h
     - copied unchanged from r229449, head/contrib/openpam/lib/openpam_strlcpy.h
  projects/bhyve/contrib/openpam/lib/openpam_subst.c
     - copied unchanged from r229449, head/contrib/openpam/lib/openpam_subst.c
  projects/bhyve/include/stdalign.h
     - copied unchanged from r229449, head/include/stdalign.h
  projects/bhyve/include/stdatomic.h
     - copied unchanged from r229449, head/include/stdatomic.h
  projects/bhyve/include/stdnoreturn.h
     - copied unchanged from r229449, head/include/stdnoreturn.h
  projects/bhyve/lib/clang/include/MipsGenCodeEmitter.inc
     - copied unchanged from r229449, head/lib/clang/include/MipsGenCodeEmitter.inc
  projects/bhyve/lib/libc++/
     - copied from r229449, head/lib/libc++/
  projects/bhyve/lib/libc/gen/libc_dlopen.c
     - copied unchanged from r229449, head/lib/libc/gen/libc_dlopen.c
  projects/bhyve/lib/libc/mips/string/strchr.S
     - copied unchanged from r229449, head/lib/libc/mips/string/strchr.S
  projects/bhyve/lib/libc/mips/string/strrchr.S
     - copied unchanged from r229449, head/lib/libc/mips/string/strrchr.S
  projects/bhyve/lib/libc/stdlib/at_quick_exit.3
     - copied unchanged from r229449, head/lib/libc/stdlib/at_quick_exit.3
  projects/bhyve/lib/libc/stdlib/quick_exit.3
     - copied unchanged from r229449, head/lib/libc/stdlib/quick_exit.3
  projects/bhyve/lib/libc/stdlib/quick_exit.c
     - copied unchanged from r229449, head/lib/libc/stdlib/quick_exit.c
  projects/bhyve/lib/libcompiler_rt/__sync_fetch_and_add_4.c
     - copied unchanged from r229449, head/lib/libcompiler_rt/__sync_fetch_and_add_4.c
  projects/bhyve/lib/libcompiler_rt/__sync_fetch_and_add_8.c
     - copied unchanged from r229449, head/lib/libcompiler_rt/__sync_fetch_and_add_8.c
  projects/bhyve/lib/libcompiler_rt/__sync_fetch_and_and_4.c
     - copied unchanged from r229449, head/lib/libcompiler_rt/__sync_fetch_and_and_4.c
  projects/bhyve/lib/libcompiler_rt/__sync_fetch_and_and_8.c
     - copied unchanged from r229449, head/lib/libcompiler_rt/__sync_fetch_and_and_8.c
  projects/bhyve/lib/libcompiler_rt/__sync_fetch_and_op_n.h
     - copied unchanged from r229449, head/lib/libcompiler_rt/__sync_fetch_and_op_n.h
  projects/bhyve/lib/libcompiler_rt/__sync_fetch_and_or_4.c
     - copied unchanged from r229449, head/lib/libcompiler_rt/__sync_fetch_and_or_4.c
  projects/bhyve/lib/libcompiler_rt/__sync_fetch_and_or_8.c
     - copied unchanged from r229449, head/lib/libcompiler_rt/__sync_fetch_and_or_8.c
  projects/bhyve/lib/libcompiler_rt/__sync_fetch_and_sub_4.c
     - copied unchanged from r229449, head/lib/libcompiler_rt/__sync_fetch_and_sub_4.c
  projects/bhyve/lib/libcompiler_rt/__sync_fetch_and_sub_8.c
     - copied unchanged from r229449, head/lib/libcompiler_rt/__sync_fetch_and_sub_8.c
  projects/bhyve/lib/libcompiler_rt/__sync_fetch_and_xor_4.c
     - copied unchanged from r229449, head/lib/libcompiler_rt/__sync_fetch_and_xor_4.c
  projects/bhyve/lib/libcompiler_rt/__sync_fetch_and_xor_8.c
     - copied unchanged from r229449, head/lib/libcompiler_rt/__sync_fetch_and_xor_8.c
  projects/bhyve/lib/libcompiler_rt/__sync_lock_test_and_set_4.c
     - copied unchanged from r229449, head/lib/libcompiler_rt/__sync_lock_test_and_set_4.c
  projects/bhyve/lib/libcompiler_rt/__sync_lock_test_and_set_8.c
     - copied unchanged from r229449, head/lib/libcompiler_rt/__sync_lock_test_and_set_8.c
  projects/bhyve/lib/libcompiler_rt/__sync_val_compare_and_swap_4.c
     - copied unchanged from r229449, head/lib/libcompiler_rt/__sync_val_compare_and_swap_4.c
  projects/bhyve/lib/libcompiler_rt/__sync_val_compare_and_swap_8.c
     - copied unchanged from r229449, head/lib/libcompiler_rt/__sync_val_compare_and_swap_8.c
  projects/bhyve/lib/libcompiler_rt/__sync_val_compare_and_swap_n.h
     - copied unchanged from r229449, head/lib/libcompiler_rt/__sync_val_compare_and_swap_n.h
  projects/bhyve/lib/libcxxrt/
     - copied from r229449, head/lib/libcxxrt/
  projects/bhyve/lib/libstdthreads/
     - copied from r229449, head/lib/libstdthreads/
  projects/bhyve/sbin/camcontrol/fwdownload.c
     - copied unchanged from r229449, head/sbin/camcontrol/fwdownload.c
  projects/bhyve/sbin/ifconfig/carp.c
     - copied unchanged from r229449, head/sbin/ifconfig/carp.c
  projects/bhyve/share/man/man3/ATOMIC_VAR_INIT.3
     - copied unchanged from r229449, head/share/man/man3/ATOMIC_VAR_INIT.3
  projects/bhyve/share/man/man4/apic.4
     - copied unchanged from r229449, head/share/man/man4/apic.4
  projects/bhyve/share/man/man4/capsicum.4
     - copied unchanged from r229449, head/share/man/man4/capsicum.4
  projects/bhyve/share/man/man4/eventtimers.4
     - copied unchanged from r229449, head/share/man/man4/eventtimers.4
  projects/bhyve/share/man/man4/ffclock.4
     - copied unchanged from r229449, head/share/man/man4/ffclock.4
  projects/bhyve/share/man/man4/hpt27xx.4
     - copied unchanged from r229449, head/share/man/man4/hpt27xx.4
  projects/bhyve/share/man/man4/timecounters.4
     - copied unchanged from r229449, head/share/man/man4/timecounters.4
  projects/bhyve/share/man/man4/viawd.4
     - copied unchanged from r229449, head/share/man/man4/viawd.4
  projects/bhyve/share/man/man9/eventtimers.9
     - copied unchanged from r229449, head/share/man/man9/eventtimers.9
  projects/bhyve/share/man/man9/memcchr.9
     - copied unchanged from r229449, head/share/man/man9/memcchr.9
  projects/bhyve/share/man/man9/shm_map.9
     - copied unchanged from r229449, head/share/man/man9/shm_map.9
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslrestype2s.c
     - copied unchanged from r229449, head/sys/contrib/dev/acpica/compiler/aslrestype2s.c
  projects/bhyve/sys/contrib/dev/acpica/disassembler/dmresrcl2.c
     - copied unchanged from r229449, head/sys/contrib/dev/acpica/disassembler/dmresrcl2.c
  projects/bhyve/sys/contrib/dev/acpica/include/actbl3.h
     - copied unchanged from r229449, head/sys/contrib/dev/acpica/include/actbl3.h
  projects/bhyve/sys/contrib/dev/acpica/os_specific/
     - copied from r229449, head/sys/contrib/dev/acpica/os_specific/
  projects/bhyve/sys/contrib/dev/acpica/resources/rsserial.c
     - copied unchanged from r229449, head/sys/contrib/dev/acpica/resources/rsserial.c
  projects/bhyve/sys/contrib/dev/acpica/utilities/utxfmutex.c
     - copied unchanged from r229449, head/sys/contrib/dev/acpica/utilities/utxfmutex.c
  projects/bhyve/sys/contrib/xz-embedded/
     - copied from r229449, head/sys/contrib/xz-embedded/
  projects/bhyve/sys/dev/ath/if_ath_led.c
     - copied unchanged from r229449, head/sys/dev/ath/if_ath_led.c
  projects/bhyve/sys/dev/ath/if_ath_led.h
     - copied unchanged from r229449, head/sys/dev/ath/if_ath_led.h
  projects/bhyve/sys/dev/cxgbe/firmware/
     - copied from r229449, head/sys/dev/cxgbe/firmware/
  projects/bhyve/sys/dev/fb/splash_txt.c
     - copied unchanged from r229449, head/sys/dev/fb/splash_txt.c
  projects/bhyve/sys/dev/hpt27xx/
     - copied from r229449, head/sys/dev/hpt27xx/
  projects/bhyve/sys/dev/sound/pci/emuxkireg.h
     - copied unchanged from r229449, head/sys/dev/sound/pci/emuxkireg.h
  projects/bhyve/sys/dev/viawd/
     - copied from r229449, head/sys/dev/viawd/
  projects/bhyve/sys/libkern/memcchr.c
     - copied unchanged from r229449, head/sys/libkern/memcchr.c
  projects/bhyve/sys/libkern/strchr.c
     - copied unchanged from r229449, head/sys/libkern/strchr.c
  projects/bhyve/sys/libkern/strrchr.c
     - copied unchanged from r229449, head/sys/libkern/strrchr.c
  projects/bhyve/sys/mips/cavium/octeon_gpio.c
     - copied unchanged from r229449, head/sys/mips/cavium/octeon_gpio.c
  projects/bhyve/sys/mips/cavium/octeon_gpiovar.h
     - copied unchanged from r229449, head/sys/mips/cavium/octeon_gpiovar.h
  projects/bhyve/sys/mips/conf/AR71XX_BASE
     - copied unchanged from r229449, head/sys/mips/conf/AR71XX_BASE
  projects/bhyve/sys/mips/conf/AR71XX_BASE.hints
     - copied unchanged from r229449, head/sys/mips/conf/AR71XX_BASE.hints
  projects/bhyve/sys/mips/conf/PB47
     - copied unchanged from r229449, head/sys/mips/conf/PB47
  projects/bhyve/sys/mips/conf/PB47.hints
     - copied unchanged from r229449, head/sys/mips/conf/PB47.hints
  projects/bhyve/sys/mips/conf/ROUTERSTATION
     - copied unchanged from r229449, head/sys/mips/conf/ROUTERSTATION
  projects/bhyve/sys/mips/conf/ROUTERSTATION.hints
     - copied unchanged from r229449, head/sys/mips/conf/ROUTERSTATION.hints
  projects/bhyve/sys/mips/conf/ROUTERSTATION_MFS
     - copied unchanged from r229449, head/sys/mips/conf/ROUTERSTATION_MFS
  projects/bhyve/sys/mips/conf/RSPRO
     - copied unchanged from r229449, head/sys/mips/conf/RSPRO
  projects/bhyve/sys/mips/conf/RSPRO.hints
     - copied unchanged from r229449, head/sys/mips/conf/RSPRO.hints
  projects/bhyve/sys/mips/conf/RSPRO_MFS
     - copied unchanged from r229449, head/sys/mips/conf/RSPRO_MFS
  projects/bhyve/sys/mips/conf/RSPRO_STANDALONE
     - copied unchanged from r229449, head/sys/mips/conf/RSPRO_STANDALONE
  projects/bhyve/sys/modules/carp/
     - copied from r229449, head/sys/modules/carp/
  projects/bhyve/sys/modules/cfi/
     - copied from r229449, head/sys/modules/cfi/
  projects/bhyve/sys/modules/cxgbe/firmware/
     - copied from r229449, head/sys/modules/cxgbe/firmware/
  projects/bhyve/sys/modules/hpt27xx/
     - copied from r229449, head/sys/modules/hpt27xx/
  projects/bhyve/sys/modules/splash/txt/
     - copied from r229449, head/sys/modules/splash/txt/
  projects/bhyve/sys/modules/usb/avr32dci/
     - copied from r229449, head/sys/modules/usb/avr32dci/
  projects/bhyve/sys/modules/viawd/
     - copied from r229449, head/sys/modules/viawd/
  projects/bhyve/sys/sparc64/sparc64/cam_machdep.c
     - copied unchanged from r229449, head/sys/sparc64/sparc64/cam_machdep.c
  projects/bhyve/sys/sys/_kstack_cache.h
     - copied unchanged from r229449, head/sys/sys/_kstack_cache.h
  projects/bhyve/tools/build/options/WITHOUT_CAPSICUM
     - copied unchanged from r229449, head/tools/build/options/WITHOUT_CAPSICUM
  projects/bhyve/tools/build/options/WITH_CTF
     - copied unchanged from r229449, head/tools/build/options/WITH_CTF
  projects/bhyve/tools/build/options/WITH_LIBCPLUSPLUS
     - copied unchanged from r229449, head/tools/build/options/WITH_LIBCPLUSPLUS
  projects/bhyve/tools/regression/bin/sh/builtins/case11.0
     - copied unchanged from r229449, head/tools/regression/bin/sh/builtins/case11.0
  projects/bhyve/tools/regression/bin/sh/builtins/case12.0
     - copied unchanged from r229449, head/tools/regression/bin/sh/builtins/case12.0
  projects/bhyve/tools/regression/bin/sh/builtins/case13.0
     - copied unchanged from r229449, head/tools/regression/bin/sh/builtins/case13.0
  projects/bhyve/tools/regression/bin/sh/parameters/positional2.0
     - copied unchanged from r229449, head/tools/regression/bin/sh/parameters/positional2.0
  projects/bhyve/tools/regression/pipe/pipe-ino.c
     - copied unchanged from r229449, head/tools/regression/pipe/pipe-ino.c
  projects/bhyve/tools/regression/pipe/pipe-reverse2.c
     - copied unchanged from r229449, head/tools/regression/pipe/pipe-reverse2.c
  projects/bhyve/tools/regression/sbin/dhclient/
     - copied from r229449, head/tools/regression/sbin/dhclient/
  projects/bhyve/tools/regression/usr.bin/make/execution/
     - copied from r229449, head/tools/regression/usr.bin/make/execution/
  projects/bhyve/tools/tinder.sh
     - copied unchanged from r229449, head/tools/tinder.sh
  projects/bhyve/usr.bin/m4/lib/
     - copied from r229449, head/usr.bin/m4/lib/
  projects/bhyve/usr.bin/m4/parser.y
     - copied unchanged from r229449, head/usr.bin/m4/parser.y
  projects/bhyve/usr.bin/m4/tokenizer.l
     - copied unchanged from r229449, head/usr.bin/m4/tokenizer.l
  projects/bhyve/usr.bin/procstat/procstat_auxv.c
     - copied unchanged from r229449, head/usr.bin/procstat/procstat_auxv.c
  projects/bhyve/usr.bin/procstat/procstat_rlimit.c
     - copied unchanged from r229449, head/usr.bin/procstat/procstat_rlimit.c
  projects/bhyve/usr.sbin/cpucontrol/via.c
     - copied unchanged from r229449, head/usr.sbin/cpucontrol/via.c
  projects/bhyve/usr.sbin/cpucontrol/via.h
     - copied unchanged from r229449, head/usr.sbin/cpucontrol/via.h
Directory Properties:
  projects/bhyve/contrib/libarchive/   (props changed)
  projects/bhyve/contrib/libcxxrt/   (props changed)
Replaced:
  projects/bhyve/contrib/gperf/doc/gperf.texi
     - copied unchanged from r229449, head/contrib/gperf/doc/gperf.texi
  projects/bhyve/contrib/gperf/doc/gpl.texinfo
     - copied unchanged from r229449, head/contrib/gperf/doc/gpl.texinfo
  projects/bhyve/lib/libc/string/strchr.c
     - copied unchanged from r229449, head/lib/libc/string/strchr.c
  projects/bhyve/lib/libc/string/strrchr.c
     - copied unchanged from r229449, head/lib/libc/string/strrchr.c
Deleted:
  projects/bhyve/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c
  projects/bhyve/contrib/compiler-rt/lib/abi.h
  projects/bhyve/contrib/compiler-rt/lib/apple_versioning.c
  projects/bhyve/contrib/compiler-rt/lib/endianness.h
  projects/bhyve/contrib/gperf/acconfig.h
  projects/bhyve/contrib/gperf/configure.in
  projects/bhyve/contrib/gperf/doc/configure.in
  projects/bhyve/contrib/gperf/doc/texinfo.tex
  projects/bhyve/contrib/gperf/lib/configure.in
  projects/bhyve/contrib/gperf/src/configure.in
  projects/bhyve/contrib/gperf/src/gen-perf.cc
  projects/bhyve/contrib/gperf/src/gen-perf.h
  projects/bhyve/contrib/gperf/src/iterator.cc
  projects/bhyve/contrib/gperf/src/iterator.h
  projects/bhyve/contrib/gperf/src/key-list.cc
  projects/bhyve/contrib/gperf/src/key-list.h
  projects/bhyve/contrib/gperf/src/list-node.cc
  projects/bhyve/contrib/gperf/src/list-node.h
  projects/bhyve/contrib/gperf/src/new.cc
  projects/bhyve/contrib/gperf/src/read-line.cc
  projects/bhyve/contrib/gperf/src/read-line.h
  projects/bhyve/contrib/gperf/src/read-line.icc
  projects/bhyve/contrib/gperf/src/trace.cc
  projects/bhyve/contrib/gperf/src/trace.h
  projects/bhyve/contrib/gperf/src/vectors.cc
  projects/bhyve/contrib/gperf/src/vectors.h
  projects/bhyve/contrib/gperf/tests/
  projects/bhyve/gnu/lib/libodialog/
  projects/bhyve/lib/libarchive/COPYING
  projects/bhyve/lib/libarchive/README
  projects/bhyve/lib/libarchive/archive.h
  projects/bhyve/lib/libarchive/archive_check_magic.c
  projects/bhyve/lib/libarchive/archive_crc32.h
  projects/bhyve/lib/libarchive/archive_endian.h
  projects/bhyve/lib/libarchive/archive_entry.3
  projects/bhyve/lib/libarchive/archive_entry.c
  projects/bhyve/lib/libarchive/archive_entry.h
  projects/bhyve/lib/libarchive/archive_entry_copy_stat.c
  projects/bhyve/lib/libarchive/archive_entry_link_resolver.c
  projects/bhyve/lib/libarchive/archive_entry_private.h
  projects/bhyve/lib/libarchive/archive_entry_stat.c
  projects/bhyve/lib/libarchive/archive_entry_strmode.c
  projects/bhyve/lib/libarchive/archive_entry_xattr.c
  projects/bhyve/lib/libarchive/archive_hash.h
  projects/bhyve/lib/libarchive/archive_platform.h
  projects/bhyve/lib/libarchive/archive_private.h
  projects/bhyve/lib/libarchive/archive_read.3
  projects/bhyve/lib/libarchive/archive_read.c
  projects/bhyve/lib/libarchive/archive_read_data_into_fd.c
  projects/bhyve/lib/libarchive/archive_read_disk.3
  projects/bhyve/lib/libarchive/archive_read_disk.c
  projects/bhyve/lib/libarchive/archive_read_disk_entry_from_file.c
  projects/bhyve/lib/libarchive/archive_read_disk_private.h
  projects/bhyve/lib/libarchive/archive_read_disk_set_standard_lookup.c
  projects/bhyve/lib/libarchive/archive_read_extract.c
  projects/bhyve/lib/libarchive/archive_read_open_fd.c
  projects/bhyve/lib/libarchive/archive_read_open_file.c
  projects/bhyve/lib/libarchive/archive_read_open_filename.c
  projects/bhyve/lib/libarchive/archive_read_open_memory.c
  projects/bhyve/lib/libarchive/archive_read_private.h
  projects/bhyve/lib/libarchive/archive_read_support_compression_all.c
  projects/bhyve/lib/libarchive/archive_read_support_compression_bzip2.c
  projects/bhyve/lib/libarchive/archive_read_support_compression_compress.c
  projects/bhyve/lib/libarchive/archive_read_support_compression_gzip.c
  projects/bhyve/lib/libarchive/archive_read_support_compression_none.c
  projects/bhyve/lib/libarchive/archive_read_support_compression_program.c
  projects/bhyve/lib/libarchive/archive_read_support_compression_rpm.c
  projects/bhyve/lib/libarchive/archive_read_support_compression_uu.c
  projects/bhyve/lib/libarchive/archive_read_support_compression_xz.c
  projects/bhyve/lib/libarchive/archive_read_support_format_all.c
  projects/bhyve/lib/libarchive/archive_read_support_format_ar.c
  projects/bhyve/lib/libarchive/archive_read_support_format_cpio.c
  projects/bhyve/lib/libarchive/archive_read_support_format_empty.c
  projects/bhyve/lib/libarchive/archive_read_support_format_iso9660.c
  projects/bhyve/lib/libarchive/archive_read_support_format_mtree.c
  projects/bhyve/lib/libarchive/archive_read_support_format_raw.c
  projects/bhyve/lib/libarchive/archive_read_support_format_tar.c
  projects/bhyve/lib/libarchive/archive_read_support_format_xar.c
  projects/bhyve/lib/libarchive/archive_read_support_format_zip.c
  projects/bhyve/lib/libarchive/archive_string.c
  projects/bhyve/lib/libarchive/archive_string.h
  projects/bhyve/lib/libarchive/archive_string_sprintf.c
  projects/bhyve/lib/libarchive/archive_util.3
  projects/bhyve/lib/libarchive/archive_util.c
  projects/bhyve/lib/libarchive/archive_virtual.c
  projects/bhyve/lib/libarchive/archive_write.3
  projects/bhyve/lib/libarchive/archive_write.c
  projects/bhyve/lib/libarchive/archive_write_disk.3
  projects/bhyve/lib/libarchive/archive_write_disk.c
  projects/bhyve/lib/libarchive/archive_write_disk_private.h
  projects/bhyve/lib/libarchive/archive_write_disk_set_standard_lookup.c
  projects/bhyve/lib/libarchive/archive_write_open_fd.c
  projects/bhyve/lib/libarchive/archive_write_open_file.c
  projects/bhyve/lib/libarchive/archive_write_open_filename.c
  projects/bhyve/lib/libarchive/archive_write_open_memory.c
  projects/bhyve/lib/libarchive/archive_write_private.h
  projects/bhyve/lib/libarchive/archive_write_set_compression_bzip2.c
  projects/bhyve/lib/libarchive/archive_write_set_compression_compress.c
  projects/bhyve/lib/libarchive/archive_write_set_compression_gzip.c
  projects/bhyve/lib/libarchive/archive_write_set_compression_none.c
  projects/bhyve/lib/libarchive/archive_write_set_compression_program.c
  projects/bhyve/lib/libarchive/archive_write_set_compression_xz.c
  projects/bhyve/lib/libarchive/archive_write_set_format.c
  projects/bhyve/lib/libarchive/archive_write_set_format_ar.c
  projects/bhyve/lib/libarchive/archive_write_set_format_by_name.c
  projects/bhyve/lib/libarchive/archive_write_set_format_cpio.c
  projects/bhyve/lib/libarchive/archive_write_set_format_cpio_newc.c
  projects/bhyve/lib/libarchive/archive_write_set_format_mtree.c
  projects/bhyve/lib/libarchive/archive_write_set_format_pax.c
  projects/bhyve/lib/libarchive/archive_write_set_format_shar.c
  projects/bhyve/lib/libarchive/archive_write_set_format_ustar.c
  projects/bhyve/lib/libarchive/archive_write_set_format_zip.c
  projects/bhyve/lib/libarchive/cpio.5
  projects/bhyve/lib/libarchive/filter_fork.c
  projects/bhyve/lib/libarchive/filter_fork.h
  projects/bhyve/lib/libarchive/libarchive-formats.5
  projects/bhyve/lib/libarchive/libarchive.3
  projects/bhyve/lib/libarchive/libarchive_fe/
  projects/bhyve/lib/libarchive/libarchive_internals.3
  projects/bhyve/lib/libarchive/tar.5
  projects/bhyve/lib/libarchive/test/.cvsignore
  projects/bhyve/lib/libarchive/test/README
  projects/bhyve/lib/libarchive/test/main.c
  projects/bhyve/lib/libarchive/test/read_open_memory.c
  projects/bhyve/lib/libarchive/test/test.h
  projects/bhyve/lib/libarchive/test/test_acl_basic.c
  projects/bhyve/lib/libarchive/test/test_acl_freebsd.c
  projects/bhyve/lib/libarchive/test/test_acl_pax.c
  projects/bhyve/lib/libarchive/test/test_archive_api_feature.c
  projects/bhyve/lib/libarchive/test/test_bad_fd.c
  projects/bhyve/lib/libarchive/test/test_compat_bzip2.c
  projects/bhyve/lib/libarchive/test/test_compat_bzip2_1.tbz.uu
  projects/bhyve/lib/libarchive/test/test_compat_bzip2_2.tbz.uu
  projects/bhyve/lib/libarchive/test/test_compat_cpio.c
  projects/bhyve/lib/libarchive/test/test_compat_cpio_1.cpio.uu
  projects/bhyve/lib/libarchive/test/test_compat_gtar.c
  projects/bhyve/lib/libarchive/test/test_compat_gtar_1.tar.uu
  projects/bhyve/lib/libarchive/test/test_compat_gzip.c
  projects/bhyve/lib/libarchive/test/test_compat_gzip_1.tgz.uu
  projects/bhyve/lib/libarchive/test/test_compat_gzip_2.tgz.uu
  projects/bhyve/lib/libarchive/test/test_compat_lzma.c
  projects/bhyve/lib/libarchive/test/test_compat_lzma_1.tlz.uu
  projects/bhyve/lib/libarchive/test/test_compat_lzma_2.tlz.uu
  projects/bhyve/lib/libarchive/test/test_compat_lzma_3.tlz.uu
  projects/bhyve/lib/libarchive/test/test_compat_solaris_tar_acl.c
  projects/bhyve/lib/libarchive/test/test_compat_solaris_tar_acl.tar.uu
  projects/bhyve/lib/libarchive/test/test_compat_tar_hardlink.c
  projects/bhyve/lib/libarchive/test/test_compat_tar_hardlink_1.tar.uu
  projects/bhyve/lib/libarchive/test/test_compat_xz.c
  projects/bhyve/lib/libarchive/test/test_compat_xz_1.txz.uu
  projects/bhyve/lib/libarchive/test/test_compat_zip.c
  projects/bhyve/lib/libarchive/test/test_compat_zip_1.zip.uu
  projects/bhyve/lib/libarchive/test/test_compat_zip_2.zip.uu
  projects/bhyve/lib/libarchive/test/test_empty_write.c
  projects/bhyve/lib/libarchive/test/test_entry.c
  projects/bhyve/lib/libarchive/test/test_entry_strmode.c
  projects/bhyve/lib/libarchive/test/test_extattr_freebsd.c
  projects/bhyve/lib/libarchive/test/test_fuzz.c
  projects/bhyve/lib/libarchive/test/test_fuzz_1.iso.Z.uu
  projects/bhyve/lib/libarchive/test/test_link_resolver.c
  projects/bhyve/lib/libarchive/test/test_open_failure.c
  projects/bhyve/lib/libarchive/test/test_open_fd.c
  projects/bhyve/lib/libarchive/test/test_open_file.c
  projects/bhyve/lib/libarchive/test/test_open_filename.c
  projects/bhyve/lib/libarchive/test/test_pax_filename_encoding.c
  projects/bhyve/lib/libarchive/test/test_pax_filename_encoding.tar.uu
  projects/bhyve/lib/libarchive/test/test_read_compress_program.c
  projects/bhyve/lib/libarchive/test/test_read_data_large.c
  projects/bhyve/lib/libarchive/test/test_read_disk.c
  projects/bhyve/lib/libarchive/test/test_read_disk_entry_from_file.c
  projects/bhyve/lib/libarchive/test/test_read_extract.c
  projects/bhyve/lib/libarchive/test/test_read_file_nonexistent.c
  projects/bhyve/lib/libarchive/test/test_read_format_ar.ar.uu
  projects/bhyve/lib/libarchive/test/test_read_format_ar.c
  projects/bhyve/lib/libarchive/test/test_read_format_cpio_bin.c
  projects/bhyve/lib/libarchive/test/test_read_format_cpio_bin_Z.c
  projects/bhyve/lib/libarchive/test/test_read_format_cpio_bin_be.c
  projects/bhyve/lib/libarchive/test/test_read_format_cpio_bin_be.cpio.uu
  projects/bhyve/lib/libarchive/test/test_read_format_cpio_bin_bz2.c
  projects/bhyve/lib/libarchive/test/test_read_format_cpio_bin_gz.c
  projects/bhyve/lib/libarchive/test/test_read_format_cpio_bin_lzma.c
  projects/bhyve/lib/libarchive/test/test_read_format_cpio_bin_xz.c
  projects/bhyve/lib/libarchive/test/test_read_format_cpio_odc.c
  projects/bhyve/lib/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.c
  projects/bhyve/lib/libarchive/test/test_read_format_cpio_svr4_bzip2_rpm.rpm.uu
  projects/bhyve/lib/libarchive/test/test_read_format_cpio_svr4_gzip.c
  projects/bhyve/lib/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.c
  projects/bhyve/lib/libarchive/test/test_read_format_cpio_svr4_gzip_rpm.rpm.uu
  projects/bhyve/lib/libarchive/test/test_read_format_cpio_svr4c_Z.c
  projects/bhyve/lib/libarchive/test/test_read_format_empty.c
  projects/bhyve/lib/libarchive/test/test_read_format_gtar_gz.c
  projects/bhyve/lib/libarchive/test/test_read_format_gtar_lzma.c
  projects/bhyve/lib/libarchive/test/test_read_format_gtar_sparse.c
  projects/bhyve/lib/libarchive/test/test_read_format_gtar_sparse_1_13.tar.uu
  projects/bhyve/lib/libarchive/test/test_read_format_gtar_sparse_1_17.tar.uu
  projects/bhyve/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix00.tar.uu
  projects/bhyve/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix01.tar.uu
  projects/bhyve/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10.tar.uu
  projects/bhyve/lib/libarchive/test/test_read_format_gtar_sparse_1_17_posix10_modified.tar.uu
  projects/bhyve/lib/libarchive/test/test_read_format_iso.iso.Z.uu
  projects/bhyve/lib/libarchive/test/test_read_format_iso_2.iso.Z.uu
  projects/bhyve/lib/libarchive/test/test_read_format_iso_gz.c
  projects/bhyve/lib/libarchive/test/test_read_format_iso_joliet.iso.Z.uu
  projects/bhyve/lib/libarchive/test/test_read_format_iso_joliet_long.iso.Z.uu
  projects/bhyve/lib/libarchive/test/test_read_format_iso_joliet_rockridge.iso.Z.uu
  projects/bhyve/lib/libarchive/test/test_read_format_iso_multi_extent.c
  projects/bhyve/lib/libarchive/test/test_read_format_iso_multi_extent.iso.Z.uu
  projects/bhyve/lib/libarchive/test/test_read_format_iso_rockridge.iso.Z.uu
  projects/bhyve/lib/libarchive/test/test_read_format_iso_rockridge_ce.iso.Z.uu
  projects/bhyve/lib/libarchive/test/test_read_format_iso_rockridge_new.iso.Z.uu
  projects/bhyve/lib/libarchive/test/test_read_format_iso_rockridge_rr_moved.iso.Z.uu
  projects/bhyve/lib/libarchive/test/test_read_format_iso_zisofs.iso.Z.uu
  projects/bhyve/lib/libarchive/test/test_read_format_isojoliet_bz2.c
  projects/bhyve/lib/libarchive/test/test_read_format_isojoliet_long.c
  projects/bhyve/lib/libarchive/test/test_read_format_isojoliet_rr.c
  projects/bhyve/lib/libarchive/test/test_read_format_isorr_bz2.c
  projects/bhyve/lib/libarchive/test/test_read_format_isorr_ce.c
  projects/bhyve/lib/libarchive/test/test_read_format_isorr_new_bz2.c
  projects/bhyve/lib/libarchive/test/test_read_format_isorr_rr_moved.c
  projects/bhyve/lib/libarchive/test/test_read_format_isozisofs_bz2.c
  projects/bhyve/lib/libarchive/test/test_read_format_mtree.c
  projects/bhyve/lib/libarchive/test/test_read_format_mtree.mtree.uu
  projects/bhyve/lib/libarchive/test/test_read_format_pax_bz2.c
  projects/bhyve/lib/libarchive/test/test_read_format_raw.c
  projects/bhyve/lib/libarchive/test/test_read_format_raw.data.Z.uu
  projects/bhyve/lib/libarchive/test/test_read_format_raw.data.uu
  projects/bhyve/lib/libarchive/test/test_read_format_tar.c
  projects/bhyve/lib/libarchive/test/test_read_format_tar_empty_filename.c
  projects/bhyve/lib/libarchive/test/test_read_format_tar_empty_filename.tar.uu
  projects/bhyve/lib/libarchive/test/test_read_format_tbz.c
  projects/bhyve/lib/libarchive/test/test_read_format_tgz.c
  projects/bhyve/lib/libarchive/test/test_read_format_tlz.c
  projects/bhyve/lib/libarchive/test/test_read_format_txz.c
  projects/bhyve/lib/libarchive/test/test_read_format_tz.c
  projects/bhyve/lib/libarchive/test/test_read_format_xar.c
  projects/bhyve/lib/libarchive/test/test_read_format_zip.c
  projects/bhyve/lib/libarchive/test/test_read_format_zip.zip.uu
  projects/bhyve/lib/libarchive/test/test_read_large.c
  projects/bhyve/lib/libarchive/test/test_read_pax_truncated.c
  projects/bhyve/lib/libarchive/test/test_read_position.c
  projects/bhyve/lib/libarchive/test/test_read_truncated.c
  projects/bhyve/lib/libarchive/test/test_read_uu.c
  projects/bhyve/lib/libarchive/test/test_tar_filenames.c
  projects/bhyve/lib/libarchive/test/test_tar_large.c
  projects/bhyve/lib/libarchive/test/test_ustar_filenames.c
  projects/bhyve/lib/libarchive/test/test_write_compress.c
  projects/bhyve/lib/libarchive/test/test_write_compress_bzip2.c
  projects/bhyve/lib/libarchive/test/test_write_compress_gzip.c
  projects/bhyve/lib/libarchive/test/test_write_compress_lzma.c
  projects/bhyve/lib/libarchive/test/test_write_compress_program.c
  projects/bhyve/lib/libarchive/test/test_write_compress_xz.c
  projects/bhyve/lib/libarchive/test/test_write_disk.c
  projects/bhyve/lib/libarchive/test/test_write_disk_failures.c
  projects/bhyve/lib/libarchive/test/test_write_disk_hardlink.c
  projects/bhyve/lib/libarchive/test/test_write_disk_perms.c
  projects/bhyve/lib/libarchive/test/test_write_disk_secure.c
  projects/bhyve/lib/libarchive/test/test_write_disk_sparse.c
  projects/bhyve/lib/libarchive/test/test_write_disk_symlink.c
  projects/bhyve/lib/libarchive/test/test_write_disk_times.c
  projects/bhyve/lib/libarchive/test/test_write_format_ar.c
  projects/bhyve/lib/libarchive/test/test_write_format_cpio.c
  projects/bhyve/lib/libarchive/test/test_write_format_cpio_empty.c
  projects/bhyve/lib/libarchive/test/test_write_format_cpio_newc.c
  projects/bhyve/lib/libarchive/test/test_write_format_cpio_odc.c
  projects/bhyve/lib/libarchive/test/test_write_format_mtree.c
  projects/bhyve/lib/libarchive/test/test_write_format_pax.c
  projects/bhyve/lib/libarchive/test/test_write_format_shar_empty.c
  projects/bhyve/lib/libarchive/test/test_write_format_tar.c
  projects/bhyve/lib/libarchive/test/test_write_format_tar_empty.c
  projects/bhyve/lib/libarchive/test/test_write_format_tar_ustar.c
  projects/bhyve/lib/libarchive/test/test_write_format_zip.c
  projects/bhyve/lib/libarchive/test/test_write_format_zip_empty.c
  projects/bhyve/lib/libarchive/test/test_write_format_zip_no_compression.c
  projects/bhyve/lib/libarchive/test/test_write_open_memory.c
  projects/bhyve/lib/libc/i386/string/index.S
  projects/bhyve/lib/libc/i386/string/rindex.S
  projects/bhyve/lib/libc/mips/string/index.S
  projects/bhyve/lib/libc/mips/string/rindex.S
  projects/bhyve/lib/libc/string/index.c
  projects/bhyve/lib/libc/string/rindex.c
  projects/bhyve/sbin/ifconfig/ifcarp.c
  projects/bhyve/share/man/man4/amd.4
  projects/bhyve/share/man/man7/eventtimers.7
  projects/bhyve/sys/contrib/dev/acpica/osunixxf.c
  projects/bhyve/sys/contrib/dev/acpica/tools/
  projects/bhyve/sys/dev/amd/
  projects/bhyve/sys/dev/cxgbe/common/t4fw_interface.h
  projects/bhyve/sys/fs/ext2fs/ext2_readwrite.c
  projects/bhyve/sys/libkern/gets.c
  projects/bhyve/sys/libkern/index.c
  projects/bhyve/sys/libkern/rindex.c
  projects/bhyve/sys/libkern/skpc.c
  projects/bhyve/sys/mips/conf/AR71XX
  projects/bhyve/sys/mips/conf/AR71XX.hints
  projects/bhyve/sys/modules/amd/
  projects/bhyve/sys/modules/if_carp/
  projects/bhyve/usr.bin/cpio/bsdcpio.1
  projects/bhyve/usr.bin/cpio/cmdline.c
  projects/bhyve/usr.bin/cpio/cpio.c
  projects/bhyve/usr.bin/cpio/cpio.h
  projects/bhyve/usr.bin/cpio/cpio_platform.h
  projects/bhyve/usr.bin/cpio/test/main.c
  projects/bhyve/usr.bin/cpio/test/test.h
  projects/bhyve/usr.bin/cpio/test/test_0.c
  projects/bhyve/usr.bin/cpio/test/test_basic.c
  projects/bhyve/usr.bin/cpio/test/test_cmdline.c
  projects/bhyve/usr.bin/cpio/test/test_format_newc.c
  projects/bhyve/usr.bin/cpio/test/test_gcpio_compat.c
  projects/bhyve/usr.bin/cpio/test/test_gcpio_compat_ref.bin.uu
  projects/bhyve/usr.bin/cpio/test/test_gcpio_compat_ref.crc.uu
  projects/bhyve/usr.bin/cpio/test/test_gcpio_compat_ref.newc.uu
  projects/bhyve/usr.bin/cpio/test/test_gcpio_compat_ref.ustar.uu
  projects/bhyve/usr.bin/cpio/test/test_gcpio_compat_ref_nosym.bin.uu
  projects/bhyve/usr.bin/cpio/test/test_gcpio_compat_ref_nosym.crc.uu
  projects/bhyve/usr.bin/cpio/test/test_gcpio_compat_ref_nosym.newc.uu
  projects/bhyve/usr.bin/cpio/test/test_gcpio_compat_ref_nosym.ustar.uu
  projects/bhyve/usr.bin/cpio/test/test_option_B_upper.c
  projects/bhyve/usr.bin/cpio/test/test_option_C_upper.c
  projects/bhyve/usr.bin/cpio/test/test_option_J_upper.c
  projects/bhyve/usr.bin/cpio/test/test_option_L_upper.c
  projects/bhyve/usr.bin/cpio/test/test_option_Z_upper.c
  projects/bhyve/usr.bin/cpio/test/test_option_a.c
  projects/bhyve/usr.bin/cpio/test/test_option_c.c
  projects/bhyve/usr.bin/cpio/test/test_option_d.c
  projects/bhyve/usr.bin/cpio/test/test_option_f.c
  projects/bhyve/usr.bin/cpio/test/test_option_f.cpio.uu
  projects/bhyve/usr.bin/cpio/test/test_option_help.c
  projects/bhyve/usr.bin/cpio/test/test_option_l.c
  projects/bhyve/usr.bin/cpio/test/test_option_lzma.c
  projects/bhyve/usr.bin/cpio/test/test_option_m.c
  projects/bhyve/usr.bin/cpio/test/test_option_m.cpio.uu
  projects/bhyve/usr.bin/cpio/test/test_option_t.c
  projects/bhyve/usr.bin/cpio/test/test_option_t.cpio.uu
  projects/bhyve/usr.bin/cpio/test/test_option_t.stdout.uu
  projects/bhyve/usr.bin/cpio/test/test_option_tv.stdout.uu
  projects/bhyve/usr.bin/cpio/test/test_option_u.c
  projects/bhyve/usr.bin/cpio/test/test_option_version.c
  projects/bhyve/usr.bin/cpio/test/test_option_y.c
  projects/bhyve/usr.bin/cpio/test/test_option_z.c
  projects/bhyve/usr.bin/cpio/test/test_owner_parse.c
  projects/bhyve/usr.bin/cpio/test/test_passthrough_dotdot.c
  projects/bhyve/usr.bin/cpio/test/test_passthrough_reverse.c
  projects/bhyve/usr.bin/cpio/test/test_pathmatch.c
  projects/bhyve/usr.bin/tar/COPYING
  projects/bhyve/usr.bin/tar/bsdtar.1
  projects/bhyve/usr.bin/tar/bsdtar.c
  projects/bhyve/usr.bin/tar/bsdtar.h
  projects/bhyve/usr.bin/tar/bsdtar_platform.h
  projects/bhyve/usr.bin/tar/cmdline.c
  projects/bhyve/usr.bin/tar/getdate.c
  projects/bhyve/usr.bin/tar/read.c
  projects/bhyve/usr.bin/tar/subst.c
  projects/bhyve/usr.bin/tar/test/main.c
  projects/bhyve/usr.bin/tar/test/test.h
  projects/bhyve/usr.bin/tar/test/test_0.c
  projects/bhyve/usr.bin/tar/test/test_basic.c
  projects/bhyve/usr.bin/tar/test/test_copy.c
  projects/bhyve/usr.bin/tar/test/test_empty_mtree.c
  projects/bhyve/usr.bin/tar/test/test_getdate.c
  projects/bhyve/usr.bin/tar/test/test_help.c
  projects/bhyve/usr.bin/tar/test/test_option_T_upper.c
  projects/bhyve/usr.bin/tar/test/test_option_q.c
  projects/bhyve/usr.bin/tar/test/test_option_r.c
  projects/bhyve/usr.bin/tar/test/test_option_s.c
  projects/bhyve/usr.bin/tar/test/test_patterns.c
  projects/bhyve/usr.bin/tar/test/test_patterns_2.tar.uu
  projects/bhyve/usr.bin/tar/test/test_patterns_3.tar.uu
  projects/bhyve/usr.bin/tar/test/test_patterns_4.tar.uu
  projects/bhyve/usr.bin/tar/test/test_stdio.c
  projects/bhyve/usr.bin/tar/test/test_strip_components.c
  projects/bhyve/usr.bin/tar/test/test_symlink_dir.c
  projects/bhyve/usr.bin/tar/test/test_version.c
  projects/bhyve/usr.bin/tar/tree.c
  projects/bhyve/usr.bin/tar/tree.h
  projects/bhyve/usr.bin/tar/util.c
  projects/bhyve/usr.bin/tar/write.c
  projects/bhyve/usr.sbin/sade/config.c
  projects/bhyve/usr.sbin/sade/dispatch.c
Modified:
  projects/bhyve/COPYRIGHT
  projects/bhyve/Makefile.inc1
  projects/bhyve/ObsoleteFiles.inc
  projects/bhyve/UPDATING
  projects/bhyve/bin/chio/chio.c
  projects/bhyve/bin/ed/io.c
  projects/bhyve/bin/ed/main.c
  projects/bhyve/bin/ps/ps.1
  projects/bhyve/bin/ps/ps.c
  projects/bhyve/bin/sh/eval.c
  projects/bhyve/bin/sh/exec.c
  projects/bhyve/bin/sh/exec.h
  projects/bhyve/bin/sh/expand.c
  projects/bhyve/bin/sh/expand.h
  projects/bhyve/bin/sh/histedit.c
  projects/bhyve/bin/sh/input.c
  projects/bhyve/bin/sh/input.h
  projects/bhyve/bin/sh/main.c
  projects/bhyve/bin/sh/main.h
  projects/bhyve/bin/sh/mksyntax.c
  projects/bhyve/bin/sh/myhistedit.h
  projects/bhyve/bin/sh/mystring.c
  projects/bhyve/bin/sh/mystring.h
  projects/bhyve/bin/stty/modes.c
  projects/bhyve/bin/test/test.c
  projects/bhyve/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
  projects/bhyve/cddl/contrib/opensolaris/cmd/zdb/zdb.8
  projects/bhyve/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  projects/bhyve/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  projects/bhyve/cddl/contrib/opensolaris/cmd/zpool/zpool.8
  projects/bhyve/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  projects/bhyve/cddl/contrib/opensolaris/cmd/zstreamdump/zstreamdump.1
  projects/bhyve/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  projects/bhyve/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c
  projects/bhyve/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
  projects/bhyve/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c
  projects/bhyve/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
  projects/bhyve/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c
  projects/bhyve/cddl/contrib/opensolaris/lib/libdtrace/i386/dt_isadep.c
  projects/bhyve/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  projects/bhyve/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  projects/bhyve/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h
  projects/bhyve/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
  projects/bhyve/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
  projects/bhyve/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
  projects/bhyve/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
  projects/bhyve/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c
  projects/bhyve/cddl/lib/drti/Makefile
  projects/bhyve/cddl/lib/libzfs/Makefile
  projects/bhyve/contrib/bsnmp/snmp_mibII/mibII.c
  projects/bhyve/contrib/bsnmp/snmpd/snmpmod.h
  projects/bhyve/contrib/bzip2/bzip2recover.c
  projects/bhyve/contrib/compiler-rt/LICENSE.TXT
  projects/bhyve/contrib/compiler-rt/README.txt
  projects/bhyve/contrib/compiler-rt/lib/absvdi2.c
  projects/bhyve/contrib/compiler-rt/lib/absvsi2.c
  projects/bhyve/contrib/compiler-rt/lib/absvti2.c
  projects/bhyve/contrib/compiler-rt/lib/adddf3.c
  projects/bhyve/contrib/compiler-rt/lib/addsf3.c
  projects/bhyve/contrib/compiler-rt/lib/addvdi3.c
  projects/bhyve/contrib/compiler-rt/lib/addvsi3.c
  projects/bhyve/contrib/compiler-rt/lib/addvti3.c
  projects/bhyve/contrib/compiler-rt/lib/arm/adddf3vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/addsf3vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/divdf3vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/divsf3vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/eqdf2vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/eqsf2vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/extendsfdf2vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/fixdfsivfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/fixsfsivfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/fixunsdfsivfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/fixunssfsivfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/floatsidfvfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/floatsisfvfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/floatunssidfvfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/floatunssisfvfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/gedf2vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/gesf2vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/gtdf2vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/gtsf2vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/ledf2vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/lesf2vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/ltdf2vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/ltsf2vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/muldf3vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/mulsf3vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/nedf2vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/negdf2vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/negsf2vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/nesf2vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/subdf3vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/subsf3vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/truncdfsf2vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/unorddf2vfp.S
  projects/bhyve/contrib/compiler-rt/lib/arm/unordsf2vfp.S
  projects/bhyve/contrib/compiler-rt/lib/ashldi3.c
  projects/bhyve/contrib/compiler-rt/lib/ashrdi3.c
  projects/bhyve/contrib/compiler-rt/lib/assembly.h
  projects/bhyve/contrib/compiler-rt/lib/clear_cache.c
  projects/bhyve/contrib/compiler-rt/lib/clzdi2.c
  projects/bhyve/contrib/compiler-rt/lib/clzsi2.c
  projects/bhyve/contrib/compiler-rt/lib/cmpdi2.c
  projects/bhyve/contrib/compiler-rt/lib/ctzdi2.c
  projects/bhyve/contrib/compiler-rt/lib/ctzsi2.c
  projects/bhyve/contrib/compiler-rt/lib/divdc3.c
  projects/bhyve/contrib/compiler-rt/lib/divdf3.c
  projects/bhyve/contrib/compiler-rt/lib/divdi3.c
  projects/bhyve/contrib/compiler-rt/lib/divmoddi4.c
  projects/bhyve/contrib/compiler-rt/lib/divmodsi4.c
  projects/bhyve/contrib/compiler-rt/lib/divsc3.c
  projects/bhyve/contrib/compiler-rt/lib/divsf3.c
  projects/bhyve/contrib/compiler-rt/lib/divsi3.c
  projects/bhyve/contrib/compiler-rt/lib/divxc3.c
  projects/bhyve/contrib/compiler-rt/lib/enable_execute_stack.c
  projects/bhyve/contrib/compiler-rt/lib/eprintf.c
  projects/bhyve/contrib/compiler-rt/lib/extendsfdf2.c
  projects/bhyve/contrib/compiler-rt/lib/ffsdi2.c
  projects/bhyve/contrib/compiler-rt/lib/fixdfdi.c
  projects/bhyve/contrib/compiler-rt/lib/fixdfsi.c
  projects/bhyve/contrib/compiler-rt/lib/fixsfdi.c
  projects/bhyve/contrib/compiler-rt/lib/fixsfsi.c
  projects/bhyve/contrib/compiler-rt/lib/fixunsdfdi.c
  projects/bhyve/contrib/compiler-rt/lib/fixunsdfsi.c
  projects/bhyve/contrib/compiler-rt/lib/fixunssfdi.c
  projects/bhyve/contrib/compiler-rt/lib/fixunssfsi.c
  projects/bhyve/contrib/compiler-rt/lib/floatdidf.c
  projects/bhyve/contrib/compiler-rt/lib/floatdisf.c
  projects/bhyve/contrib/compiler-rt/lib/floatsidf.c
  projects/bhyve/contrib/compiler-rt/lib/floatsisf.c
  projects/bhyve/contrib/compiler-rt/lib/floattidf.c
  projects/bhyve/contrib/compiler-rt/lib/floattisf.c
  projects/bhyve/contrib/compiler-rt/lib/floattixf.c
  projects/bhyve/contrib/compiler-rt/lib/floatundidf.c
  projects/bhyve/contrib/compiler-rt/lib/floatundisf.c
  projects/bhyve/contrib/compiler-rt/lib/floatunsidf.c
  projects/bhyve/contrib/compiler-rt/lib/floatunsisf.c
  projects/bhyve/contrib/compiler-rt/lib/floatuntidf.c
  projects/bhyve/contrib/compiler-rt/lib/floatuntisf.c
  projects/bhyve/contrib/compiler-rt/lib/floatuntixf.c
  projects/bhyve/contrib/compiler-rt/lib/fp_lib.h
  projects/bhyve/contrib/compiler-rt/lib/gcc_personality_v0.c
  projects/bhyve/contrib/compiler-rt/lib/int_lib.h
  projects/bhyve/contrib/compiler-rt/lib/lshrdi3.c
  projects/bhyve/contrib/compiler-rt/lib/moddi3.c
  projects/bhyve/contrib/compiler-rt/lib/modsi3.c
  projects/bhyve/contrib/compiler-rt/lib/muldc3.c
  projects/bhyve/contrib/compiler-rt/lib/muldf3.c
  projects/bhyve/contrib/compiler-rt/lib/muldi3.c
  projects/bhyve/contrib/compiler-rt/lib/mulsc3.c
  projects/bhyve/contrib/compiler-rt/lib/mulsf3.c
  projects/bhyve/contrib/compiler-rt/lib/mulvdi3.c
  projects/bhyve/contrib/compiler-rt/lib/mulvsi3.c
  projects/bhyve/contrib/compiler-rt/lib/mulvti3.c
  projects/bhyve/contrib/compiler-rt/lib/mulxc3.c
  projects/bhyve/contrib/compiler-rt/lib/negdf2.c
  projects/bhyve/contrib/compiler-rt/lib/negsf2.c
  projects/bhyve/contrib/compiler-rt/lib/negvdi2.c
  projects/bhyve/contrib/compiler-rt/lib/negvsi2.c
  projects/bhyve/contrib/compiler-rt/lib/negvti2.c
  projects/bhyve/contrib/compiler-rt/lib/paritydi2.c
  projects/bhyve/contrib/compiler-rt/lib/paritysi2.c
  projects/bhyve/contrib/compiler-rt/lib/popcountdi2.c
  projects/bhyve/contrib/compiler-rt/lib/popcountsi2.c
  projects/bhyve/contrib/compiler-rt/lib/powidf2.c
  projects/bhyve/contrib/compiler-rt/lib/powisf2.c
  projects/bhyve/contrib/compiler-rt/lib/ppc/DD.h
  projects/bhyve/contrib/compiler-rt/lib/ppc/divtc3.c
  projects/bhyve/contrib/compiler-rt/lib/ppc/fixtfdi.c
  projects/bhyve/contrib/compiler-rt/lib/ppc/fixunstfdi.c
  projects/bhyve/contrib/compiler-rt/lib/ppc/floatditf.c
  projects/bhyve/contrib/compiler-rt/lib/ppc/floatunditf.c
  projects/bhyve/contrib/compiler-rt/lib/ppc/multc3.c
  projects/bhyve/contrib/compiler-rt/lib/subdf3.c
  projects/bhyve/contrib/compiler-rt/lib/subsf3.c
  projects/bhyve/contrib/compiler-rt/lib/subvdi3.c
  projects/bhyve/contrib/compiler-rt/lib/subvsi3.c
  projects/bhyve/contrib/compiler-rt/lib/subvti3.c
  projects/bhyve/contrib/compiler-rt/lib/trampoline_setup.c
  projects/bhyve/contrib/compiler-rt/lib/truncdfsf2.c
  projects/bhyve/contrib/compiler-rt/lib/ucmpdi2.c
  projects/bhyve/contrib/compiler-rt/lib/udivdi3.c
  projects/bhyve/contrib/compiler-rt/lib/udivmoddi4.c
  projects/bhyve/contrib/compiler-rt/lib/udivmodsi4.c
  projects/bhyve/contrib/compiler-rt/lib/udivmodti4.c
  projects/bhyve/contrib/compiler-rt/lib/udivsi3.c
  projects/bhyve/contrib/compiler-rt/lib/umoddi3.c
  projects/bhyve/contrib/compiler-rt/lib/umodsi3.c
  projects/bhyve/contrib/compiler-rt/lib/x86_64/floatdidf.c
  projects/bhyve/contrib/compiler-rt/lib/x86_64/floatdisf.c
  projects/bhyve/contrib/compiler-rt/lib/x86_64/floatdixf.c
  projects/bhyve/contrib/ee/ee.c
  projects/bhyve/contrib/file/softmagic.c
  projects/bhyve/contrib/gcc/ChangeLog.gcc43
  projects/bhyve/contrib/gcc/builtins.c
  projects/bhyve/contrib/gcclibs/libcpp/include/cpplib.h
  projects/bhyve/contrib/gcclibs/libcpp/init.c
  projects/bhyve/contrib/gcclibs/libcpp/internal.h
  projects/bhyve/contrib/gcclibs/libcpp/macro.c
  projects/bhyve/contrib/gperf/AUTHORS
  projects/bhyve/contrib/gperf/COPYING
  projects/bhyve/contrib/gperf/ChangeLog
  projects/bhyve/contrib/gperf/FREEBSD-Xlist
  projects/bhyve/contrib/gperf/INSTALL
  projects/bhyve/contrib/gperf/Makefile.devel
  projects/bhyve/contrib/gperf/Makefile.in
  projects/bhyve/contrib/gperf/NEWS
  projects/bhyve/contrib/gperf/README
  projects/bhyve/contrib/gperf/aclocal.m4
  projects/bhyve/contrib/gperf/configure
  projects/bhyve/contrib/gperf/doc/Makefile.in
  projects/bhyve/contrib/gperf/doc/configure
  projects/bhyve/contrib/gperf/doc/gperf.1
  projects/bhyve/contrib/gperf/doc/help2man
  projects/bhyve/contrib/gperf/lib/Makefile.in
  projects/bhyve/contrib/gperf/lib/configure
  projects/bhyve/contrib/gperf/lib/hash.cc
  projects/bhyve/contrib/gperf/lib/hash.h
  projects/bhyve/contrib/gperf/src/Makefile.in
  projects/bhyve/contrib/gperf/src/bool-array.cc
  projects/bhyve/contrib/gperf/src/bool-array.h
  projects/bhyve/contrib/gperf/src/bool-array.icc
  projects/bhyve/contrib/gperf/src/config.h.in
  projects/bhyve/contrib/gperf/src/configure
  projects/bhyve/contrib/gperf/src/hash-table.cc
  projects/bhyve/contrib/gperf/src/hash-table.h
  projects/bhyve/contrib/gperf/src/main.cc
  projects/bhyve/contrib/gperf/src/options.cc
  projects/bhyve/contrib/gperf/src/options.h
  projects/bhyve/contrib/gperf/src/options.icc
  projects/bhyve/contrib/gperf/src/version.cc
  projects/bhyve/contrib/gperf/src/version.h
  projects/bhyve/contrib/groff/tmac/doc-common
  projects/bhyve/contrib/groff/tmac/doc-syms
  projects/bhyve/contrib/groff/tmac/doc.tmac
  projects/bhyve/contrib/groff/tmac/groff_mdoc.man
  projects/bhyve/contrib/less/command.c
  projects/bhyve/contrib/less/prompt.c
  projects/bhyve/contrib/libstdc++/ChangeLog
  projects/bhyve/contrib/libstdc++/config/os/aix/os_defines.h
  projects/bhyve/contrib/libstdc++/include/bits/allocator.h
  projects/bhyve/contrib/libstdc++/include/bits/basic_string.h
  projects/bhyve/contrib/libstdc++/include/bits/fstream.tcc
  projects/bhyve/contrib/libstdc++/include/bits/locale_facets.tcc
  projects/bhyve/contrib/libstdc++/include/debug/map.h
  projects/bhyve/contrib/libstdc++/include/debug/multimap.h
  projects/bhyve/contrib/libstdc++/include/ext/atomicity.h
  projects/bhyve/contrib/libstdc++/include/ext/codecvt_specializations.h
  projects/bhyve/contrib/libstdc++/include/ext/concurrence.h
  projects/bhyve/contrib/libstdc++/include/ext/vstring.h
  projects/bhyve/contrib/libstdc++/include/tr1/boost_shared_ptr.h
  projects/bhyve/contrib/libstdc++/include/tr1/random
  projects/bhyve/contrib/libstdc++/libsupc++/eh_personality.cc
  projects/bhyve/contrib/libstdc++/libsupc++/typeinfo
  projects/bhyve/contrib/libstdc++/src/valarray-inst.cc
  projects/bhyve/contrib/llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
  projects/bhyve/contrib/llvm/lib/CodeGen/LLVMTargetMachine.cpp
  projects/bhyve/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp
  projects/bhyve/contrib/llvm/lib/CodeGen/TargetLoweringObjectFileImpl.cpp
  projects/bhyve/contrib/llvm/lib/Target/ARM/ARMBaseRegisterInfo.cpp
  projects/bhyve/contrib/llvm/lib/Target/ARM/ARMCallingConv.td
  projects/bhyve/contrib/llvm/lib/Target/ARM/ARMFastISel.cpp
  projects/bhyve/contrib/llvm/lib/Target/ARM/ARMFrameLowering.cpp
  projects/bhyve/contrib/llvm/lib/Target/ARM/ARMISelLowering.cpp
  projects/bhyve/contrib/llvm/lib/Target/ARM/ARMInstrThumb2.td
  projects/bhyve/contrib/llvm/lib/Target/CppBackend/CPPBackend.cpp
  projects/bhyve/contrib/llvm/lib/Target/Mips/Mips64InstrInfo.td
  projects/bhyve/contrib/llvm/lib/Target/Mips/MipsCodeEmitter.cpp
  projects/bhyve/contrib/llvm/lib/Target/Mips/MipsInstrFPU.td
  projects/bhyve/contrib/llvm/lib/Target/Mips/MipsInstrFormats.td
  projects/bhyve/contrib/llvm/lib/Target/Mips/MipsInstrInfo.td
  projects/bhyve/contrib/llvm/lib/Target/Mips/MipsJITInfo.cpp
  projects/bhyve/contrib/llvm/lib/Target/PowerPC/PPCFrameLowering.cpp
  projects/bhyve/contrib/llvm/lib/Target/X86/X86CodeEmitter.cpp
  projects/bhyve/contrib/llvm/lib/Transforms/InstCombine/InstructionCombining.cpp
  projects/bhyve/contrib/llvm/tools/clang/include/clang/Driver/CC1Options.td
  projects/bhyve/contrib/llvm/tools/clang/include/clang/Driver/ToolChain.h
  projects/bhyve/contrib/llvm/tools/clang/include/clang/Frontend/HeaderSearchOptions.h
  projects/bhyve/contrib/llvm/tools/clang/lib/Basic/Version.cpp
  projects/bhyve/contrib/llvm/tools/clang/lib/CodeGen/CGObjCGNU.cpp
  projects/bhyve/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.cpp
  projects/bhyve/contrib/llvm/tools/clang/lib/CodeGen/CodeGenModule.h
  projects/bhyve/contrib/llvm/tools/clang/lib/Driver/ToolChain.cpp
  projects/bhyve/contrib/llvm/tools/clang/lib/Driver/ToolChains.cpp
  projects/bhyve/contrib/llvm/tools/clang/lib/Driver/ToolChains.h
  projects/bhyve/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
  projects/bhyve/contrib/llvm/tools/clang/lib/Frontend/CompilerInvocation.cpp
  projects/bhyve/contrib/llvm/tools/clang/lib/Frontend/InitHeaderSearch.cpp
  projects/bhyve/contrib/netcat/netcat.c
  projects/bhyve/contrib/openpam/CREDITS
  projects/bhyve/contrib/openpam/HISTORY
  projects/bhyve/contrib/openpam/LICENSE
  projects/bhyve/contrib/openpam/Makefile.am
  projects/bhyve/contrib/openpam/Makefile.in
  projects/bhyve/contrib/openpam/README
  projects/bhyve/contrib/openpam/RELNOTES
  projects/bhyve/contrib/openpam/aclocal.m4
  projects/bhyve/contrib/openpam/bin/Makefile.am
  projects/bhyve/contrib/openpam/bin/Makefile.in
  projects/bhyve/contrib/openpam/bin/su/Makefile.am
  projects/bhyve/contrib/openpam/bin/su/Makefile.in
  projects/bhyve/contrib/openpam/bin/su/su.c
  projects/bhyve/contrib/openpam/config.h.in
  projects/bhyve/contrib/openpam/configure
  projects/bhyve/contrib/openpam/configure.ac
  projects/bhyve/contrib/openpam/depcomp
  projects/bhyve/contrib/openpam/doc/Makefile.in
  projects/bhyve/contrib/openpam/doc/man/Makefile.am
  projects/bhyve/contrib/openpam/doc/man/Makefile.in
  projects/bhyve/contrib/openpam/doc/man/openpam.3
  projects/bhyve/contrib/openpam/doc/man/openpam_borrow_cred.3
  projects/bhyve/contrib/openpam/doc/man/openpam_free_data.3
  projects/bhyve/contrib/openpam/doc/man/openpam_free_envlist.3
  projects/bhyve/contrib/openpam/doc/man/openpam_get_option.3
  projects/bhyve/contrib/openpam/doc/man/openpam_log.3
  projects/bhyve/contrib/openpam/doc/man/openpam_nullconv.3
  projects/bhyve/contrib/openpam/doc/man/openpam_readline.3
  projects/bhyve/contrib/openpam/doc/man/openpam_restore_cred.3
  projects/bhyve/contrib/openpam/doc/man/openpam_set_option.3
  projects/bhyve/contrib/openpam/doc/man/openpam_ttyconv.3
  projects/bhyve/contrib/openpam/doc/man/pam.3
  projects/bhyve/contrib/openpam/doc/man/pam.conf.5
  projects/bhyve/contrib/openpam/doc/man/pam_acct_mgmt.3
  projects/bhyve/contrib/openpam/doc/man/pam_authenticate.3
  projects/bhyve/contrib/openpam/doc/man/pam_chauthtok.3
  projects/bhyve/contrib/openpam/doc/man/pam_close_session.3
  projects/bhyve/contrib/openpam/doc/man/pam_conv.3
  projects/bhyve/contrib/openpam/doc/man/pam_end.3
  projects/bhyve/contrib/openpam/doc/man/pam_error.3
  projects/bhyve/contrib/openpam/doc/man/pam_get_authtok.3
  projects/bhyve/contrib/openpam/doc/man/pam_get_data.3
  projects/bhyve/contrib/openpam/doc/man/pam_get_item.3
  projects/bhyve/contrib/openpam/doc/man/pam_get_user.3
  projects/bhyve/contrib/openpam/doc/man/pam_getenv.3
  projects/bhyve/contrib/openpam/doc/man/pam_getenvlist.3
  projects/bhyve/contrib/openpam/doc/man/pam_info.3
  projects/bhyve/contrib/openpam/doc/man/pam_open_session.3
  projects/bhyve/contrib/openpam/doc/man/pam_prompt.3
  projects/bhyve/contrib/openpam/doc/man/pam_putenv.3
  projects/bhyve/contrib/openpam/doc/man/pam_set_data.3
  projects/bhyve/contrib/openpam/doc/man/pam_set_item.3
  projects/bhyve/contrib/openpam/doc/man/pam_setcred.3
  projects/bhyve/contrib/openpam/doc/man/pam_setenv.3
  projects/bhyve/contrib/openpam/doc/man/pam_sm_acct_mgmt.3
  projects/bhyve/contrib/openpam/doc/man/pam_sm_authenticate.3
  projects/bhyve/contrib/openpam/doc/man/pam_sm_chauthtok.3
  projects/bhyve/contrib/openpam/doc/man/pam_sm_close_session.3
  projects/bhyve/contrib/openpam/doc/man/pam_sm_open_session.3
  projects/bhyve/contrib/openpam/doc/man/pam_sm_setcred.3
  projects/bhyve/contrib/openpam/doc/man/pam_start.3
  projects/bhyve/contrib/openpam/doc/man/pam_strerror.3
  projects/bhyve/contrib/openpam/doc/man/pam_verror.3
  projects/bhyve/contrib/openpam/doc/man/pam_vinfo.3
  projects/bhyve/contrib/openpam/doc/man/pam_vprompt.3
  projects/bhyve/contrib/openpam/include/Makefile.in
  projects/bhyve/contrib/openpam/include/security/Makefile.in
  projects/bhyve/contrib/openpam/include/security/openpam.h
  projects/bhyve/contrib/openpam/include/security/openpam_version.h
  projects/bhyve/contrib/openpam/include/security/pam_appl.h
  projects/bhyve/contrib/openpam/include/security/pam_constants.h
  projects/bhyve/contrib/openpam/include/security/pam_modules.h
  projects/bhyve/contrib/openpam/include/security/pam_types.h
  projects/bhyve/contrib/openpam/install-sh
  projects/bhyve/contrib/openpam/lib/Makefile.am
  projects/bhyve/contrib/openpam/lib/Makefile.in
  projects/bhyve/contrib/openpam/lib/openpam_borrow_cred.c
  projects/bhyve/contrib/openpam/lib/openpam_configure.c
  projects/bhyve/contrib/openpam/lib/openpam_dispatch.c
  projects/bhyve/contrib/openpam/lib/openpam_dynamic.c
  projects/bhyve/contrib/openpam/lib/openpam_findenv.c
  projects/bhyve/contrib/openpam/lib/openpam_free_data.c
  projects/bhyve/contrib/openpam/lib/openpam_free_envlist.c
  projects/bhyve/contrib/openpam/lib/openpam_get_option.c
  projects/bhyve/contrib/openpam/lib/openpam_impl.h
  projects/bhyve/contrib/openpam/lib/openpam_load.c
  projects/bhyve/contrib/openpam/lib/openpam_log.c
  projects/bhyve/contrib/openpam/lib/openpam_nullconv.c
  projects/bhyve/contrib/openpam/lib/openpam_readline.c
  projects/bhyve/contrib/openpam/lib/openpam_restore_cred.c
  projects/bhyve/contrib/openpam/lib/openpam_set_option.c
  projects/bhyve/contrib/openpam/lib/openpam_static.c
  projects/bhyve/contrib/openpam/lib/openpam_ttyconv.c
  projects/bhyve/contrib/openpam/lib/pam_acct_mgmt.c
  projects/bhyve/contrib/openpam/lib/pam_authenticate.c
  projects/bhyve/contrib/openpam/lib/pam_authenticate_secondary.c
  projects/bhyve/contrib/openpam/lib/pam_chauthtok.c
  projects/bhyve/contrib/openpam/lib/pam_close_session.c
  projects/bhyve/contrib/openpam/lib/pam_end.c
  projects/bhyve/contrib/openpam/lib/pam_error.c
  projects/bhyve/contrib/openpam/lib/pam_get_authtok.c
  projects/bhyve/contrib/openpam/lib/pam_get_data.c
  projects/bhyve/contrib/openpam/lib/pam_get_item.c
  projects/bhyve/contrib/openpam/lib/pam_get_mapped_authtok.c
  projects/bhyve/contrib/openpam/lib/pam_get_mapped_username.c
  projects/bhyve/contrib/openpam/lib/pam_get_user.c
  projects/bhyve/contrib/openpam/lib/pam_getenv.c
  projects/bhyve/contrib/openpam/lib/pam_getenvlist.c
  projects/bhyve/contrib/openpam/lib/pam_info.c
  projects/bhyve/contrib/openpam/lib/pam_open_session.c
  projects/bhyve/contrib/openpam/lib/pam_prompt.c
  projects/bhyve/contrib/openpam/lib/pam_putenv.c
  projects/bhyve/contrib/openpam/lib/pam_set_data.c
  projects/bhyve/contrib/openpam/lib/pam_set_item.c
  projects/bhyve/contrib/openpam/lib/pam_set_mapped_authtok.c
  projects/bhyve/contrib/openpam/lib/pam_set_mapped_username.c
  projects/bhyve/contrib/openpam/lib/pam_setcred.c
  projects/bhyve/contrib/openpam/lib/pam_setenv.c
  projects/bhyve/contrib/openpam/lib/pam_sm_acct_mgmt.c
  projects/bhyve/contrib/openpam/lib/pam_sm_authenticate.c
  projects/bhyve/contrib/openpam/lib/pam_sm_authenticate_secondary.c
  projects/bhyve/contrib/openpam/lib/pam_sm_chauthtok.c
  projects/bhyve/contrib/openpam/lib/pam_sm_close_session.c
  projects/bhyve/contrib/openpam/lib/pam_sm_get_mapped_authtok.c
  projects/bhyve/contrib/openpam/lib/pam_sm_get_mapped_username.c
  projects/bhyve/contrib/openpam/lib/pam_sm_open_session.c
  projects/bhyve/contrib/openpam/lib/pam_sm_set_mapped_authtok.c
  projects/bhyve/contrib/openpam/lib/pam_sm_set_mapped_username.c
  projects/bhyve/contrib/openpam/lib/pam_sm_setcred.c
  projects/bhyve/contrib/openpam/lib/pam_start.c
  projects/bhyve/contrib/openpam/lib/pam_strerror.c
  projects/bhyve/contrib/openpam/lib/pam_verror.c
  projects/bhyve/contrib/openpam/lib/pam_vinfo.c
  projects/bhyve/contrib/openpam/lib/pam_vprompt.c
  projects/bhyve/contrib/openpam/ltmain.sh
  projects/bhyve/contrib/openpam/misc/gendoc.pl
  projects/bhyve/contrib/openpam/missing
  projects/bhyve/contrib/openpam/modules/Makefile.in
  projects/bhyve/contrib/openpam/modules/pam_deny/Makefile.in
  projects/bhyve/contrib/openpam/modules/pam_deny/pam_deny.c
  projects/bhyve/contrib/openpam/modules/pam_permit/Makefile.in
  projects/bhyve/contrib/openpam/modules/pam_permit/pam_permit.c
  projects/bhyve/contrib/openpam/modules/pam_unix/Makefile.am
  projects/bhyve/contrib/openpam/modules/pam_unix/Makefile.in
  projects/bhyve/contrib/openpam/modules/pam_unix/pam_unix.c
  projects/bhyve/contrib/pf/man/pfsync.4
  projects/bhyve/contrib/pnpinfo/pnpinfo.c
  projects/bhyve/contrib/tcpdump/print-eigrp.c
  projects/bhyve/contrib/tcpdump/print-icmp6.c
  projects/bhyve/contrib/tcpdump/print-ldp.c
  projects/bhyve/contrib/tcpdump/print-lmp.c
  projects/bhyve/contrib/tcpdump/print-lspping.c
  projects/bhyve/contrib/tcpdump/print-rsvp.c
  projects/bhyve/contrib/tcpdump/print-slow.c
  projects/bhyve/contrib/telnet/libtelnet/encrypt.c
  projects/bhyve/contrib/telnet/libtelnet/sra.c
  projects/bhyve/contrib/telnet/telnet/utilities.c
  projects/bhyve/contrib/telnet/telnetd/utility.c
  projects/bhyve/contrib/tzcode/zic/zdump.c
  projects/bhyve/crypto/heimdal/appl/telnet/libtelnet/encrypt.c
  projects/bhyve/etc/devd/apple.conf
  projects/bhyve/etc/mtree/BSD.include.dist
  projects/bhyve/etc/network.subr
  projects/bhyve/etc/rc.d/Makefile
  projects/bhyve/etc/rc.d/kld
  projects/bhyve/games/factor/factor.c
  projects/bhyve/games/fortune/datfiles/fortunes
  projects/bhyve/games/fortune/datfiles/fortunes-o.real
  projects/bhyve/games/fortune/datfiles/murphy
  projects/bhyve/games/fortune/fortune/fortune.c
  projects/bhyve/gnu/lib/Makefile
  projects/bhyve/gnu/usr.bin/binutils/libbinutils/Makefile
  projects/bhyve/gnu/usr.bin/dialog/Makefile
  projects/bhyve/gnu/usr.bin/gperf/Makefile
  projects/bhyve/gnu/usr.bin/gperf/config.h
  projects/bhyve/gnu/usr.bin/groff/tmac/mdoc.local
  projects/bhyve/include/Makefile
  projects/bhyve/include/assert.h
  projects/bhyve/include/glob.h
  projects/bhyve/include/netdb.h
  projects/bhyve/include/regex.h
  projects/bhyve/include/signal.h
  projects/bhyve/include/stdbool.h
  projects/bhyve/include/stdio.h
  projects/bhyve/include/stdlib.h
  projects/bhyve/include/unistd.h
  projects/bhyve/kerberos5/Makefile.inc
  projects/bhyve/kerberos5/lib/libhdb/Makefile
  projects/bhyve/kerberos5/usr.bin/kadmin/Makefile
  projects/bhyve/kerberos5/usr.sbin/ktutil/Makefile
  projects/bhyve/lib/Makefile
  projects/bhyve/lib/clang/clang.build.mk
  projects/bhyve/lib/clang/include/clang/Basic/Version.inc
  projects/bhyve/lib/clang/libllvmarminfo/Makefile
  projects/bhyve/lib/clang/libllvmmipscodegen/Makefile
  projects/bhyve/lib/clang/libllvmmipsinfo/Makefile
  projects/bhyve/lib/clang/libllvmpowerpcinfo/Makefile
  projects/bhyve/lib/clang/libllvmx86info/Makefile
  projects/bhyve/lib/libarchive/Makefile
  projects/bhyve/lib/libarchive/config_freebsd.h
  projects/bhyve/lib/libarchive/test/Makefile
  projects/bhyve/lib/libc/Makefile
  projects/bhyve/lib/libc/arm/string/Makefile.inc
  projects/bhyve/lib/libc/gen/Makefile.inc
  projects/bhyve/lib/libc/gen/Symbol.map
  projects/bhyve/lib/libc/gen/_pthread_stubs.c
  projects/bhyve/lib/libc/gen/exec.c
  projects/bhyve/lib/libc/gen/getosreldate.c
  projects/bhyve/lib/libc/gen/getttyent.c
  projects/bhyve/lib/libc/gen/getusershell.c
  projects/bhyve/lib/libc/gen/glob.3
  projects/bhyve/lib/libc/gen/glob.c
  projects/bhyve/lib/libc/gen/opendir.c
  projects/bhyve/lib/libc/gen/strtofflags.c
  projects/bhyve/lib/libc/gen/syslog.c
  projects/bhyve/lib/libc/gen/timezone.c
  projects/bhyve/lib/libc/i386/string/Makefile.inc
  projects/bhyve/lib/libc/i386/string/strchr.S
  projects/bhyve/lib/libc/i386/string/strrchr.S
  projects/bhyve/lib/libc/iconv/citrus_module.c
  projects/bhyve/lib/libc/include/libc_private.h
  projects/bhyve/lib/libc/locale/duplocale.3
  projects/bhyve/lib/libc/locale/freelocale.3
  projects/bhyve/lib/libc/locale/localeconv.3
  projects/bhyve/lib/libc/locale/newlocale.3
  projects/bhyve/lib/libc/locale/querylocale.3
  projects/bhyve/lib/libc/locale/setlocale.c
  projects/bhyve/lib/libc/locale/uselocale.3
  projects/bhyve/lib/libc/locale/wctype.c
  projects/bhyve/lib/libc/locale/xlocale.3
  projects/bhyve/lib/libc/locale/xlocale.c
  projects/bhyve/lib/libc/mips/string/Makefile.inc
  projects/bhyve/lib/libc/net/gethostbynis.c
  projects/bhyve/lib/libc/net/getifaddrs.c
  projects/bhyve/lib/libc/net/getnetbynis.c
  projects/bhyve/lib/libc/net/nsdispatch.c
  projects/bhyve/lib/libc/net/sctp_sys_calls.c
  projects/bhyve/lib/libc/resolv/res_send.c
  projects/bhyve/lib/libc/rpc/crypt_client.c
  projects/bhyve/lib/libc/stdlib/Makefile.inc
  projects/bhyve/lib/libc/stdlib/Symbol.map
  projects/bhyve/lib/libc/stdlib/atexit.3
  projects/bhyve/lib/libc/stdlib/exit.3
  projects/bhyve/lib/libc/stdlib/getopt_long.3
  projects/bhyve/lib/libc/stdlib/getsubopt.3
  projects/bhyve/lib/libc/stdlib/malloc.c
  projects/bhyve/lib/libc/string/Makefile.inc
  projects/bhyve/lib/libc/string/strcasecmp.c
  projects/bhyve/lib/libc/sys/Makefile.inc
  projects/bhyve/lib/libc/sys/cap_enter.2
  projects/bhyve/lib/libc/sys/cap_new.2
  projects/bhyve/lib/libc/sys/kqueue.2
  projects/bhyve/lib/libc/sys/rtprio.2
  projects/bhyve/lib/libc/yp/xdryp.c
  projects/bhyve/lib/libc/yp/yplib.c
  projects/bhyve/lib/libcam/camlib.c
  projects/bhyve/lib/libcompiler_rt/Makefile
  projects/bhyve/lib/libedit/edit/readline/Makefile
  projects/bhyve/lib/libedit/edit/readline/readline.h
  projects/bhyve/lib/libedit/histedit.h
  projects/bhyve/lib/libipsec/policy_token.l
  projects/bhyve/lib/libkvm/kvm_getprocs.3
  projects/bhyve/lib/libkvm/kvm_proc.c
  projects/bhyve/lib/libpam/libpam/Makefile
  projects/bhyve/lib/libpam/modules/Makefile.inc
  projects/bhyve/lib/libpam/modules/pam_unix/Makefile
  projects/bhyve/lib/libpmc/libpmc.c
  projects/bhyve/lib/libradius/Makefile
  projects/bhyve/lib/libradius/libradius.3
  projects/bhyve/lib/libradius/radlib.c
  projects/bhyve/lib/libradius/radlib.h
  projects/bhyve/lib/libradius/radlib_private.h
  projects/bhyve/lib/libsm/Makefile
  projects/bhyve/lib/libstand/Makefile
  projects/bhyve/lib/libstand/bootp.c
  projects/bhyve/lib/libstand/tftp.c
  projects/bhyve/lib/libthr/arch/amd64/include/pthread_md.h
  projects/bhyve/lib/libthr/arch/i386/include/pthread_md.h
  projects/bhyve/lib/libthread_db/Makefile
  projects/bhyve/lib/libufs/block.c
  projects/bhyve/lib/libusb/libusb10.c
  projects/bhyve/lib/libutil/gr_util.c
  projects/bhyve/lib/libutil/libutil.h
  projects/bhyve/lib/libutil/pw_util.c
  projects/bhyve/lib/libutil/quotafile.c
  projects/bhyve/lib/libvgl/simple.c
  projects/bhyve/libexec/bootpd/bootpgw/bootpgw.c
  projects/bhyve/libexec/bootpd/tools/bootptest/print-bootp.c
  projects/bhyve/libexec/comsat/comsat.c
  projects/bhyve/libexec/ftpd/ftpd.c
  projects/bhyve/libexec/ftpd/popen.c
  projects/bhyve/libexec/getty/chat.c
  projects/bhyve/libexec/mail.local/Makefile
  projects/bhyve/libexec/mknetid/parse_group.c
  projects/bhyve/libexec/pppoed/pppoed.c
  projects/bhyve/libexec/rbootd/utils.c
  projects/bhyve/libexec/rlogind/rlogind.c
  projects/bhyve/libexec/rtld-elf/amd64/reloc.c
  projects/bhyve/libexec/rtld-elf/arm/reloc.c
  projects/bhyve/libexec/rtld-elf/i386/reloc.c
  projects/bhyve/libexec/rtld-elf/ia64/reloc.c
  projects/bhyve/libexec/rtld-elf/mips/reloc.c
  projects/bhyve/libexec/rtld-elf/powerpc/reloc.c
  projects/bhyve/libexec/rtld-elf/powerpc64/reloc.c
  projects/bhyve/libexec/rtld-elf/rtld.c
  projects/bhyve/libexec/rtld-elf/rtld.h
  projects/bhyve/libexec/rtld-elf/sparc64/reloc.c
  projects/bhyve/libexec/smrsh/Makefile
  projects/bhyve/libexec/ypxfr/ypxfr_getmap.c
  projects/bhyve/libexec/ypxfr/ypxfr_main.c
  projects/bhyve/libexec/ypxfr/ypxfr_misc.c
  projects/bhyve/release/doc/en_US.ISO8859-1/hardware/article.sgml
  projects/bhyve/release/doc/en_US.ISO8859-1/relnotes/article.sgml
  projects/bhyve/release/picobsd/build/Makefile.conf
  projects/bhyve/release/picobsd/build/picobsd
  projects/bhyve/rescue/rescue/Makefile
  projects/bhyve/sbin/atm/atmconfig/diag.c
  projects/bhyve/sbin/bsdlabel/bsdlabel.c
  projects/bhyve/sbin/camcontrol/Makefile
  projects/bhyve/sbin/camcontrol/camcontrol.8
  projects/bhyve/sbin/camcontrol/camcontrol.c
  projects/bhyve/sbin/camcontrol/camcontrol.h
  projects/bhyve/sbin/camcontrol/modeedit.c
  projects/bhyve/sbin/camcontrol/util.c
  projects/bhyve/sbin/devd/devd.conf.5
  projects/bhyve/sbin/devd/devd.hh
  projects/bhyve/sbin/dhclient/clparse.c
  projects/bhyve/sbin/dhclient/dhclient-script   (contents, props changed)
  projects/bhyve/sbin/dhclient/dhclient.c
  projects/bhyve/sbin/dhclient/dhcp-options.5
  projects/bhyve/sbin/dhclient/dhcp.h
  projects/bhyve/sbin/dhclient/options.c
  projects/bhyve/sbin/dhclient/parse.c
  projects/bhyve/sbin/dhclient/tables.c
  projects/bhyve/sbin/dump/main.c
  projects/bhyve/sbin/dumpfs/dumpfs.c
  projects/bhyve/sbin/fsck_ffs/fsck.h
  projects/bhyve/sbin/fsck_ffs/pass2.c
  projects/bhyve/sbin/fsck_ffs/suj.c
  projects/bhyve/sbin/fsdb/Makefile
  projects/bhyve/sbin/gbde/Makefile
  projects/bhyve/sbin/hastctl/Makefile
  projects/bhyve/sbin/hastd/Makefile
  projects/bhyve/sbin/hastd/control.c
  projects/bhyve/sbin/hastd/hast_checksum.c
  projects/bhyve/sbin/hastd/pjdlog.h
  projects/bhyve/sbin/hastd/secondary.c
  projects/bhyve/sbin/hastd/token.l
  projects/bhyve/sbin/ifconfig/Makefile
  projects/bhyve/sbin/ifconfig/af_inet.c
  projects/bhyve/sbin/ifconfig/af_inet6.c
  projects/bhyve/sbin/ifconfig/ifconfig.8
  projects/bhyve/sbin/ifconfig/ifconfig.c
  projects/bhyve/sbin/ifconfig/ifconfig.h
  projects/bhyve/sbin/ifconfig/ifvlan.c
  projects/bhyve/sbin/ipf/Makefile.inc
  projects/bhyve/sbin/ipfw/main.c
  projects/bhyve/sbin/ipfw/nat.c
  projects/bhyve/sbin/newfs/newfs.h
  projects/bhyve/sbin/newfs_msdos/newfs_msdos.8
  projects/bhyve/sbin/newfs_msdos/newfs_msdos.c
  projects/bhyve/sbin/rcorder/rcorder.c
  projects/bhyve/sbin/reboot/reboot.c
  projects/bhyve/sbin/routed/rtquery/Makefile
  projects/bhyve/sbin/shutdown/shutdown.c
  projects/bhyve/sbin/sysctl/sysctl.c
  projects/bhyve/secure/lib/libcrypto/Makefile
  projects/bhyve/share/doc/IPv6/IMPLEMENTATION
  projects/bhyve/share/examples/drivers/make_device_driver.sh
  projects/bhyve/share/examples/scsi_target/scsi_cmds.c
  projects/bhyve/share/examples/scsi_target/scsi_target.c
  projects/bhyve/share/man/man3/Makefile
  projects/bhyve/share/man/man4/Makefile
  projects/bhyve/share/man/man4/acpi_wmi.4
  projects/bhyve/share/man/man4/ahci.4
  projects/bhyve/share/man/man4/altq.4
  projects/bhyve/share/man/man4/atrtc.4
  projects/bhyve/share/man/man4/attimer.4
  projects/bhyve/share/man/man4/bge.4
  projects/bhyve/share/man/man4/carp.4
  projects/bhyve/share/man/man4/cpufreq.4
  projects/bhyve/share/man/man4/cxgbe.4
  projects/bhyve/share/man/man4/ddb.4
  projects/bhyve/share/man/man4/et.4
  projects/bhyve/share/man/man4/hpet.4
  projects/bhyve/share/man/man4/man4.i386/CPU_ELAN.4
  projects/bhyve/share/man/man4/netmap.4
  projects/bhyve/share/man/man4/splash.4
  projects/bhyve/share/man/man4/targ.4
  projects/bhyve/share/man/man5/make.conf.5
  projects/bhyve/share/man/man5/periodic.conf.5
  projects/bhyve/share/man/man5/rc.conf.5
  projects/bhyve/share/man/man5/src.conf.5
  projects/bhyve/share/man/man7/Makefile
  projects/bhyve/share/man/man8/yp.8
  projects/bhyve/share/man/man9/Makefile
  projects/bhyve/share/man/man9/driver.9
  projects/bhyve/share/man/man9/rtalloc.9
  projects/bhyve/share/man/man9/sbuf.9
  projects/bhyve/share/man/man9/taskqueue.9
  projects/bhyve/share/misc/committers-ports.dot
  projects/bhyve/share/misc/committers-src.dot
  projects/bhyve/share/mk/bsd.lib.mk
  projects/bhyve/share/mk/bsd.libnames.mk
  projects/bhyve/share/mk/bsd.own.mk
  projects/bhyve/share/mk/bsd.prog.mk
  projects/bhyve/share/mk/bsd.sys.mk
  projects/bhyve/share/mk/sys.mk
  projects/bhyve/share/termcap/termcap.src
  projects/bhyve/sys/Makefile
  projects/bhyve/sys/amd64/amd64/legacy.c
  projects/bhyve/sys/amd64/amd64/machdep.c
  projects/bhyve/sys/amd64/amd64/pmap.c
  projects/bhyve/sys/amd64/conf/GENERIC
  projects/bhyve/sys/amd64/conf/NOTES
  projects/bhyve/sys/amd64/include/_types.h
  projects/bhyve/sys/amd64/linux32/linux.h
  projects/bhyve/sys/amd64/linux32/linux32_dummy.c
  projects/bhyve/sys/amd64/linux32/linux32_proto.h
  projects/bhyve/sys/amd64/linux32/linux32_syscall.h
  projects/bhyve/sys/amd64/linux32/linux32_syscalls.c
  projects/bhyve/sys/amd64/linux32/linux32_sysent.c
  projects/bhyve/sys/amd64/linux32/linux32_systrace_args.c
  projects/bhyve/sys/amd64/linux32/syscalls.master
  projects/bhyve/sys/arm/arm/irq_dispatch.S
  projects/bhyve/sys/arm/arm/pmap.c
  projects/bhyve/sys/arm/arm/vm_machdep.c
  projects/bhyve/sys/arm/econa/ehci_ebus.c
  projects/bhyve/sys/arm/econa/ohci_ec.c
  projects/bhyve/sys/arm/include/_types.h
  projects/bhyve/sys/arm/include/pmap.h
  projects/bhyve/sys/arm/mv/common.c
  projects/bhyve/sys/arm/mv/mv_machdep.c
  projects/bhyve/sys/arm/mv/mv_pci.c
  projects/bhyve/sys/arm/xscale/i80321/i80321_pci.c
  projects/bhyve/sys/arm/xscale/i8134x/i81342_pci.c
  projects/bhyve/sys/arm/xscale/ixp425/avila_ata.c
  projects/bhyve/sys/arm/xscale/ixp425/ixdp425_pci.c
  projects/bhyve/sys/arm/xscale/ixp425/ixp425_pci.c
  projects/bhyve/sys/arm/xscale/ixp425/ixp425var.h
  projects/bhyve/sys/boot/arm/at91/libat91/sd-card.c
  projects/bhyve/sys/boot/common/interp_parse.c
  projects/bhyve/sys/boot/common/loader.8
  projects/bhyve/sys/boot/forth/loader.4th
  projects/bhyve/sys/boot/forth/loader.conf
  projects/bhyve/sys/boot/forth/menu.4th
  projects/bhyve/sys/boot/forth/menu.4th.8
  projects/bhyve/sys/boot/i386/boot0/boot0.S
  projects/bhyve/sys/boot/i386/libi386/biospci.c
  projects/bhyve/sys/boot/i386/libi386/comconsole.c
  projects/bhyve/sys/boot/i386/libi386/libi386.h
  projects/bhyve/sys/boot/i386/libi386/time.c
  projects/bhyve/sys/boot/i386/zfsboot/zfsboot.c
  projects/bhyve/sys/boot/ofw/common/main.c
  projects/bhyve/sys/boot/ofw/libofw/ofw_net.c
  projects/bhyve/sys/boot/userboot/libstand/Makefile
  projects/bhyve/sys/boot/zfs/zfsimpl.c
  projects/bhyve/sys/cam/ata/ata_da.c
  projects/bhyve/sys/cam/cam_xpt.c
  projects/bhyve/sys/cam/scsi/scsi_all.h
  projects/bhyve/sys/cam/scsi/scsi_cd.c
  projects/bhyve/sys/cam/scsi/scsi_da.c
  projects/bhyve/sys/cam/scsi/scsi_sa.c
  projects/bhyve/sys/cam/scsi/scsi_ses.c
  projects/bhyve/sys/cam/scsi/scsi_target.c
  projects/bhyve/sys/cam/scsi/scsi_xpt.c
  projects/bhyve/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c
  projects/bhyve/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
  projects/bhyve/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h
  projects/bhyve/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deadlist.c
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
  projects/bhyve/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h
  projects/bhyve/sys/compat/linprocfs/linprocfs.c
  projects/bhyve/sys/compat/linux/linux_file.c
  projects/bhyve/sys/compat/linux/linux_ioctl.c
  projects/bhyve/sys/compat/ndis/subr_ntoskrnl.c
  projects/bhyve/sys/conf/NOTES
  projects/bhyve/sys/conf/files
  projects/bhyve/sys/conf/files.amd64
  projects/bhyve/sys/conf/files.i386
  projects/bhyve/sys/conf/files.sparc64
  projects/bhyve/sys/conf/kern.mk
  projects/bhyve/sys/conf/kern.post.mk
  projects/bhyve/sys/conf/kern.pre.mk
  projects/bhyve/sys/conf/kmod.mk
  projects/bhyve/sys/conf/makeLINT.mk
  projects/bhyve/sys/conf/newvers.sh
  projects/bhyve/sys/conf/options
  projects/bhyve/sys/contrib/dev/acpica/acpica_prep.sh
  projects/bhyve/sys/contrib/dev/acpica/changes.txt
  projects/bhyve/sys/contrib/dev/acpica/common/adisasm.c
  projects/bhyve/sys/contrib/dev/acpica/common/adwalk.c
  projects/bhyve/sys/contrib/dev/acpica/common/dmrestag.c
  projects/bhyve/sys/contrib/dev/acpica/common/dmtable.c
  projects/bhyve/sys/contrib/dev/acpica/common/dmtbdump.c
  projects/bhyve/sys/contrib/dev/acpica/common/dmtbinfo.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslanalyze.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslcodegen.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslcompile.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslcompiler.h
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslcompiler.l
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslcompiler.y
  projects/bhyve/sys/contrib/dev/acpica/compiler/asldefine.h
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslerror.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslfiles.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslglobal.h
  projects/bhyve/sys/contrib/dev/acpica/compiler/asllisting.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslload.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/asllookup.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslmain.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslmap.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslmessages.h
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslopcodes.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/asloperands.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslpredef.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslresource.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslrestype1.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslrestype1i.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslrestype2.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslrestype2d.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslrestype2e.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslrestype2q.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslrestype2w.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslstubs.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/asltransform.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/asltree.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/asltypes.h
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslutils.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/aslwalks.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/dtcompile.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/dtcompiler.h
  projects/bhyve/sys/contrib/dev/acpica/compiler/dtfield.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/dtsubtable.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/dttable.c
  projects/bhyve/sys/contrib/dev/acpica/compiler/dttemplate.h
  projects/bhyve/sys/contrib/dev/acpica/compiler/dtutils.c
  projects/bhyve/sys/contrib/dev/acpica/debugger/dbcmds.c
  projects/bhyve/sys/contrib/dev/acpica/debugger/dbdisply.c
  projects/bhyve/sys/contrib/dev/acpica/debugger/dbfileio.c
  projects/bhyve/sys/contrib/dev/acpica/debugger/dbinput.c
  projects/bhyve/sys/contrib/dev/acpica/debugger/dbutils.c
  projects/bhyve/sys/contrib/dev/acpica/disassembler/dmbuffer.c
  projects/bhyve/sys/contrib/dev/acpica/disassembler/dmopcode.c
  projects/bhyve/sys/contrib/dev/acpica/disassembler/dmresrc.c
  projects/bhyve/sys/contrib/dev/acpica/disassembler/dmresrcl.c
  projects/bhyve/sys/contrib/dev/acpica/disassembler/dmresrcs.c
  projects/bhyve/sys/contrib/dev/acpica/disassembler/dmutils.c
  projects/bhyve/sys/contrib/dev/acpica/disassembler/dmwalk.c
  projects/bhyve/sys/contrib/dev/acpica/dispatcher/dsargs.c
  projects/bhyve/sys/contrib/dev/acpica/dispatcher/dsfield.c
  projects/bhyve/sys/contrib/dev/acpica/events/evevent.c
  projects/bhyve/sys/contrib/dev/acpica/events/evglock.c
  projects/bhyve/sys/contrib/dev/acpica/events/evregion.c
  projects/bhyve/sys/contrib/dev/acpica/executer/exconfig.c
  projects/bhyve/sys/contrib/dev/acpica/executer/excreate.c
  projects/bhyve/sys/contrib/dev/acpica/executer/exdump.c
  projects/bhyve/sys/contrib/dev/acpica/executer/exfield.c
  projects/bhyve/sys/contrib/dev/acpica/executer/exfldio.c
  projects/bhyve/sys/contrib/dev/acpica/executer/exprep.c
  projects/bhyve/sys/contrib/dev/acpica/executer/exutils.c
  projects/bhyve/sys/contrib/dev/acpica/hardware/hwvalid.c
  projects/bhyve/sys/contrib/dev/acpica/include/acapps.h
  projects/bhyve/sys/contrib/dev/acpica/include/acconfig.h
  projects/bhyve/sys/contrib/dev/acpica/include/acdebug.h
  projects/bhyve/sys/contrib/dev/acpica/include/acdisasm.h
  projects/bhyve/sys/contrib/dev/acpica/include/acevents.h
  projects/bhyve/sys/contrib/dev/acpica/include/acglobal.h
  projects/bhyve/sys/contrib/dev/acpica/include/acinterp.h
  projects/bhyve/sys/contrib/dev/acpica/include/aclocal.h
  projects/bhyve/sys/contrib/dev/acpica/include/acnames.h
  projects/bhyve/sys/contrib/dev/acpica/include/acobject.h
  projects/bhyve/sys/contrib/dev/acpica/include/acopcode.h
  projects/bhyve/sys/contrib/dev/acpica/include/acpixf.h
  projects/bhyve/sys/contrib/dev/acpica/include/acpredef.h
  projects/bhyve/sys/contrib/dev/acpica/include/acresrc.h
  projects/bhyve/sys/contrib/dev/acpica/include/acrestyp.h
  projects/bhyve/sys/contrib/dev/acpica/include/actbl.h
  projects/bhyve/sys/contrib/dev/acpica/include/actbl1.h
  projects/bhyve/sys/contrib/dev/acpica/include/actypes.h
  projects/bhyve/sys/contrib/dev/acpica/include/acutils.h
  projects/bhyve/sys/contrib/dev/acpica/include/amlcode.h
  projects/bhyve/sys/contrib/dev/acpica/include/amlresrc.h
  projects/bhyve/sys/contrib/dev/acpica/include/platform/acenv.h
  projects/bhyve/sys/contrib/dev/acpica/namespace/nspredef.c
  projects/bhyve/sys/contrib/dev/acpica/namespace/nsrepair.c
  projects/bhyve/sys/contrib/dev/acpica/namespace/nsrepair2.c
  projects/bhyve/sys/contrib/dev/acpica/parser/psargs.c
  projects/bhyve/sys/contrib/dev/acpica/parser/psopcode.c
  projects/bhyve/sys/contrib/dev/acpica/parser/pstree.c
  projects/bhyve/sys/contrib/dev/acpica/resources/rscalc.c
  projects/bhyve/sys/contrib/dev/acpica/resources/rscreate.c
  projects/bhyve/sys/contrib/dev/acpica/resources/rsdump.c
  projects/bhyve/sys/contrib/dev/acpica/resources/rsinfo.c
  projects/bhyve/sys/contrib/dev/acpica/resources/rsirq.c
  projects/bhyve/sys/contrib/dev/acpica/resources/rslist.c
  projects/bhyve/sys/contrib/dev/acpica/resources/rsmisc.c
  projects/bhyve/sys/contrib/dev/acpica/resources/rsutils.c
  projects/bhyve/sys/contrib/dev/acpica/resources/rsxface.c
  projects/bhyve/sys/contrib/dev/acpica/tables/tbfadt.c
  projects/bhyve/sys/contrib/dev/acpica/tables/tbutils.c
  projects/bhyve/sys/contrib/dev/acpica/utilities/utdecode.c
  projects/bhyve/sys/contrib/dev/acpica/utilities/utmutex.c
  projects/bhyve/sys/contrib/dev/acpica/utilities/utresrc.c
  projects/bhyve/sys/contrib/ipfilter/netinet/ip_compat.h
  projects/bhyve/sys/contrib/ipfilter/netinet/ip_proxy.c
  projects/bhyve/sys/contrib/ngatm/netnatm/msg/uni_ie.c
  projects/bhyve/sys/contrib/octeon-sdk/cvmx-helper-board.c
  projects/bhyve/sys/contrib/octeon-sdk/cvmx-usb.c
  projects/bhyve/sys/contrib/pf/net/if_pfsync.c
  projects/bhyve/sys/contrib/pf/net/pf.c
  projects/bhyve/sys/ddb/db_command.c
  projects/bhyve/sys/ddb/db_input.c
  projects/bhyve/sys/ddb/db_ps.c
  projects/bhyve/sys/ddb/db_thread.c
  projects/bhyve/sys/ddb/ddb.h
  projects/bhyve/sys/dev/aac/aac_pci.c
  projects/bhyve/sys/dev/acpi_support/acpi_wmi.c
  projects/bhyve/sys/dev/acpica/acpi_battery.c
  projects/bhyve/sys/dev/acpica/acpi_cpu.c
  projects/bhyve/sys/dev/acpica/acpi_isab.c
  projects/bhyve/sys/dev/acpica/acpi_pcib_acpi.c
  projects/bhyve/sys/dev/ahci/ahci.c
  projects/bhyve/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l
  projects/bhyve/sys/dev/aic7xxx/aicasm/aicasm_scan.l
  projects/bhyve/sys/dev/amr/amr_pci.c
  projects/bhyve/sys/dev/an/if_an.c
  projects/bhyve/sys/dev/arcmsr/arcmsr.c
  projects/bhyve/sys/dev/ata/ata-disk.c
  projects/bhyve/sys/dev/ata/ata-pci.c
  projects/bhyve/sys/dev/ata/ata-pci.h
  projects/bhyve/sys/dev/ata/chipsets/ata-ati.c
  projects/bhyve/sys/dev/ata/chipsets/ata-intel.c
  projects/bhyve/sys/dev/ata/chipsets/ata-nvidia.c
  projects/bhyve/sys/dev/ath/ath_hal/ar5210/ar5210reg.h
  projects/bhyve/sys/dev/ath/ath_hal/ar5211/ar5211reg.h
  projects/bhyve/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
  projects/bhyve/sys/dev/ath/ath_hal/ar5416/ar2133.c
  projects/bhyve/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
  projects/bhyve/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c
  projects/bhyve/sys/dev/ath/ath_hal/ar5416/ar5416_misc.c
  projects/bhyve/sys/dev/ath/ath_hal/ar5416/ar5416reg.h
  projects/bhyve/sys/dev/ath/ath_hal/ar9002/ar9280.c
  projects/bhyve/sys/dev/ath/ath_hal/ar9002/ar9285.c
  projects/bhyve/sys/dev/ath/ath_hal/ar9002/ar9287.c
  projects/bhyve/sys/dev/ath/ath_hal/ar9002/ar9287.h
  projects/bhyve/sys/dev/ath/if_ath.c
  projects/bhyve/sys/dev/ath/if_ath_sysctl.c
  projects/bhyve/sys/dev/ath/if_ath_tx.c
  projects/bhyve/sys/dev/ath/if_athioctl.h
  projects/bhyve/sys/dev/ath/if_athvar.h
  projects/bhyve/sys/dev/bce/if_bce.c
  projects/bhyve/sys/dev/bce/if_bcereg.h
  projects/bhyve/sys/dev/bfe/if_bfe.c
  projects/bhyve/sys/dev/bge/if_bge.c
  projects/bhyve/sys/dev/bge/if_bgereg.h
  projects/bhyve/sys/dev/bm/if_bm.c
  projects/bhyve/sys/dev/bwi/if_bwi.c
  projects/bhyve/sys/dev/bwn/if_bwn.c
  projects/bhyve/sys/dev/bwn/if_bwnvar.h
  projects/bhyve/sys/dev/bxe/bxe_reg.h
  projects/bhyve/sys/dev/bxe/if_bxe.c
  projects/bhyve/sys/dev/cas/if_cas.c
  projects/bhyve/sys/dev/ce/if_ce.c
  projects/bhyve/sys/dev/cesa/cesa.c
  projects/bhyve/sys/dev/cfe/cfe_console.c
  projects/bhyve/sys/dev/cm/smc90cx6.c
  projects/bhyve/sys/dev/cp/if_cp.c
  projects/bhyve/sys/dev/cpuctl/cpuctl.c
  projects/bhyve/sys/dev/cxgb/common/cxgb_aq100x.c
  projects/bhyve/sys/dev/cxgb/cxgb_main.c
  projects/bhyve/sys/dev/cxgbe/adapter.h
  projects/bhyve/sys/dev/cxgbe/common/common.h
  projects/bhyve/sys/dev/cxgbe/common/t4_hw.c
  projects/bhyve/sys/dev/cxgbe/common/t4_hw.h
  projects/bhyve/sys/dev/cxgbe/offload.h
  projects/bhyve/sys/dev/cxgbe/osdep.h
  projects/bhyve/sys/dev/cxgbe/t4_ioctl.h
  projects/bhyve/sys/dev/cxgbe/t4_l2t.c
  projects/bhyve/sys/dev/cxgbe/t4_l2t.h
  projects/bhyve/sys/dev/cxgbe/t4_main.c
  projects/bhyve/sys/dev/cxgbe/t4_sge.c
  projects/bhyve/sys/dev/dc/dcphy.c
  projects/bhyve/sys/dev/dc/if_dc.c
  projects/bhyve/sys/dev/dc/pnphy.c
  projects/bhyve/sys/dev/dcons/dcons_os.c
  projects/bhyve/sys/dev/de/if_de.c
  projects/bhyve/sys/dev/drm/i915_drv.h
  projects/bhyve/sys/dev/drm/mga_drv.h
  projects/bhyve/sys/dev/drm/radeon_state.c
  projects/bhyve/sys/dev/e1000/e1000_80003es2lan.c
  projects/bhyve/sys/dev/e1000/e1000_80003es2lan.h
  projects/bhyve/sys/dev/e1000/e1000_82540.c
  projects/bhyve/sys/dev/e1000/e1000_82541.c
  projects/bhyve/sys/dev/e1000/e1000_82543.c
  projects/bhyve/sys/dev/e1000/e1000_82571.c
  projects/bhyve/sys/dev/e1000/e1000_82575.c
  projects/bhyve/sys/dev/e1000/e1000_82575.h
  projects/bhyve/sys/dev/e1000/e1000_api.c
  projects/bhyve/sys/dev/e1000/e1000_api.h
  projects/bhyve/sys/dev/e1000/e1000_defines.h
  projects/bhyve/sys/dev/e1000/e1000_hw.h
  projects/bhyve/sys/dev/e1000/e1000_ich8lan.c
  projects/bhyve/sys/dev/e1000/e1000_ich8lan.h
  projects/bhyve/sys/dev/e1000/e1000_mac.c
  projects/bhyve/sys/dev/e1000/e1000_nvm.c
  projects/bhyve/sys/dev/e1000/e1000_nvm.h
  projects/bhyve/sys/dev/e1000/e1000_osdep.h
  projects/bhyve/sys/dev/e1000/e1000_phy.c
  projects/bhyve/sys/dev/e1000/e1000_phy.h
  projects/bhyve/sys/dev/e1000/e1000_regs.h
  projects/bhyve/sys/dev/e1000/e1000_vf.c
  projects/bhyve/sys/dev/e1000/if_em.c
  projects/bhyve/sys/dev/e1000/if_em.h
  projects/bhyve/sys/dev/e1000/if_igb.c
  projects/bhyve/sys/dev/e1000/if_igb.h
  projects/bhyve/sys/dev/e1000/if_lem.c
  projects/bhyve/sys/dev/e1000/if_lem.h
  projects/bhyve/sys/dev/ed/if_ed.c
  projects/bhyve/sys/dev/eisa/eisaconf.c
  projects/bhyve/sys/dev/esp/esp_pci.c
  projects/bhyve/sys/dev/esp/esp_sbus.c
  projects/bhyve/sys/dev/esp/ncr53c9x.c
  projects/bhyve/sys/dev/et/if_et.c
  projects/bhyve/sys/dev/et/if_etreg.h
  projects/bhyve/sys/dev/et/if_etvar.h
  projects/bhyve/sys/dev/fb/fb.c
  projects/bhyve/sys/dev/fdc/fdc.c
  projects/bhyve/sys/dev/fdt/fdt_common.c
  projects/bhyve/sys/dev/fdt/fdt_pci.c
  projects/bhyve/sys/dev/fdt/fdt_powerpc.c
  projects/bhyve/sys/dev/fdt/fdtbus.c
  projects/bhyve/sys/dev/fdt/simplebus.c
  projects/bhyve/sys/dev/firewire/firewire.c
  projects/bhyve/sys/dev/firewire/fwohci_pci.c
  projects/bhyve/sys/dev/fxp/if_fxp.c
  projects/bhyve/sys/dev/gem/if_gem_pci.c
  projects/bhyve/sys/dev/gem/if_gem_sbus.c
  projects/bhyve/sys/dev/gpio/gpiobus.c
  projects/bhyve/sys/dev/gpio/gpioiic.c
  projects/bhyve/sys/dev/hifn/hifn7751.c
  projects/bhyve/sys/dev/hme/if_hme_pci.c
  projects/bhyve/sys/dev/hme/if_hme_sbus.c
  projects/bhyve/sys/dev/hptiop/hptiop.c
  projects/bhyve/sys/dev/hptmv/entry.c
  projects/bhyve/sys/dev/hptrr/hptrr_osm_bsd.c
  projects/bhyve/sys/dev/hwpmc/hwpmc_amd.c
  projects/bhyve/sys/dev/hwpmc/hwpmc_core.c
  projects/bhyve/sys/dev/hwpmc/hwpmc_powerpc.c
  projects/bhyve/sys/dev/hwpmc/pmc_events.h
  projects/bhyve/sys/dev/ichsmb/ichsmb_pci.c
  projects/bhyve/sys/dev/ida/ida_pci.c
  projects/bhyve/sys/dev/if_ndis/if_ndis.c
  projects/bhyve/sys/dev/if_ndis/if_ndis_pccard.c
  projects/bhyve/sys/dev/if_ndis/if_ndis_usb.c
  projects/bhyve/sys/dev/iicbus/iicbb.c
  projects/bhyve/sys/dev/iicbus/iicbus.c
  projects/bhyve/sys/dev/iicbus/iicbus.h
  projects/bhyve/sys/dev/iicbus/iiconf.c
  projects/bhyve/sys/dev/iicbus/iicsmb.c
  projects/bhyve/sys/dev/ipw/if_ipw.c
  projects/bhyve/sys/dev/isp/isp_freebsd.c
  projects/bhyve/sys/dev/isp/isp_freebsd.h
  projects/bhyve/sys/dev/iwi/if_iwi.c
  projects/bhyve/sys/dev/iwn/if_iwn.c
  projects/bhyve/sys/dev/iwn/if_iwnreg.h
  projects/bhyve/sys/dev/ixgbe/ixgbe.c
  projects/bhyve/sys/dev/ixgbe/ixgbe_osdep.h
  projects/bhyve/sys/dev/ixgbe/ixv.c
  projects/bhyve/sys/dev/lge/if_lge.c
  projects/bhyve/sys/dev/malo/if_malo.c
  projects/bhyve/sys/dev/mca/mca_bus.c
  projects/bhyve/sys/dev/md/md.c
  projects/bhyve/sys/dev/mfi/mfi_pci.c
  projects/bhyve/sys/dev/mii/acphy.c
  projects/bhyve/sys/dev/mii/amphy.c
  projects/bhyve/sys/dev/mii/atphy.c
  projects/bhyve/sys/dev/mii/axphy.c
  projects/bhyve/sys/dev/mii/bmtphy.c
  projects/bhyve/sys/dev/mii/brgphy.c
  projects/bhyve/sys/dev/mii/ciphy.c
  projects/bhyve/sys/dev/mii/e1000phy.c
  projects/bhyve/sys/dev/mii/gentbi.c
  projects/bhyve/sys/dev/mii/icsphy.c
  projects/bhyve/sys/dev/mii/ip1000phy.c
  projects/bhyve/sys/dev/mii/jmphy.c
  projects/bhyve/sys/dev/mii/lxtphy.c
  projects/bhyve/sys/dev/mii/mii.c
  projects/bhyve/sys/dev/mii/miidevs
  projects/bhyve/sys/dev/mii/mlphy.c
  projects/bhyve/sys/dev/mii/nsgphy.c
  projects/bhyve/sys/dev/mii/nsphy.c
  projects/bhyve/sys/dev/mii/nsphyter.c
  projects/bhyve/sys/dev/mii/pnaphy.c
  projects/bhyve/sys/dev/mii/qsphy.c
  projects/bhyve/sys/dev/mii/rdcphy.c
  projects/bhyve/sys/dev/mii/rgephy.c
  projects/bhyve/sys/dev/mii/rlphy.c
  projects/bhyve/sys/dev/mii/rlswitch.c
  projects/bhyve/sys/dev/mii/smcphy.c
  projects/bhyve/sys/dev/mii/tdkphy.c
  projects/bhyve/sys/dev/mii/tlphy.c
  projects/bhyve/sys/dev/mii/truephy.c
  projects/bhyve/sys/dev/mii/ukphy.c
  projects/bhyve/sys/dev/mii/xmphy.c
  projects/bhyve/sys/dev/mlx/mlx_pci.c
  projects/bhyve/sys/dev/mps/mps_pci.c
  projects/bhyve/sys/dev/mps/mps_sas.c
  projects/bhyve/sys/dev/msk/if_msk.c
  projects/bhyve/sys/dev/mvs/mvs_pci.c
  projects/bhyve/sys/dev/mvs/mvs_soc.c
  projects/bhyve/sys/dev/mwl/if_mwl.c
  projects/bhyve/sys/dev/mxge/if_mxge.c
  projects/bhyve/sys/dev/netmap/if_em_netmap.h
  projects/bhyve/sys/dev/netmap/if_igb_netmap.h
  projects/bhyve/sys/dev/netmap/if_lem_netmap.h
  projects/bhyve/sys/dev/netmap/if_re_netmap.h
  projects/bhyve/sys/dev/netmap/ixgbe_netmap.h
  projects/bhyve/sys/dev/netmap/netmap.c
  projects/bhyve/sys/dev/netmap/netmap_kern.h
  projects/bhyve/sys/dev/nfe/if_nfe.c
  projects/bhyve/sys/dev/nge/if_nge.c
  projects/bhyve/sys/dev/nve/if_nve.c
  projects/bhyve/sys/dev/ofw/ofw_console.c
  projects/bhyve/sys/dev/ofw/ofw_fdt.c
  projects/bhyve/sys/dev/ofw/ofw_iicbus.c
  projects/bhyve/sys/dev/ofw/openfirm.c
  projects/bhyve/sys/dev/pccard/pccardvar.h
  projects/bhyve/sys/dev/pccbb/pccbb_isa.c
  projects/bhyve/sys/dev/pccbb/pccbb_pci.c
  projects/bhyve/sys/dev/pci/eisa_pci.c
  projects/bhyve/sys/dev/pci/isa_pci.c
  projects/bhyve/sys/dev/pci/pci_pci.c
  projects/bhyve/sys/dev/pci/pcireg.h
  projects/bhyve/sys/dev/pcn/if_pcn.c
  projects/bhyve/sys/dev/ppbus/lpbb.c
  projects/bhyve/sys/dev/ppbus/lpt.c
  projects/bhyve/sys/dev/ppbus/ppb_base.c
  projects/bhyve/sys/dev/ppbus/ppb_msq.c
  projects/bhyve/sys/dev/ppbus/ppbconf.c
  projects/bhyve/sys/dev/ppbus/vpo.c
  projects/bhyve/sys/dev/ppc/ppc.c
  projects/bhyve/sys/dev/puc/puc_pccard.c
  projects/bhyve/sys/dev/puc/puc_pci.c
  projects/bhyve/sys/dev/qlxgb/qla_misc.c
  projects/bhyve/sys/dev/quicc/quicc_bfe_fdt.c
  projects/bhyve/sys/dev/ral/rt2560.c
  projects/bhyve/sys/dev/ral/rt2661.c
  projects/bhyve/sys/dev/re/if_re.c
  projects/bhyve/sys/dev/rt/if_rt.c
  projects/bhyve/sys/dev/safe/safe.c
  projects/bhyve/sys/dev/scc/scc_bfe_ebus.c
  projects/bhyve/sys/dev/scc/scc_bfe_macio.c
  projects/bhyve/sys/dev/scc/scc_bfe_quicc.c
  projects/bhyve/sys/dev/scc/scc_bfe_sbus.c
  projects/bhyve/sys/dev/sec/sec.c
  projects/bhyve/sys/dev/sf/if_sf.c
  projects/bhyve/sys/dev/sfxge/common/efsys.h
  projects/bhyve/sys/dev/sfxge/common/efx.h   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/efx_bootcfg.c   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/efx_ev.c   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/efx_filter.c   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/efx_impl.h   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/efx_intr.c   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/efx_mac.c   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/efx_mcdi.c   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/efx_mcdi.h   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/efx_mon.c   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/efx_nic.c   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/efx_nvram.c   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/efx_phy.c   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/efx_port.c   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/efx_regs.h   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/efx_regs_ef10.h   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/efx_regs_mcdi.h   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/efx_regs_pci.h   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/efx_rx.c   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/efx_sram.c   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/efx_tx.c   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/efx_types.h   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/efx_vpd.c   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/efx_wol.c   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/siena_flash.h   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/siena_impl.h   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/siena_mac.c   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/siena_mon.c   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/siena_nic.c   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/siena_nvram.c   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/siena_phy.c   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/siena_sram.c   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/common/siena_vpd.c   (contents, props changed)
  projects/bhyve/sys/dev/sfxge/sfxge.c
  projects/bhyve/sys/dev/sge/if_sge.c
  projects/bhyve/sys/dev/siba/siba.c
  projects/bhyve/sys/dev/siba/siba_bwn.c
  projects/bhyve/sys/dev/siba/siba_cc.c
  projects/bhyve/sys/dev/siba/siba_core.c
  projects/bhyve/sys/dev/siba/siba_pcib.c
  projects/bhyve/sys/dev/siis/siis.c
  projects/bhyve/sys/dev/sio/sio.c
  projects/bhyve/sys/dev/sis/if_sis.c
  projects/bhyve/sys/dev/sk/if_sk.c
  projects/bhyve/sys/dev/smbus/smbus.c
  projects/bhyve/sys/dev/sound/isa/gusc.c
  projects/bhyve/sys/dev/sound/isa/sbc.c
  projects/bhyve/sys/dev/sound/pci/csa.c
  projects/bhyve/sys/dev/sound/pci/emu10k1.c
  projects/bhyve/sys/dev/sound/pci/fm801.c
  projects/bhyve/sys/dev/sound/pci/hda/hdac.c
  projects/bhyve/sys/dev/sound/usb/uaudio.c
  projects/bhyve/sys/dev/sound/usb/uaudio.h
  projects/bhyve/sys/dev/speaker/spkr.c
  projects/bhyve/sys/dev/spibus/spibus.c
  projects/bhyve/sys/dev/spibus/spibusvar.h
  projects/bhyve/sys/dev/ste/if_ste.c
  projects/bhyve/sys/dev/stge/if_stge.c
  projects/bhyve/sys/dev/syscons/syscons.c
  projects/bhyve/sys/dev/syscons/syscons.h
  projects/bhyve/sys/dev/ti/if_ti.c
  projects/bhyve/sys/dev/tl/if_tl.c
  projects/bhyve/sys/dev/tsec/if_tsec_fdt.c
  projects/bhyve/sys/dev/twa/tw_osl.h
  projects/bhyve/sys/dev/twa/tw_osl_freebsd.c
  projects/bhyve/sys/dev/twe/twe_freebsd.c
  projects/bhyve/sys/dev/tws/tws.c
  projects/bhyve/sys/dev/tws/tws.h
  projects/bhyve/sys/dev/uart/uart_bus_fdt.c
  projects/bhyve/sys/dev/uart/uart_bus_pci.c
  projects/bhyve/sys/dev/uart/uart_cpu_sparc64.c
  projects/bhyve/sys/dev/uart/uart_subr.c
  projects/bhyve/sys/dev/uart/uart_tty.c
  projects/bhyve/sys/dev/ubsec/ubsec.c
  projects/bhyve/sys/dev/usb/controller/at91dci.c
  projects/bhyve/sys/dev/usb/controller/at91dci.h
  projects/bhyve/sys/dev/usb/controller/at91dci_atmelarm.c
  projects/bhyve/sys/dev/usb/controller/atmegadci.c
  projects/bhyve/sys/dev/usb/controller/atmegadci.h
  projects/bhyve/sys/dev/usb/controller/atmegadci_atmelarm.c
  projects/bhyve/sys/dev/usb/controller/avr32dci.c
  projects/bhyve/sys/dev/usb/controller/avr32dci.h
  projects/bhyve/sys/dev/usb/controller/ehci.c
  projects/bhyve/sys/dev/usb/controller/ehci.h
  projects/bhyve/sys/dev/usb/controller/ehci_ixp4xx.c
  projects/bhyve/sys/dev/usb/controller/ehci_mv.c
  projects/bhyve/sys/dev/usb/controller/ehci_pci.c
  projects/bhyve/sys/dev/usb/controller/musb_otg.c
  projects/bhyve/sys/dev/usb/controller/musb_otg.h
  projects/bhyve/sys/dev/usb/controller/musb_otg_atmelarm.c
  projects/bhyve/sys/dev/usb/controller/ohci.c
  projects/bhyve/sys/dev/usb/controller/ohci.h
  projects/bhyve/sys/dev/usb/controller/ohci_atmelarm.c
  projects/bhyve/sys/dev/usb/controller/ohci_pci.c
  projects/bhyve/sys/dev/usb/controller/ohci_s3c24x0.c
  projects/bhyve/sys/dev/usb/controller/uhci.c
  projects/bhyve/sys/dev/usb/controller/uhci.h
  projects/bhyve/sys/dev/usb/controller/uhci_pci.c
  projects/bhyve/sys/dev/usb/controller/usb_controller.c
  projects/bhyve/sys/dev/usb/controller/uss820dci.c
  projects/bhyve/sys/dev/usb/controller/uss820dci.h
  projects/bhyve/sys/dev/usb/controller/uss820dci_atmelarm.c
  projects/bhyve/sys/dev/usb/controller/xhci.c
  projects/bhyve/sys/dev/usb/controller/xhci.h
  projects/bhyve/sys/dev/usb/controller/xhci_pci.c
  projects/bhyve/sys/dev/usb/controller/xhcireg.h
  projects/bhyve/sys/dev/usb/input/ukbd.c
  projects/bhyve/sys/dev/usb/net/if_aue.c
  projects/bhyve/sys/dev/usb/net/if_axe.c
  projects/bhyve/sys/dev/usb/net/if_mos.c
  projects/bhyve/sys/dev/usb/net/if_rue.c
  projects/bhyve/sys/dev/usb/net/if_udav.c
  projects/bhyve/sys/dev/usb/net/ruephy.c
  projects/bhyve/sys/dev/usb/quirk/usb_quirk.c
  projects/bhyve/sys/dev/usb/serial/usb_serial.c
  projects/bhyve/sys/dev/usb/template/usb_template.c
  projects/bhyve/sys/dev/usb/template/usb_template_kbd.c
  projects/bhyve/sys/dev/usb/template/usb_template_modem.c
  projects/bhyve/sys/dev/usb/template/usb_template_mouse.c
  projects/bhyve/sys/dev/usb/usb_bus.h
  projects/bhyve/sys/dev/usb/usb_controller.h
  projects/bhyve/sys/dev/usb/usb_hub.c
  projects/bhyve/sys/dev/usb/usb_if.m
  projects/bhyve/sys/dev/usb/usb_msctest.c
  projects/bhyve/sys/dev/usb/usb_transfer.c
  projects/bhyve/sys/dev/usb/usb_transfer.h
  projects/bhyve/sys/dev/usb/usbdevs
  projects/bhyve/sys/dev/usb/wlan/if_rum.c
  projects/bhyve/sys/dev/usb/wlan/if_run.c
  projects/bhyve/sys/dev/usb/wlan/if_uath.c
  projects/bhyve/sys/dev/usb/wlan/if_upgt.c
  projects/bhyve/sys/dev/usb/wlan/if_ural.c
  projects/bhyve/sys/dev/usb/wlan/if_urtw.c
  projects/bhyve/sys/dev/usb/wlan/if_zyd.c
  projects/bhyve/sys/dev/vge/if_vge.c
  projects/bhyve/sys/dev/virtio/balloon/virtio_balloon.c
  projects/bhyve/sys/dev/virtio/balloon/virtio_balloon.h
  projects/bhyve/sys/dev/virtio/block/virtio_blk.c
  projects/bhyve/sys/dev/virtio/block/virtio_blk.h
  projects/bhyve/sys/dev/virtio/network/if_vtnet.c
  projects/bhyve/sys/dev/virtio/network/if_vtnetvar.h
  projects/bhyve/sys/dev/virtio/network/virtio_net.h
  projects/bhyve/sys/dev/virtio/pci/virtio_pci.h
  projects/bhyve/sys/dev/virtio/virtio.h
  projects/bhyve/sys/dev/virtio/virtio_ring.h
  projects/bhyve/sys/dev/vr/if_vr.c
  projects/bhyve/sys/dev/vr/if_vrreg.h
  projects/bhyve/sys/dev/vte/if_vte.c
  projects/bhyve/sys/dev/vxge/vxge-osdep.h
  projects/bhyve/sys/dev/wb/if_wb.c
  projects/bhyve/sys/dev/wi/if_wi.c
  projects/bhyve/sys/dev/wpi/if_wpi.c
  projects/bhyve/sys/dev/xen/console/console.c
  projects/bhyve/sys/dev/xen/netback/netback.c
  projects/bhyve/sys/dev/xen/pcifront/pcifront.c
  projects/bhyve/sys/dev/xl/if_xl.c
  projects/bhyve/sys/dev/xl/xlphy.c
  projects/bhyve/sys/fs/devfs/devfs_vnops.c
  projects/bhyve/sys/fs/ext2fs/ext2_alloc.c
  projects/bhyve/sys/fs/ext2fs/ext2_balloc.c
  projects/bhyve/sys/fs/ext2fs/ext2_bmap.c
  projects/bhyve/sys/fs/ext2fs/ext2_extern.h
  projects/bhyve/sys/fs/ext2fs/ext2_inode.c
  projects/bhyve/sys/fs/ext2fs/ext2_lookup.c
  projects/bhyve/sys/fs/ext2fs/ext2_subr.c
  projects/bhyve/sys/fs/ext2fs/ext2_vfsops.c
  projects/bhyve/sys/fs/ext2fs/ext2_vnops.c
  projects/bhyve/sys/fs/ext2fs/ext2fs.h
  projects/bhyve/sys/fs/ext2fs/fs.h
  projects/bhyve/sys/fs/fifofs/fifo_vnops.c
  projects/bhyve/sys/fs/msdosfs/msdosfs_conv.c
  projects/bhyve/sys/fs/msdosfs/msdosfs_denode.c
  projects/bhyve/sys/fs/msdosfs/msdosfs_fat.c
  projects/bhyve/sys/fs/msdosfs/msdosfs_lookup.c
  projects/bhyve/sys/fs/msdosfs/msdosfs_vfsops.c
  projects/bhyve/sys/fs/nfs/nfs_commonkrpc.c
  projects/bhyve/sys/fs/nfs/nfsclstate.h
  projects/bhyve/sys/fs/nfs/nfsport.h
  projects/bhyve/sys/fs/nfsclient/nfs_clbio.c
  projects/bhyve/sys/fs/nfsclient/nfs_clrpcops.c
  projects/bhyve/sys/fs/nfsclient/nfs_clstate.c
  projects/bhyve/sys/fs/nfsserver/nfs_nfsdport.c
  projects/bhyve/sys/fs/nfsserver/nfs_nfsdsubs.c
  projects/bhyve/sys/fs/ntfs/ntfs_compr.c
  projects/bhyve/sys/fs/ntfs/ntfs_subr.c
  projects/bhyve/sys/fs/ntfs/ntfs_subr.h
  projects/bhyve/sys/fs/ntfs/ntfs_vnops.c
  projects/bhyve/sys/fs/nullfs/null_subr.c
  projects/bhyve/sys/fs/nullfs/null_vfsops.c
  projects/bhyve/sys/fs/nullfs/null_vnops.c
  projects/bhyve/sys/fs/nwfs/nwfs_io.c
  projects/bhyve/sys/fs/nwfs/nwfs_vfsops.c
  projects/bhyve/sys/fs/procfs/procfs_status.c
  projects/bhyve/sys/fs/smbfs/smbfs_io.c
  projects/bhyve/sys/fs/smbfs/smbfs_vfsops.c
  projects/bhyve/sys/fs/smbfs/smbfs_vnops.c
  projects/bhyve/sys/fs/tmpfs/tmpfs_vnops.c
  projects/bhyve/sys/gdb/gdb_cons.c
  projects/bhyve/sys/geom/eli/g_eli.c
  projects/bhyve/sys/geom/geom_vfs.c
  projects/bhyve/sys/geom/part/g_part_apm.c
  projects/bhyve/sys/gnu/fs/xfs/xfs_vfsops.c
  projects/bhyve/sys/i386/conf/GENERIC
  projects/bhyve/sys/i386/conf/NOTES
  projects/bhyve/sys/i386/conf/PAE
  projects/bhyve/sys/i386/i386/legacy.c
  projects/bhyve/sys/i386/i386/locore.s
  projects/bhyve/sys/i386/i386/machdep.c
  projects/bhyve/sys/i386/i386/mp_machdep.c
  projects/bhyve/sys/i386/i386/pmap.c
  projects/bhyve/sys/i386/i386/sys_machdep.c
  projects/bhyve/sys/i386/ibcs2/ibcs2_socksys.c
  projects/bhyve/sys/i386/ibcs2/ibcs2_stat.c
  projects/bhyve/sys/i386/include/_types.h
  projects/bhyve/sys/i386/include/asm.h
  projects/bhyve/sys/i386/include/ucontext.h
  projects/bhyve/sys/i386/include/vmparam.h
  projects/bhyve/sys/i386/linux/linux.h
  projects/bhyve/sys/i386/linux/linux_dummy.c
  projects/bhyve/sys/i386/linux/linux_proto.h
  projects/bhyve/sys/i386/linux/linux_syscall.h
  projects/bhyve/sys/i386/linux/linux_syscalls.c
  projects/bhyve/sys/i386/linux/linux_sysent.c
  projects/bhyve/sys/i386/linux/linux_systrace_args.c
  projects/bhyve/sys/i386/linux/syscalls.master
  projects/bhyve/sys/i386/xen/mp_machdep.c
  projects/bhyve/sys/i386/xen/pmap.c
  projects/bhyve/sys/ia64/conf/GENERIC
  projects/bhyve/sys/ia64/ia64/ssc.c
  projects/bhyve/sys/ia64/ia64/uma_machdep.c
  projects/bhyve/sys/ia64/include/_types.h
  projects/bhyve/sys/isa/vga_isa.c
  projects/bhyve/sys/kern/kern_conf.c
  projects/bhyve/sys/kern/kern_cons.c
  projects/bhyve/sys/kern/kern_cpuset.c
  projects/bhyve/sys/kern/kern_ffclock.c
  projects/bhyve/sys/kern/kern_intr.c
  projects/bhyve/sys/kern/kern_ktr.c
  projects/bhyve/sys/kern/kern_ktrace.c
  projects/bhyve/sys/kern/kern_linker.c
  projects/bhyve/sys/kern/kern_lock.c
  projects/bhyve/sys/kern/kern_malloc.c
  projects/bhyve/sys/kern/kern_mutex.c
  projects/bhyve/sys/kern/kern_ntptime.c
  projects/bhyve/sys/kern/kern_proc.c
  projects/bhyve/sys/kern/kern_racct.c
  projects/bhyve/sys/kern/kern_resource.c
  projects/bhyve/sys/kern/kern_rmlock.c
  projects/bhyve/sys/kern/kern_rwlock.c
  projects/bhyve/sys/kern/kern_shutdown.c
  projects/bhyve/sys/kern/kern_switch.c
  projects/bhyve/sys/kern/kern_sx.c
  projects/bhyve/sys/kern/kern_synch.c
  projects/bhyve/sys/kern/kern_tc.c
  projects/bhyve/sys/kern/kern_thr.c
  projects/bhyve/sys/kern/kern_thread.c
  projects/bhyve/sys/kern/kern_umtx.c
  projects/bhyve/sys/kern/sched_4bsd.c
  projects/bhyve/sys/kern/sched_ule.c
  projects/bhyve/sys/kern/subr_blist.c
  projects/bhyve/sys/kern/subr_bus.c
  projects/bhyve/sys/kern/subr_hints.c
  projects/bhyve/sys/kern/subr_kdb.c
  projects/bhyve/sys/kern/subr_lock.c
  projects/bhyve/sys/kern/subr_witness.c
  projects/bhyve/sys/kern/sys_pipe.c
  projects/bhyve/sys/kern/tty_inq.c
  projects/bhyve/sys/kern/uipc_mqueue.c
  projects/bhyve/sys/kern/uipc_shm.c
  projects/bhyve/sys/kern/uipc_sockbuf.c
  projects/bhyve/sys/kern/vfs_bio.c
  projects/bhyve/sys/kern/vfs_cache.c
  projects/bhyve/sys/kern/vfs_lookup.c
  projects/bhyve/sys/kern/vfs_mountroot.c
  projects/bhyve/sys/kern/vfs_subr.c
  projects/bhyve/sys/kern/vfs_syscalls.c
  projects/bhyve/sys/kern/vnode_if.src
  projects/bhyve/sys/libkern/fnmatch.c
  projects/bhyve/sys/mips/adm5120/admpci.c
  projects/bhyve/sys/mips/adm5120/console.c
  projects/bhyve/sys/mips/atheros/apb.c
  projects/bhyve/sys/mips/atheros/ar71xx_chip.c
  projects/bhyve/sys/mips/atheros/ar71xx_cpudef.h
  projects/bhyve/sys/mips/atheros/ar71xx_ehci.c
  projects/bhyve/sys/mips/atheros/ar71xx_gpio.c
  projects/bhyve/sys/mips/atheros/ar71xx_machdep.c
  projects/bhyve/sys/mips/atheros/ar71xx_ohci.c
  projects/bhyve/sys/mips/atheros/ar71xx_pci.c
  projects/bhyve/sys/mips/atheros/ar724x_chip.c
  projects/bhyve/sys/mips/atheros/ar724x_pci.c
  projects/bhyve/sys/mips/atheros/ar91xx_chip.c
  projects/bhyve/sys/mips/atheros/if_arge.c
  projects/bhyve/sys/mips/cavium/files.octeon1
  projects/bhyve/sys/mips/cavium/octeon_ds1337.c
  projects/bhyve/sys/mips/cavium/octeon_machdep.c
  projects/bhyve/sys/mips/cavium/octopci.c
  projects/bhyve/sys/mips/cavium/usb/octusb.c
  projects/bhyve/sys/mips/cavium/usb/octusb.h
  projects/bhyve/sys/mips/cavium/usb/octusb_octeon.c
  projects/bhyve/sys/mips/conf/AR91XX_BASE
  projects/bhyve/sys/mips/conf/AR91XX_BASE.hints
  projects/bhyve/sys/mips/conf/OCTEON1
  projects/bhyve/sys/mips/conf/PB92
  projects/bhyve/sys/mips/conf/TP-WN1043ND
  projects/bhyve/sys/mips/conf/TP-WN1043ND.hints
  projects/bhyve/sys/mips/conf/XLPN32
  projects/bhyve/sys/mips/idt/idtpci.c
  projects/bhyve/sys/mips/idt/if_kr.c
  projects/bhyve/sys/mips/include/_types.h
  projects/bhyve/sys/mips/include/intr_machdep.h
  projects/bhyve/sys/mips/malta/gt.c
  projects/bhyve/sys/mips/malta/gt_pci.c
  projects/bhyve/sys/mips/mips/db_trace.c
  projects/bhyve/sys/mips/mips/gdb_machdep.c
  projects/bhyve/sys/mips/nlm/hal/cpucontrol.h
  projects/bhyve/sys/mips/nlm/xlp_machdep.c
  projects/bhyve/sys/mips/nlm/xlp_pci.c
  projects/bhyve/sys/mips/rmi/dev/nlge/if_nlge.c
  projects/bhyve/sys/mips/rmi/dev/sec/rmisec.c
  projects/bhyve/sys/mips/rmi/xlr_pci.c
  projects/bhyve/sys/mips/rmi/xls_ehci.c
  projects/bhyve/sys/mips/rt305x/rt305x_dotg.c
  projects/bhyve/sys/modules/Makefile
  projects/bhyve/sys/modules/acpi/acpi/Makefile
  projects/bhyve/sys/modules/aic7xxx/ahc/ahc_pci/Makefile
  projects/bhyve/sys/modules/aic7xxx/ahd/Makefile
  projects/bhyve/sys/modules/asr/Makefile
  projects/bhyve/sys/modules/ath/Makefile
  projects/bhyve/sys/modules/cam/Makefile
  projects/bhyve/sys/modules/ce/Makefile
  projects/bhyve/sys/modules/cxgbe/Makefile
  projects/bhyve/sys/modules/drm/r128/Makefile
  projects/bhyve/sys/modules/drm/radeon/Makefile
  projects/bhyve/sys/modules/drm/via/Makefile
  projects/bhyve/sys/modules/ipfilter/Makefile
  projects/bhyve/sys/modules/nve/Makefile
  projects/bhyve/sys/modules/nxge/Makefile
  projects/bhyve/sys/modules/pfsync/Makefile
  projects/bhyve/sys/modules/sound/driver/emu10k1/Makefile
  projects/bhyve/sys/modules/splash/Makefile
  projects/bhyve/sys/modules/usb/Makefile
  projects/bhyve/sys/modules/xfs/Makefile
  projects/bhyve/sys/net/bpf.c
  projects/bhyve/sys/net/bpf.h
  projects/bhyve/sys/net/if.c
  projects/bhyve/sys/net/if.h
  projects/bhyve/sys/net/if_clone.c
  projects/bhyve/sys/net/if_clone.h
  projects/bhyve/sys/net/if_ethersubr.c
  projects/bhyve/sys/net/if_types.h
  projects/bhyve/sys/net/if_var.h
  projects/bhyve/sys/net/if_vlan.c
  projects/bhyve/sys/net/netmap.h
  projects/bhyve/sys/net/route.c
  projects/bhyve/sys/net/rtsock.c
  projects/bhyve/sys/net80211/ieee80211.c
  projects/bhyve/sys/net80211/ieee80211_acl.c
  projects/bhyve/sys/net80211/ieee80211_hostap.c
  projects/bhyve/sys/net80211/ieee80211_ht.c
  projects/bhyve/sys/net80211/ieee80211_ioctl.c
  projects/bhyve/sys/net80211/ieee80211_mesh.c
  projects/bhyve/sys/net80211/ieee80211_proto.h
  projects/bhyve/sys/net80211/ieee80211_var.h
  projects/bhyve/sys/netgraph/ng_base.c
  projects/bhyve/sys/netgraph/ng_ksocket.c
  projects/bhyve/sys/netinet/if_ether.c
  projects/bhyve/sys/netinet/if_ether.h
  projects/bhyve/sys/netinet/igmp.c
  projects/bhyve/sys/netinet/in.c
  projects/bhyve/sys/netinet/in_mcast.c
  projects/bhyve/sys/netinet/in_var.h
  projects/bhyve/sys/netinet/ip_carp.c
  projects/bhyve/sys/netinet/ip_carp.h
  projects/bhyve/sys/netinet/ip_var.h
  projects/bhyve/sys/netinet/raw_ip.c
  projects/bhyve/sys/netinet/sctp.h
  projects/bhyve/sys/netinet/sctp_asconf.c
  projects/bhyve/sys/netinet/sctp_asconf.h
  projects/bhyve/sys/netinet/sctp_auth.c
  projects/bhyve/sys/netinet/sctp_auth.h
  projects/bhyve/sys/netinet/sctp_bsd_addr.c
  projects/bhyve/sys/netinet/sctp_bsd_addr.h
  projects/bhyve/sys/netinet/sctp_cc_functions.c
  projects/bhyve/sys/netinet/sctp_constants.h
  projects/bhyve/sys/netinet/sctp_crc32.h
  projects/bhyve/sys/netinet/sctp_dtrace_declare.h
  projects/bhyve/sys/netinet/sctp_dtrace_define.h
  projects/bhyve/sys/netinet/sctp_header.h
  projects/bhyve/sys/netinet/sctp_indata.c
  projects/bhyve/sys/netinet/sctp_indata.h
  projects/bhyve/sys/netinet/sctp_input.c
  projects/bhyve/sys/netinet/sctp_input.h
  projects/bhyve/sys/netinet/sctp_os.h
  projects/bhyve/sys/netinet/sctp_output.c
  projects/bhyve/sys/netinet/sctp_output.h
  projects/bhyve/sys/netinet/sctp_pcb.c
  projects/bhyve/sys/netinet/sctp_pcb.h
  projects/bhyve/sys/netinet/sctp_peeloff.c
  projects/bhyve/sys/netinet/sctp_peeloff.h
  projects/bhyve/sys/netinet/sctp_ss_functions.c
  projects/bhyve/sys/netinet/sctp_structs.h
  projects/bhyve/sys/netinet/sctp_sysctl.c
  projects/bhyve/sys/netinet/sctp_sysctl.h
  projects/bhyve/sys/netinet/sctp_timer.c
  projects/bhyve/sys/netinet/sctp_timer.h
  projects/bhyve/sys/netinet/sctp_uio.h
  projects/bhyve/sys/netinet/sctp_usrreq.c
  projects/bhyve/sys/netinet/sctp_var.h
  projects/bhyve/sys/netinet/sctputil.c
  projects/bhyve/sys/netinet/sctputil.h
  projects/bhyve/sys/netinet/tcp_reass.c
  projects/bhyve/sys/netinet6/icmp6.c
  projects/bhyve/sys/netinet6/in6.c
  projects/bhyve/sys/netinet6/in6_ifattach.c
  projects/bhyve/sys/netinet6/in6_proto.c
  projects/bhyve/sys/netinet6/in6_var.h
  projects/bhyve/sys/netinet6/ip6_mroute.c
  projects/bhyve/sys/netinet6/mld6.c
  projects/bhyve/sys/netinet6/nd6.c
  projects/bhyve/sys/netinet6/nd6.h
  projects/bhyve/sys/netinet6/nd6_nbr.c
  projects/bhyve/sys/netinet6/nd6_rtr.c
  projects/bhyve/sys/netinet6/scope6_var.h
  projects/bhyve/sys/netinet6/sctp6_usrreq.c
  projects/bhyve/sys/netinet6/sctp6_var.h
  projects/bhyve/sys/netipsec/xform_ah.c
  projects/bhyve/sys/netipsec/xform_esp.c
  projects/bhyve/sys/nfs/bootp_subr.c
  projects/bhyve/sys/nfsclient/nfs_bio.c
  projects/bhyve/sys/nfsclient/nfs_krpc.c
  projects/bhyve/sys/nfsserver/nfs_serv.c
  projects/bhyve/sys/ofed/include/asm/types.h
  projects/bhyve/sys/ofed/include/linux/types.h
  projects/bhyve/sys/pc98/cbus/scterm-sck.c
  projects/bhyve/sys/pc98/cbus/scvtb.c
  projects/bhyve/sys/pc98/cbus/sio.c
  projects/bhyve/sys/pc98/conf/GENERIC
  projects/bhyve/sys/pc98/include/md_var.h
  projects/bhyve/sys/pc98/pc98/pc98_machdep.h
  projects/bhyve/sys/pci/if_rl.c
  projects/bhyve/sys/pci/if_rlreg.h
  projects/bhyve/sys/pci/intpm.c
  projects/bhyve/sys/pci/viapm.c
  projects/bhyve/sys/powerpc/aim/locore32.S
  projects/bhyve/sys/powerpc/aim/machdep.c
  projects/bhyve/sys/powerpc/aim/mmu_oea.c
  projects/bhyve/sys/powerpc/aim/mmu_oea64.c
  projects/bhyve/sys/powerpc/aim/nexus.c
  projects/bhyve/sys/powerpc/aim/trap.c
  projects/bhyve/sys/powerpc/aim/uma_machdep.c
  projects/bhyve/sys/powerpc/booke/platform_bare.c
  projects/bhyve/sys/powerpc/conf/GENERIC
  projects/bhyve/sys/powerpc/include/_types.h
  projects/bhyve/sys/powerpc/include/pmap.h
  projects/bhyve/sys/powerpc/include/pmc_mdep.h
  projects/bhyve/sys/powerpc/include/spr.h
  projects/bhyve/sys/powerpc/include/vmparam.h
  projects/bhyve/sys/powerpc/mambo/mambo.c
  projects/bhyve/sys/powerpc/mambo/mambo_console.c
  projects/bhyve/sys/powerpc/mpc85xx/nexus.c
  projects/bhyve/sys/powerpc/mpc85xx/pci_fdt.c
  projects/bhyve/sys/powerpc/ofw/ofw_cpu.c
  projects/bhyve/sys/powerpc/ofw/ofw_pcib_pci.c
  projects/bhyve/sys/powerpc/powermac/cpcht.c
  projects/bhyve/sys/powerpc/powermac/cuda.c
  projects/bhyve/sys/powerpc/powermac/grackle.c
  projects/bhyve/sys/powerpc/powermac/platform_powermac.c
  projects/bhyve/sys/powerpc/powermac/pmu.c
  projects/bhyve/sys/powerpc/powermac/pmuvar.h
  projects/bhyve/sys/powerpc/powermac/uninorthpci.c
  projects/bhyve/sys/powerpc/ps3/ehci_ps3.c
  projects/bhyve/sys/powerpc/ps3/ohci_ps3.c
  projects/bhyve/sys/powerpc/ps3/ps3-hv-asm.awk
  projects/bhyve/sys/powerpc/ps3/ps3-hvcall.S
  projects/bhyve/sys/powerpc/ps3/ps3-hvcall.h
  projects/bhyve/sys/powerpc/ps3/ps3-hvcall.master
  projects/bhyve/sys/powerpc/ps3/ps3_syscons.c
  projects/bhyve/sys/powerpc/ps3/ps3bus.c
  projects/bhyve/sys/security/mac/mac_framework.c
  projects/bhyve/sys/security/mac_lomac/mac_lomac.c
  projects/bhyve/sys/sparc64/central/central.c
  projects/bhyve/sys/sparc64/conf/GENERIC
  projects/bhyve/sys/sparc64/ebus/ebus.c
  projects/bhyve/sys/sparc64/ebus/epic.c
  projects/bhyve/sys/sparc64/fhc/fhc.c
  projects/bhyve/sys/sparc64/include/_types.h
  projects/bhyve/sys/sparc64/include/atomic.h
  projects/bhyve/sys/sparc64/include/md_var.h
  projects/bhyve/sys/sparc64/pci/apb.c
  projects/bhyve/sys/sparc64/pci/fire.c
  projects/bhyve/sys/sparc64/pci/ofw_pcib.c
  projects/bhyve/sys/sparc64/pci/ofw_pcibus.c
  projects/bhyve/sys/sparc64/pci/psycho.c
  projects/bhyve/sys/sparc64/pci/sbbc.c
  projects/bhyve/sys/sparc64/pci/schizo.c
  projects/bhyve/sys/sparc64/sbus/dma_sbus.c
  projects/bhyve/sys/sparc64/sbus/sbus.c
  projects/bhyve/sys/sparc64/sparc64/ata_machdep.c
  projects/bhyve/sys/sparc64/sparc64/eeprom.c
  projects/bhyve/sys/sparc64/sparc64/jbusppm.c
  projects/bhyve/sys/sparc64/sparc64/nexus.c
  projects/bhyve/sys/sparc64/sparc64/ofw_machdep.c
  projects/bhyve/sys/sparc64/sparc64/rtc.c
  projects/bhyve/sys/sparc64/sparc64/sc_machdep.c
  projects/bhyve/sys/sparc64/sparc64/schppm.c
  projects/bhyve/sys/sparc64/sparc64/ssm.c
  projects/bhyve/sys/sparc64/sparc64/upa.c
  projects/bhyve/sys/sparc64/sparc64/vm_machdep.c
  projects/bhyve/sys/sys/_null.h
  projects/bhyve/sys/sys/bus.h
  projects/bhyve/sys/sys/cdefs.h
  projects/bhyve/sys/sys/cons.h
  projects/bhyve/sys/sys/copyright.h
  projects/bhyve/sys/sys/elf_common.h
  projects/bhyve/sys/sys/libkern.h
  projects/bhyve/sys/sys/mman.h
  projects/bhyve/sys/sys/mutex.h
  projects/bhyve/sys/sys/namei.h
  projects/bhyve/sys/sys/param.h
  projects/bhyve/sys/sys/pmc.h
  projects/bhyve/sys/sys/proc.h
  projects/bhyve/sys/sys/resource.h
  projects/bhyve/sys/sys/sockio.h
  projects/bhyve/sys/sys/stdint.h
  projects/bhyve/sys/sys/sysctl.h
  projects/bhyve/sys/sys/systm.h
  projects/bhyve/sys/sys/taskqueue.h
  projects/bhyve/sys/sys/timeffc.h
  projects/bhyve/sys/sys/types.h
  projects/bhyve/sys/sys/umtx.h
  projects/bhyve/sys/sys/vnode.h
  projects/bhyve/sys/ufs/ffs/ffs_alloc.c
  projects/bhyve/sys/vm/swap_pager.c
  projects/bhyve/sys/vm/vm_glue.c
  projects/bhyve/sys/vm/vm_meter.c
  projects/bhyve/sys/vm/vm_object.c
  projects/bhyve/sys/vm/vm_page.c
  projects/bhyve/sys/vm/vm_page.h
  projects/bhyve/sys/vm/vm_reserv.c
  projects/bhyve/sys/vm/vm_reserv.h
  projects/bhyve/sys/vm/vnode_pager.c
  projects/bhyve/sys/x86/acpica/acpi_apm.c
  projects/bhyve/sys/x86/acpica/srat.c
  projects/bhyve/sys/x86/pci/pci_bus.c
  projects/bhyve/sys/x86/pci/qpi.c
  projects/bhyve/sys/x86/x86/mptable_pci.c
  projects/bhyve/sys/xen/evtchn/evtchn_dev.c
  projects/bhyve/sys/xen/xenstore/xenstore.c
  projects/bhyve/tools/KSE/ksetest/kse_threads_test.c
  projects/bhyve/tools/build/mk/OptionalObsoleteFiles.inc
  projects/bhyve/tools/debugscripts/gdbinit.i386
  projects/bhyve/tools/debugscripts/kld_deb.py
  projects/bhyve/tools/regression/README
  projects/bhyve/tools/regression/bin/sh/builtins/cd1.0
  projects/bhyve/tools/regression/bin/test/regress.sh
  projects/bhyve/tools/regression/fifo/fifo_io/fifo_io.c
  projects/bhyve/tools/regression/file/dup/dup.c
  projects/bhyve/tools/regression/kthread/kld/kthrdlk.c
  projects/bhyve/tools/regression/lib/libc/nss/README
  projects/bhyve/tools/regression/nfsmmap/Makefile
  projects/bhyve/tools/regression/nfsmmap/README
  projects/bhyve/tools/regression/pipe/pipe-fstatbug.c
  projects/bhyve/tools/regression/pipe/pipe-reverse.c
  projects/bhyve/tools/regression/pipe/pipe-wraparound.c
  projects/bhyve/tools/regression/pjdfstest/tests/chown/00.t
  projects/bhyve/tools/regression/priv/priv_cred.c
  projects/bhyve/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c
  projects/bhyve/tools/regression/sbin/Makefile
  projects/bhyve/tools/regression/security/open_to_operation/open_to_operation.c
  projects/bhyve/tools/regression/sockets/unix_passfd/unix_passfd.c
  projects/bhyve/tools/regression/usr.bin/env/regress-sb.rb
  projects/bhyve/tools/regression/usr.bin/make/README
  projects/bhyve/tools/regression/usr.bin/make/variables/modifier_M/Makefile
  projects/bhyve/tools/regression/usr.bin/make/variables/modifier_M/expected.stdout.1
  projects/bhyve/tools/regression/usr.bin/sed/math.sed
  projects/bhyve/tools/regression/usr.sbin/newsyslog/regress.sh
  projects/bhyve/tools/test/posixshm/shm_test.c
  projects/bhyve/tools/test/testfloat/systemBugs.txt   (contents, props changed)
  projects/bhyve/tools/test/testfloat/testfloat-source.txt   (contents, props changed)
  projects/bhyve/tools/test/testfloat/testfloat.txt   (contents, props changed)
  projects/bhyve/tools/tools/ansify/ansify.pl
  projects/bhyve/tools/tools/ath/Makefile
  projects/bhyve/tools/tools/ath/athstats/athstats.c
  projects/bhyve/tools/tools/bus_autoconf/bus_autoconf.c
  projects/bhyve/tools/tools/cd2dvd/cd2dvd.sh
  projects/bhyve/tools/tools/cxgbetool/cxgbetool.c
  projects/bhyve/tools/tools/genericize/genericize.pl
  projects/bhyve/tools/tools/hcomp/hcomp.pl
  projects/bhyve/tools/tools/mtxstat/mtxstat.pl
  projects/bhyve/tools/tools/net80211/wesside/wesside/wesside.c
  projects/bhyve/tools/tools/net80211/wlaninject/README
  projects/bhyve/tools/tools/netmap/bridge.c
  projects/bhyve/tools/tools/netmap/pkt-gen.c
  projects/bhyve/tools/tools/netrate/netreceive/netreceive.c
  projects/bhyve/tools/tools/netrate/tcpp/tcpp_client.c
  projects/bhyve/tools/tools/prstats/prstats.pl
  projects/bhyve/tools/tools/sysbuild/README
  projects/bhyve/tools/tools/tinybsd/README
  projects/bhyve/tools/tools/whereintheworld/whereintheworld.pl
  projects/bhyve/usr.bin/Makefile
  projects/bhyve/usr.bin/ar/ar.1
  projects/bhyve/usr.bin/brandelf/brandelf.c
  projects/bhyve/usr.bin/calendar/calendars/calendar.birthday
  projects/bhyve/usr.bin/calendar/calendars/calendar.freebsd
  projects/bhyve/usr.bin/calendar/calendars/calendar.history
  projects/bhyve/usr.bin/calendar/calendars/calendar.music
  projects/bhyve/usr.bin/cksum/cksum.c
  projects/bhyve/usr.bin/compress/compress.c
  projects/bhyve/usr.bin/cpio/Makefile
  projects/bhyve/usr.bin/cpio/test/Makefile
  projects/bhyve/usr.bin/csup/Makefile
  projects/bhyve/usr.bin/csup/auth.c
  projects/bhyve/usr.bin/csup/fixups.c
  projects/bhyve/usr.bin/csup/misc.c
  projects/bhyve/usr.bin/csup/misc.h
  projects/bhyve/usr.bin/csup/mux.c
  projects/bhyve/usr.bin/csup/proto.c
  projects/bhyve/usr.bin/csup/rcsfile.c
  projects/bhyve/usr.bin/du/du.1
  projects/bhyve/usr.bin/du/du.c
  projects/bhyve/usr.bin/find/main.c
  projects/bhyve/usr.bin/finger/finger.c
  projects/bhyve/usr.bin/fstat/fstat.c
  projects/bhyve/usr.bin/gprof/aout.c
  projects/bhyve/usr.bin/gprof/arcs.c
  projects/bhyve/usr.bin/grep/Makefile
  projects/bhyve/usr.bin/grep/grep.c
  projects/bhyve/usr.bin/grep/grep.h
  projects/bhyve/usr.bin/grep/util.c
  projects/bhyve/usr.bin/hexdump/conv.c
  projects/bhyve/usr.bin/hexdump/display.c
  projects/bhyve/usr.bin/hexdump/hexdump.c
  projects/bhyve/usr.bin/hexdump/hexsyntax.c
  projects/bhyve/usr.bin/hexdump/od.1
  projects/bhyve/usr.bin/hexdump/parse.c
  projects/bhyve/usr.bin/indent/indent.c
  projects/bhyve/usr.bin/indent/io.c
  projects/bhyve/usr.bin/ipcs/ipc.c
  projects/bhyve/usr.bin/ipcs/ipc.h
  projects/bhyve/usr.bin/lex/NEWS
  projects/bhyve/usr.bin/lex/flexdef.h
  projects/bhyve/usr.bin/lex/main.c
  projects/bhyve/usr.bin/lex/tblcmp.c
  projects/bhyve/usr.bin/limits/limits.c
  projects/bhyve/usr.bin/locate/locate/fastfind.c
  projects/bhyve/usr.bin/locate/locate/locate.c
  projects/bhyve/usr.bin/locate/locate/util.c
  projects/bhyve/usr.bin/login/login_fbtab.c
  projects/bhyve/usr.bin/logins/logins.1
  projects/bhyve/usr.bin/logins/logins.c
  projects/bhyve/usr.bin/m4/Makefile
  projects/bhyve/usr.bin/m4/eval.c
  projects/bhyve/usr.bin/m4/expr.c
  projects/bhyve/usr.bin/m4/extern.h
  projects/bhyve/usr.bin/m4/gnum4.c
  projects/bhyve/usr.bin/m4/look.c
  projects/bhyve/usr.bin/m4/m4.1
  projects/bhyve/usr.bin/m4/main.c
  projects/bhyve/usr.bin/m4/mdef.h
  projects/bhyve/usr.bin/m4/misc.c
  projects/bhyve/usr.bin/m4/pathnames.h
  projects/bhyve/usr.bin/m4/stdd.h
  projects/bhyve/usr.bin/m4/trace.c
  projects/bhyve/usr.bin/mail/cmd1.c
  projects/bhyve/usr.bin/mail/extern.h
  projects/bhyve/usr.bin/mail/head.c
  projects/bhyve/usr.bin/mail/lex.c
  projects/bhyve/usr.bin/mail/main.c
  projects/bhyve/usr.bin/mail/util.c
  projects/bhyve/usr.bin/make/GNode.h
  projects/bhyve/usr.bin/make/Makefile
  projects/bhyve/usr.bin/make/arch.c
  projects/bhyve/usr.bin/make/buf.c
  projects/bhyve/usr.bin/make/for.c
  projects/bhyve/usr.bin/make/job.c
  projects/bhyve/usr.bin/make/main.c
  projects/bhyve/usr.bin/make/str.c
  projects/bhyve/usr.bin/make/var.c
  projects/bhyve/usr.bin/man/man.sh
  projects/bhyve/usr.bin/mkesdb/Makefile.inc
  projects/bhyve/usr.bin/mt/mt.c
  projects/bhyve/usr.bin/ncplist/Makefile
  projects/bhyve/usr.bin/ncplogin/ncplogin.c
  projects/bhyve/usr.bin/netstat/Makefile
  projects/bhyve/usr.bin/netstat/if.c
  projects/bhyve/usr.bin/netstat/inet.c
  projects/bhyve/usr.bin/netstat/inet6.c
  projects/bhyve/usr.bin/netstat/ipx.c
  projects/bhyve/usr.bin/netstat/sctp.c
  projects/bhyve/usr.bin/pr/pr.c
  projects/bhyve/usr.bin/procstat/Makefile
  projects/bhyve/usr.bin/procstat/procstat.1
  projects/bhyve/usr.bin/procstat/procstat.c
  projects/bhyve/usr.bin/procstat/procstat.h
  projects/bhyve/usr.bin/procstat/procstat_args.c
  projects/bhyve/usr.bin/rctl/rctl.8
  projects/bhyve/usr.bin/rlogin/rlogin.c
  projects/bhyve/usr.bin/rpcgen/rpc_main.c
  projects/bhyve/usr.bin/rpcgen/rpc_svcout.c
  projects/bhyve/usr.bin/rpcinfo/rpcinfo.c
  projects/bhyve/usr.bin/sockstat/sockstat.1
  projects/bhyve/usr.bin/sockstat/sockstat.c
  projects/bhyve/usr.bin/systat/devs.c
  projects/bhyve/usr.bin/systat/icmp6.c
  projects/bhyve/usr.bin/systat/netcmds.c
  projects/bhyve/usr.bin/systat/netstat.c
  projects/bhyve/usr.bin/talk/ctl_transact.c
  projects/bhyve/usr.bin/talk/get_names.c
  projects/bhyve/usr.bin/talk/invite.c
  projects/bhyve/usr.bin/tar/Makefile
  projects/bhyve/usr.bin/tar/test/Makefile
  projects/bhyve/usr.bin/tftp/main.c
  projects/bhyve/usr.bin/tip/tip/tip.h
  projects/bhyve/usr.bin/top/machine.c
  projects/bhyve/usr.bin/tr/str.c
  projects/bhyve/usr.bin/truss/amd64-linux32.c
  projects/bhyve/usr.bin/truss/i386-linux.c
  projects/bhyve/usr.bin/truss/main.c
  projects/bhyve/usr.bin/truss/setup.c
  projects/bhyve/usr.bin/truss/syscalls.c
  projects/bhyve/usr.bin/tset/map.c
  projects/bhyve/usr.bin/tset/term.c
  projects/bhyve/usr.bin/tset/wrterm.c
  projects/bhyve/usr.bin/unzip/unzip.1
  projects/bhyve/usr.bin/unzip/unzip.c
  projects/bhyve/usr.bin/vacation/Makefile
  projects/bhyve/usr.bin/vgrind/extern.h
  projects/bhyve/usr.bin/vgrind/vfontedpr.c
  projects/bhyve/usr.bin/vmstat/vmstat.c
  projects/bhyve/usr.bin/whereis/pathnames.h
  projects/bhyve/usr.bin/whereis/whereis.c
  projects/bhyve/usr.bin/xlint/lint1/decl.c
  projects/bhyve/usr.bin/xlint/lint1/emit1.c
  projects/bhyve/usr.bin/xlint/lint1/func.c
  projects/bhyve/usr.bin/xlint/lint1/mem1.c
  projects/bhyve/usr.bin/xlint/lint2/chk.c
  projects/bhyve/usr.bin/xlint/lint2/read.c
  projects/bhyve/usr.bin/xlint/xlint/xlint.c
  projects/bhyve/usr.bin/yacc/NEW_FEATURES
  projects/bhyve/usr.bin/yacc/reader.c
  projects/bhyve/usr.sbin/IPXrouted/sap_input.c
  projects/bhyve/usr.sbin/IPXrouted/sap_tables.c
  projects/bhyve/usr.sbin/acpi/Makefile.inc
  projects/bhyve/usr.sbin/acpi/acpiconf/acpiconf.8
  projects/bhyve/usr.sbin/acpi/acpidb/Makefile
  projects/bhyve/usr.sbin/acpi/acpidb/acpidb.c
  projects/bhyve/usr.sbin/acpi/iasl/Makefile
  projects/bhyve/usr.sbin/adduser/adduser.sh
  projects/bhyve/usr.sbin/bluetooth/bt3cfw/bt3cfw.c
  projects/bhyve/usr.sbin/bluetooth/btpand/event.h
  projects/bhyve/usr.sbin/bluetooth/hccontrol/host_controller_baseband.c
  projects/bhyve/usr.sbin/bluetooth/sdpd/server.c
  projects/bhyve/usr.sbin/boot0cfg/Makefile
  projects/bhyve/usr.sbin/boot0cfg/boot0cfg.8
  projects/bhyve/usr.sbin/boot0cfg/boot0cfg.c
  projects/bhyve/usr.sbin/bootparamd/bootparamd/README
  projects/bhyve/usr.sbin/bootparamd/bootparamd/bootparamd.c
  projects/bhyve/usr.sbin/bsdinstall/distextract/distextract.c
  projects/bhyve/usr.sbin/bsdinstall/distfetch/distfetch.c
  projects/bhyve/usr.sbin/bsdinstall/partedit/gpart_ops.c
  projects/bhyve/usr.sbin/bsdinstall/scripts/auto
  projects/bhyve/usr.sbin/bsdinstall/scripts/services
  projects/bhyve/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_addrs.c
  projects/bhyve/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_if.c
  projects/bhyve/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_port.c
  projects/bhyve/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
  projects/bhyve/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_device_tbl.c
  projects/bhyve/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_scalars.c
  projects/bhyve/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_snmp.h
  projects/bhyve/usr.sbin/bsnmpd/modules/snmp_hostres/hostres_storage_tbl.c
  projects/bhyve/usr.sbin/bsnmpd/modules/snmp_wlan/BEGEMOT-WIRELESS-MIB.txt
  projects/bhyve/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_snmp.h
  projects/bhyve/usr.sbin/bsnmpd/modules/snmp_wlan/wlan_tree.def
  projects/bhyve/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.1
  projects/bhyve/usr.sbin/bsnmpd/tools/bsnmptools/bsnmpget.c
  projects/bhyve/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmpmap.c
  projects/bhyve/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.c
  projects/bhyve/usr.sbin/bsnmpd/tools/libbsnmptools/bsnmptools.h
  projects/bhyve/usr.sbin/burncd/burncd.8
  projects/bhyve/usr.sbin/burncd/burncd.c
  projects/bhyve/usr.sbin/chkgrp/chkgrp.8
  projects/bhyve/usr.sbin/chkgrp/chkgrp.c
  projects/bhyve/usr.sbin/config/main.c
  projects/bhyve/usr.sbin/config/mkmakefile.c
  projects/bhyve/usr.sbin/cpucontrol/Makefile
  projects/bhyve/usr.sbin/cpucontrol/cpucontrol.c
  projects/bhyve/usr.sbin/cron/cron/do_command.c
  projects/bhyve/usr.sbin/cron/crontab/crontab.5
  projects/bhyve/usr.sbin/cron/doc/CHANGES
  projects/bhyve/usr.sbin/cron/doc/MAIL
  projects/bhyve/usr.sbin/cron/lib/entry.c
  projects/bhyve/usr.sbin/ctm/ctm_dequeue/ctm_dequeue.c
  projects/bhyve/usr.sbin/edquota/edquota.c
  projects/bhyve/usr.sbin/fwcontrol/fwcontrol.c
  projects/bhyve/usr.sbin/fwcontrol/fwmpegts.c
  projects/bhyve/usr.sbin/i2c/i2c.c
  projects/bhyve/usr.sbin/ifmcstat/ifmcstat.c
  projects/bhyve/usr.sbin/inetd/builtins.c
  projects/bhyve/usr.sbin/inetd/inetd.c
  projects/bhyve/usr.sbin/iostat/iostat.c
  projects/bhyve/usr.sbin/ipfwpcap/ipfwpcap.c
  projects/bhyve/usr.sbin/kbdcontrol/kbdcontrol.c
  projects/bhyve/usr.sbin/kbdcontrol/lex.h
  projects/bhyve/usr.sbin/kbdcontrol/lex.l
  projects/bhyve/usr.sbin/kbdmap/kbdmap.c
  projects/bhyve/usr.sbin/keyserv/crypt_server.c
  projects/bhyve/usr.sbin/keyserv/keyserv.c
  projects/bhyve/usr.sbin/kgmon/kgmon.c
  projects/bhyve/usr.sbin/kldxref/kldxref.8
  projects/bhyve/usr.sbin/lpr/common_source/rmjob.c
  projects/bhyve/usr.sbin/lpr/filters/lpf.c
  projects/bhyve/usr.sbin/lpr/lpc/cmds.c
  projects/bhyve/usr.sbin/lpr/lpd/printjob.c
  projects/bhyve/usr.sbin/lpr/pac/pac.c
  projects/bhyve/usr.sbin/makefs/cd9660/cd9660_eltorito.c
  projects/bhyve/usr.sbin/makefs/cd9660/cd9660_write.c
  projects/bhyve/usr.sbin/makefs/cd9660/iso9660_rrip.c
  projects/bhyve/usr.sbin/makefs/ffs.c
  projects/bhyve/usr.sbin/makefs/ffs/ffs_extern.h
  projects/bhyve/usr.sbin/makefs/ffs/ffs_subr.c
  projects/bhyve/usr.sbin/makefs/walk.c
  projects/bhyve/usr.sbin/mergemaster/mergemaster.sh
  projects/bhyve/usr.sbin/mfiutil/mfi_config.c
  projects/bhyve/usr.sbin/mfiutil/mfi_evt.c
  projects/bhyve/usr.sbin/mount_portalfs/cred.c
  projects/bhyve/usr.sbin/mount_portalfs/mount_portalfs.c
  projects/bhyve/usr.sbin/mount_portalfs/pt_pipe.c
  projects/bhyve/usr.sbin/mount_portalfs/pt_tcplisten.c
  projects/bhyve/usr.sbin/mountd/mountd.c
  projects/bhyve/usr.sbin/moused/moused.c
  projects/bhyve/usr.sbin/mptutil/mpt_config.c
  projects/bhyve/usr.sbin/mtree/spec.c
  projects/bhyve/usr.sbin/ndiscvt/Makefile
  projects/bhyve/usr.sbin/ndiscvt/inf-token.l
  projects/bhyve/usr.sbin/newsyslog/newsyslog.c
  projects/bhyve/usr.sbin/nscd/protocol.h
  projects/bhyve/usr.sbin/ntp/doc/ntp.conf.5
  projects/bhyve/usr.sbin/pc-sysinstall/backend-partmanager/delete-part.sh
  projects/bhyve/usr.sbin/pc-sysinstall/backend/functions-disk.sh
  projects/bhyve/usr.sbin/pc-sysinstall/backend/functions-parse.sh
  projects/bhyve/usr.sbin/pciconf/pciconf.c
  projects/bhyve/usr.sbin/pkg_install/README
  projects/bhyve/usr.sbin/pkg_install/add/add.h
  projects/bhyve/usr.sbin/pkg_install/add/extract.c
  projects/bhyve/usr.sbin/pkg_install/add/futil.c
  projects/bhyve/usr.sbin/pkg_install/add/main.c
  projects/bhyve/usr.sbin/pkg_install/add/perform.c
  projects/bhyve/usr.sbin/pkg_install/add/pkg_add.1
  projects/bhyve/usr.sbin/pkg_install/create/create.h
  projects/bhyve/usr.sbin/pkg_install/create/main.c
  projects/bhyve/usr.sbin/pkg_install/create/perform.c
  projects/bhyve/usr.sbin/pkg_install/create/pkg_create.1
  projects/bhyve/usr.sbin/pkg_install/create/pl.c
  projects/bhyve/usr.sbin/pkg_install/delete/delete.h
  projects/bhyve/usr.sbin/pkg_install/delete/main.c
  projects/bhyve/usr.sbin/pkg_install/delete/perform.c
  projects/bhyve/usr.sbin/pkg_install/delete/pkg_delete.1
  projects/bhyve/usr.sbin/pkg_install/info/info.h
  projects/bhyve/usr.sbin/pkg_install/info/main.c
  projects/bhyve/usr.sbin/pkg_install/info/perform.c
  projects/bhyve/usr.sbin/pkg_install/info/show.c
  projects/bhyve/usr.sbin/pkg_install/lib/deps.c
  projects/bhyve/usr.sbin/pkg_install/lib/exec.c
  projects/bhyve/usr.sbin/pkg_install/lib/file.c
  projects/bhyve/usr.sbin/pkg_install/lib/global.c
  projects/bhyve/usr.sbin/pkg_install/lib/lib.h
  projects/bhyve/usr.sbin/pkg_install/lib/match.c
  projects/bhyve/usr.sbin/pkg_install/lib/msg.c
  projects/bhyve/usr.sbin/pkg_install/lib/pen.c
  projects/bhyve/usr.sbin/pkg_install/lib/plist.c
  projects/bhyve/usr.sbin/pkg_install/lib/str.c
  projects/bhyve/usr.sbin/pkg_install/lib/url.c
  projects/bhyve/usr.sbin/pkg_install/updating/main.c
  projects/bhyve/usr.sbin/pkg_install/updating/pathnames.h
  projects/bhyve/usr.sbin/pkg_install/updating/pkg_updating.1
  projects/bhyve/usr.sbin/pkg_install/version/main.c
  projects/bhyve/usr.sbin/pkg_install/version/perform.c
  projects/bhyve/usr.sbin/pkg_install/version/version.h
  projects/bhyve/usr.sbin/pmccontrol/pmccontrol.c
  projects/bhyve/usr.sbin/pmcstat/pmcpl_calltree.c
  projects/bhyve/usr.sbin/pmcstat/pmcpl_gprof.c
  projects/bhyve/usr.sbin/pmcstat/pmcstat.c
  projects/bhyve/usr.sbin/pmcstat/pmcstat_log.c
  projects/bhyve/usr.sbin/powerd/powerd.c
  projects/bhyve/usr.sbin/ppp/cbcp.c
  projects/bhyve/usr.sbin/ppp/chat.h
  projects/bhyve/usr.sbin/ppp/command.c
  projects/bhyve/usr.sbin/ppp/mp.c
  projects/bhyve/usr.sbin/ppp/ppp.8.m4
  projects/bhyve/usr.sbin/ppp/vjcomp.c
  projects/bhyve/usr.sbin/pw/cpdir.c
  projects/bhyve/usr.sbin/pw/pw.8
  projects/bhyve/usr.sbin/pw/pw_user.c
  projects/bhyve/usr.sbin/quotaon/quotaon.c
  projects/bhyve/usr.sbin/route6d/route6d.c
  projects/bhyve/usr.sbin/rpc.lockd/kern.c
  projects/bhyve/usr.sbin/rpc.lockd/lockd_lock.c
  projects/bhyve/usr.sbin/rpc.ypupdated/yp_dbupdate.c
  projects/bhyve/usr.sbin/rpcbind/check_bound.c
  projects/bhyve/usr.sbin/rpcbind/rpcbind.c
  projects/bhyve/usr.sbin/rtadvd/config.c
  projects/bhyve/usr.sbin/rtadvd/rtadvd.c
  projects/bhyve/usr.sbin/rtprio/rtprio.c
  projects/bhyve/usr.sbin/rtsold/rtsold.8
  projects/bhyve/usr.sbin/rwhod/rwhod.c
  projects/bhyve/usr.sbin/sa/db.c
  projects/bhyve/usr.sbin/sade/Makefile
  projects/bhyve/usr.sbin/sade/devices.c
  projects/bhyve/usr.sbin/sade/disks.c
  projects/bhyve/usr.sbin/sade/dmenu.c
  projects/bhyve/usr.sbin/sade/install.c
  projects/bhyve/usr.sbin/sade/label.c
  projects/bhyve/usr.sbin/sade/main.c
  projects/bhyve/usr.sbin/sade/menus.c
  projects/bhyve/usr.sbin/sade/misc.c
  projects/bhyve/usr.sbin/sade/msg.c
  projects/bhyve/usr.sbin/sade/sade.h
  projects/bhyve/usr.sbin/sade/system.c
  projects/bhyve/usr.sbin/sade/variable.c
  projects/bhyve/usr.sbin/sendmail/Makefile
  projects/bhyve/usr.sbin/tcpdump/tcpdump/tcpdump.1
  projects/bhyve/usr.sbin/timed/timed/CHANGES
  projects/bhyve/usr.sbin/timed/timed/correct.c
  projects/bhyve/usr.sbin/timed/timed/globals.h
  projects/bhyve/usr.sbin/timed/timed/networkdelta.c
  projects/bhyve/usr.sbin/timed/timed/readmsg.c
  projects/bhyve/usr.sbin/timed/timedc/cmds.c
  projects/bhyve/usr.sbin/tzsetup/Makefile
  projects/bhyve/usr.sbin/tzsetup/tzsetup.c
  projects/bhyve/usr.sbin/uhsoctl/uhsoctl.c
  projects/bhyve/usr.sbin/vidcontrol/decode.c
  projects/bhyve/usr.sbin/vidcontrol/vidcontrol.c
  projects/bhyve/usr.sbin/wpa/hostapd/driver_freebsd.c
  projects/bhyve/usr.sbin/yp_mkdb/yp_mkdb.c
  projects/bhyve/usr.sbin/ypserv/yp_access.c
  projects/bhyve/usr.sbin/ypserv/yp_main.c
Directory Properties:
  projects/bhyve/   (props changed)
  projects/bhyve/cddl/contrib/opensolaris/   (props changed)
  projects/bhyve/contrib/bzip2/   (props changed)
  projects/bhyve/contrib/compiler-rt/   (props changed)
  projects/bhyve/contrib/ee/   (props changed)
  projects/bhyve/contrib/file/   (props changed)
  projects/bhyve/contrib/gcc/   (props changed)
  projects/bhyve/contrib/groff/   (props changed)
  projects/bhyve/contrib/less/   (props changed)
  projects/bhyve/contrib/libarchive/cpio/   (props changed)
  projects/bhyve/contrib/libarchive/libarchive/   (props changed)
  projects/bhyve/contrib/libarchive/libarchive_fe/   (props changed)
  projects/bhyve/contrib/libarchive/tar/   (props changed)
  projects/bhyve/contrib/libstdc++/   (props changed)
  projects/bhyve/contrib/llvm/   (props changed)
  projects/bhyve/contrib/llvm/tools/clang/   (props changed)
  projects/bhyve/contrib/netcat/   (props changed)
  projects/bhyve/contrib/openpam/   (props changed)
  projects/bhyve/contrib/pf/   (props changed)
  projects/bhyve/contrib/tcpdump/   (props changed)
  projects/bhyve/contrib/tzcode/zic/   (props changed)
  projects/bhyve/crypto/heimdal/   (props changed)
  projects/bhyve/gnu/lib/   (props changed)
  projects/bhyve/gnu/usr.bin/binutils/   (props changed)
  projects/bhyve/lib/libc/   (props changed)
  projects/bhyve/lib/libutil/   (props changed)
  projects/bhyve/sbin/   (props changed)
  projects/bhyve/sbin/ipfw/   (props changed)
  projects/bhyve/sys/   (props changed)
  projects/bhyve/sys/boot/   (props changed)
  projects/bhyve/sys/cddl/contrib/opensolaris/   (props changed)
  projects/bhyve/sys/conf/   (props changed)
  projects/bhyve/sys/contrib/dev/acpica/   (props changed)
  projects/bhyve/sys/contrib/octeon-sdk/   (props changed)
  projects/bhyve/sys/contrib/pf/   (props changed)
  projects/bhyve/tools/build/options/WITHOUT_GPIO   (props changed)
  projects/bhyve/tools/build/options/WITH_OFED   (props changed)
  projects/bhyve/tools/test/testfloat/testfloat-history.txt   (props changed)
  projects/bhyve/usr.bin/calendar/   (props changed)
  projects/bhyve/usr.bin/csup/   (props changed)
  projects/bhyve/usr.bin/procstat/   (props changed)
  projects/bhyve/usr.sbin/ndiscvt/   (props changed)
  projects/bhyve/usr.sbin/rtadvd/   (props changed)
  projects/bhyve/usr.sbin/rtsold/   (props changed)

Modified: projects/bhyve/COPYRIGHT
==============================================================================
--- projects/bhyve/COPYRIGHT	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/COPYRIGHT	Wed Jan  4 02:01:27 2012	(r229455)
@@ -4,7 +4,7 @@
 The compilation of software known as FreeBSD is distributed under the
 following terms:
 
-Copyright (c) 1992-2011 The FreeBSD Project. All rights reserved.
+Copyright (c) 1992-2012 The FreeBSD Project. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions

Modified: projects/bhyve/Makefile.inc1
==============================================================================
--- projects/bhyve/Makefile.inc1	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/Makefile.inc1	Wed Jan  4 02:01:27 2012	(r229455)
@@ -59,8 +59,6 @@ SUBDIR+=games
 .endif
 .if ${MK_CDDL} != "no"
 SUBDIR+=cddl
-.else
-NO_CTF=1
 .endif
 SUBDIR+=gnu include
 .if ${MK_KERBEROS} != "no"
@@ -239,7 +237,7 @@ BMAKE=		MAKEOBJDIRPREFIX=${WORLDTMP} \
 		BOOTSTRAPPING=${OSRELDATE} \
 		SSP_CFLAGS= \
 		-DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT -DWITHOUT_MAN \
-		-DNO_PIC -DWITHOUT_PROFILE -DNO_SHARED \
+		-DNO_PIC -DNO_PROFILE -DNO_SHARED \
 		-DNO_CPU_CFLAGS -DNO_WARNS -DNO_CTF
 
 # build-tools stage
@@ -278,7 +276,6 @@ LIB32CPUFLAGS=	-march=i686 -mmmx -msse -
 .else
 LIB32CPUFLAGS=	-march=${TARGET_CPUTYPE}
 .endif
-LIB32CPUFLAGS+=	-mfancy-math-387
 LIB32WMAKEENV=	MACHINE=i386 MACHINE_ARCH=i386 \
 		MACHINE_CPU="i686 mmx sse sse2" \
 		LD="${LD} -m elf_i386_fbsd -Y P,${LIB32TMP}/usr/lib32" \
@@ -438,7 +435,7 @@ _libraries:
 	@echo "--------------------------------------------------------------"
 	${_+_}cd ${.CURDIR}; \
 	    ${WMAKE} -DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
-	    -DWITHOUT_MAN -DWITHOUT_PROFILE libraries
+	    -DWITHOUT_MAN -DNO_PROFILE libraries
 _depend:
 	@echo
 	@echo "--------------------------------------------------------------"
@@ -1218,6 +1215,9 @@ _startup_libs+=	lib/csu/${MACHINE_CPUARC
 _startup_libs+=	gnu/lib/libgcc
 _startup_libs+=	lib/libcompiler_rt
 _startup_libs+=	lib/libc
+.if ${MK_LIBCPLUSPLUS} != "no"
+_startup_libs+=	lib/libcxxrt
+.endif
 
 gnu/lib/libgcc__L: lib/libc__L
 
@@ -1230,13 +1230,12 @@ _prebuild_libs=	${_kerberos5_lib_libasn1
 		${_lib_libgssapi} ${_lib_libipx} \
 		lib/libkiconv lib/libkvm lib/liblzma lib/libmd \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
-		lib/libopie ${_lib_libthr} \
+		lib/libopie lib/libpam ${_lib_libthr} \
 		lib/libradius lib/libsbuf lib/libtacplus \
 		${_cddl_lib_libumem} \
 		lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_secure_lib_libssh} \
-		${_secure_lib_libssl} \
-		lib/libpam
+		${_secure_lib_libssl}
 
 .if ${MK_LIBTHR} != "no"
 _lib_libthr=	lib/libthr
@@ -1319,12 +1318,12 @@ ${_lib}__PL: .PHONY
 		cd ${.CURDIR}/${_lib}; \
 		${MAKE} DIRPRFX=${_lib}/ obj; \
 		${MAKE} DIRPRFX=${_lib}/ depend; \
-		${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all; \
-		${MAKE} -DWITHOUT_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install
+		${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all; \
+		${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install
 .endif
 .endfor
 
-.for _lib in ${_startup_libs} ${_prebuild_libs} ${_generic_libs}
+.for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs}
 ${_lib}__L: .PHONY
 .if exists(${.CURDIR}/${_lib})
 	${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \
@@ -1336,6 +1335,17 @@ ${_lib}__L: .PHONY
 .endif
 .endfor
 
+# libpam is special: we need to build static PAM modules before
+# static PAM library, and dynamic PAM library before dynamic PAM
+# modules.
+lib/libpam__L: .PHONY
+	${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \
+		cd ${.CURDIR}/lib/libpam; \
+		${MAKE} DIRPRFX=lib/libpam/ obj; \
+		${MAKE} DIRPRFX=lib/libpam/ depend; \
+		${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET all; \
+		${MAKE} DIRPRFX=lib/libpam/ -D_NO_LIBPAM_SO_YET install
+
 _prereq_libs: ${_prereq_libs:S/$/__PL/}
 _startup_libs: ${_startup_libs:S/$/__L/}
 _prebuild_libs: ${_prebuild_libs:S/$/__L/}
@@ -1542,7 +1552,7 @@ XDEV_CPUTYPE?=${TARGET_CPUTYPE}
 .endif
 
 NOFUN=-DNO_FSCHG -DWITHOUT_HTML -DWITHOUT_INFO -DNO_LINT \
-	-DWITHOUT_MAN -DWITHOUT_NLS -DWITHOUT_PROFILE \
+	-DWITHOUT_MAN -DWITHOUT_NLS -DNO_PROFILE \
 	-DWITHOUT_KERBEROS -DWITHOUT_RESCUE -DNO_WARNS \
 	TARGET=${XDEV} TARGET_ARCH=${XDEV_ARCH} \
 	CPUTYPE=${XDEV_CPUTYPE}
@@ -1626,4 +1636,7 @@ _xi-links:
 			ln -sf ../../${XDTP}/usr/bin/$$i \
 			    ../../../../usr/bin/${XDDIR}${OSREL}-$$i; \
 		done
+.else
+xdev xdev-buil xdev-install:
+	@echo "*** Error: Both XDEV and XDEV_ARCH must be defined for \"${.TARGET}\" target"
 .endif

Modified: projects/bhyve/ObsoleteFiles.inc
==============================================================================
--- projects/bhyve/ObsoleteFiles.inc	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/ObsoleteFiles.inc	Wed Jan  4 02:01:27 2012	(r229455)
@@ -38,6 +38,21 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20111214: eventtimers(7) moved to eventtimers(4)
+OLD_FILES+=usr/share/man/man7/eventtimers.7.gz
+# 20111125: amd(4) removed
+OLD_FILES+=usr/share/man/man4/amd.4.gz
+# 20111125: libodialog removed
+OLD_FILES+=usr/lib/libodialog.a
+OLD_FILES+=usr/lib/libodialog.so
+OLD_LIBS+=usr/lib/libodialog.so.7
+OLD_FILES+=usr/lib/libodialog_p.a
+.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
+OLD_FILES+=usr/lib32/libodialog.a
+OLD_FILES+=usr/lib32/libodialog.so
+OLD_LIBS+=usr/lib32/libodialog.so.7
+OLD_FILES+=usr/lib32/libodialog_p.a
+.endif
 # 20110930: sysinstall removed
 OLD_FILES+=usr/sbin/sysinstall
 OLD_FILES+=usr/share/man/man8/sysinstall.8.gz

Modified: projects/bhyve/UPDATING
==============================================================================
--- projects/bhyve/UPDATING	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/UPDATING	Wed Jan  4 02:01:27 2012	(r229455)
@@ -22,6 +22,21 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	machines to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20111215:
+	The carp(4) facility has been changed significantly. Configuration
+	of the CARP protocol via ifconfig(8) has changed, as well as format
+	of CARP events submitted to devd(8) has changed. See manual pages
+	for more information. The arpbalance feature of carp(4) is currently
+	not supported anymore.
+
+	Size of struct in_aliasreq, struct in6_aliasreq has changed. User
+	utilities using SIOCAIFADDR, SIOCAIFADDR_IN6, e.g. ifconfig(8),
+	need to be recompiled.
+
+20111122:
+	The acpi_wmi(4) status device /dev/wmistat has been renamed to
+	/dev/wmistat0.
+
 20111108:
 	The option VFS_ALLOW_NONMPSAFE option has been added in order to
 	explicitely support non-MPSAFE filesystems.

Modified: projects/bhyve/bin/chio/chio.c
==============================================================================
--- projects/bhyve/bin/chio/chio.c	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/bin/chio/chio.c	Wed Jan  4 02:01:27 2012	(r229455)
@@ -87,7 +87,7 @@ static	int do_voltag(const char *, int, 
 #endif
 
 /* Valid changer element types. */
-const struct element_type elements[] = {
+static	const struct element_type elements[] = {
 	{ "drive",		CHET_DT },
 	{ "picker",		CHET_MT },
 	{ "portal",		CHET_IE },
@@ -97,7 +97,7 @@ const struct element_type elements[] = {
 };
 
 /* Valid commands. */
-const struct changer_command commands[] = {
+static	const struct changer_command commands[] = {
 	{ "exchange",		do_exchange },
 	{ "getpicker",		do_getpicker },
 	{ "ielem", 		do_ielem },
@@ -112,7 +112,7 @@ const struct changer_command commands[] 
 };
 
 /* Valid special words. */
-const struct special_word specials[] = {
+static	const struct special_word specials[] = {
 	{ "inv",		SW_INVERT },
 	{ "inv1",		SW_INVERT1 },
 	{ "inv2",		SW_INVERT2 },

Modified: projects/bhyve/bin/ed/io.c
==============================================================================
--- projects/bhyve/bin/ed/io.c	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/bin/ed/io.c	Wed Jan  4 02:01:27 2012	(r229455)
@@ -53,7 +53,8 @@ read_file(char *fn, long n)
 		errmsg = "cannot close input file";
 		return ERR;
 	}
-	fprintf(stdout, !scripted ? "%lu\n" : "", size);
+	if (!scripted)
+		fprintf(stdout, "%lu\n", size);
 	return current_addr - n;
 }
 
@@ -161,7 +162,8 @@ write_file(char *fn, const char *mode, l
 		errmsg = "cannot close output file";
 		return ERR;
 	}
-	fprintf(stdout, !scripted ? "%lu\n" : "", size);
+	if (!scripted)
+		fprintf(stdout, "%lu\n", size);
 	return n ? m - n + 1 : 0;
 }
 

Modified: projects/bhyve/bin/ed/main.c
==============================================================================
--- projects/bhyve/bin/ed/main.c	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/bin/ed/main.c	Wed Jan  4 02:01:27 2012	(r229455)
@@ -192,9 +192,10 @@ top:
 				fputs("?\n", stderr);
 				errmsg = "warning: file modified";
 				if (!isatty(0)) {
-					fprintf(stderr, garrulous ?
-					    "script, line %d: %s\n" :
-					    "", lineno, errmsg);
+					if (garrulous)
+						fprintf(stderr,
+						    "script, line %d: %s\n",
+						    lineno, errmsg);
 					quit(2);
 				}
 				clearerr(stdin);
@@ -225,27 +226,26 @@ top:
 			fputs("?\n", stderr);		/* give warning */
 			errmsg = "warning: file modified";
 			if (!isatty(0)) {
-				fprintf(stderr, garrulous ?
-				    "script, line %d: %s\n" :
-				    "", lineno, errmsg);
+				if (garrulous)
+					fprintf(stderr, "script, line %d: %s\n",
+					    lineno, errmsg);
 				quit(2);
 			}
 			break;
 		case FATAL:
-			if (!isatty(0))
-				fprintf(stderr, garrulous ?
-				    "script, line %d: %s\n" : "",
-				    lineno, errmsg);
-			else
-				fprintf(stderr, garrulous ? "%s\n" : "",
-				    errmsg);
+			if (!isatty(0)) {
+				if (garrulous)
+					fprintf(stderr, "script, line %d: %s\n",
+					    lineno, errmsg);
+			} else if (garrulous)
+				fprintf(stderr, "%s\n", errmsg);
 			quit(3);
 		default:
 			fputs("?\n", stderr);
 			if (!isatty(0)) {
-				fprintf(stderr, garrulous ?
-				    "script, line %d: %s\n" : "",
-				    lineno, errmsg);
+				if (garrulous)
+					fprintf(stderr, "script, line %d: %s\n",
+					    lineno, errmsg);
 				quit(2);
 			}
 			break;

Modified: projects/bhyve/bin/ps/ps.1
==============================================================================
--- projects/bhyve/bin/ps/ps.1	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/bin/ps/ps.1	Wed Jan  4 02:01:27 2012	(r229455)
@@ -29,7 +29,7 @@
 .\"     @(#)ps.1	8.3 (Berkeley) 4/18/94
 .\" $FreeBSD$
 .\"
-.Dd October 30, 2011
+.Dd November 22, 2011
 .Dt PS 1
 .Os
 .Sh NAME
@@ -98,12 +98,6 @@ The default output format includes, for 
 controlling terminal, state, CPU time (including both user and system time)
 and associated command.
 .Pp
-The process file system (see
-.Xr procfs 5 )
-should be mounted when
-.Nm
-is executed, otherwise not all information will be available.
-.Pp
 The options are as follows:
 .Bl -tag -width indent
 .It Fl a
@@ -686,9 +680,6 @@ attempts to automatically determine the 
 .Bl -tag -width ".Pa /boot/kernel/kernel" -compact
 .It Pa /boot/kernel/kernel
 default system namelist
-.It Pa /proc
-the mount point of
-.Xr procfs 5
 .El
 .Sh SEE ALSO
 .Xr kill 1 ,

Modified: projects/bhyve/bin/ps/ps.c
==============================================================================
--- projects/bhyve/bin/ps/ps.c	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/bin/ps/ps.c	Wed Jan  4 02:01:27 2012	(r229455)
@@ -130,7 +130,6 @@ struct listinfo {
 	} l;
 };
 
-static int	 check_procfs(void);
 static int	 addelem_gid(struct listinfo *, const char *);
 static int	 addelem_pid(struct listinfo *, const char *);
 static int	 addelem_tty(struct listinfo *, const char *);
@@ -411,14 +410,6 @@ main(int argc, char *argv[])
 	argv += optind;
 
 	/*
-	 * If the user specified ps -e then they want a copy of the process
-	 * environment kvm_getenvv(3) attempts to open /proc/<pid>/mem.
-	 * Check to make sure that procfs is mounted on /proc, otherwise
-	 * print a warning informing the user that output will be incomplete.
-	 */
-	if (needenv == 1 && check_procfs() == 0)
-		warnx("Process environment requires procfs(5)");
-	/*
 	 * If there arguments after processing all the options, attempt
 	 * to treat them as a list of process ids.
 	 */
@@ -1360,18 +1351,6 @@ kludge_oldps_options(const char *optlist
 	return (newopts);
 }
 
-static int
-check_procfs(void)
-{
-	struct statfs mnt;
-
-	if (statfs("/proc", &mnt) < 0)
-		return (0);
-	if (strcmp(mnt.f_fstypename, "procfs") != 0)
-		return (0);
-	return (1);
-}
-
 static void
 usage(void)
 {

Modified: projects/bhyve/bin/sh/eval.c
==============================================================================
--- projects/bhyve/bin/sh/eval.c	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/bin/sh/eval.c	Wed Jan  4 02:01:27 2012	(r229455)
@@ -89,7 +89,7 @@ int oexitstatus;		/* saved exit status *
 
 static void evalloop(union node *, int);
 static void evalfor(union node *, int);
-static void evalcase(union node *, int);
+static union node *evalcase(union node *, int);
 static void evalsubshell(union node *, int);
 static void evalredir(union node *, int);
 static void expredir(union node *);
@@ -256,7 +256,7 @@ evaltree(union node *n, int flags)
 			evalfor(n, flags & ~EV_EXIT);
 			break;
 		case NCASE:
-			evalcase(n, flags);
+			next = evalcase(n, flags);
 			break;
 		case NDEFUN:
 			defun(n->narg.text, n->narg.next);
@@ -343,8 +343,6 @@ evalfor(union node *n, int flags)
 	for (argp = n->nfor.args ; argp ; argp = argp->narg.next) {
 		oexitstatus = exitstatus;
 		expandarg(argp, &arglist, EXP_FULL | EXP_TILDE);
-		if (evalskip)
-			goto out;
 	}
 	*arglist.lastp = NULL;
 
@@ -364,13 +362,12 @@ evalfor(union node *n, int flags)
 		}
 	}
 	loopnest--;
-out:
 	popstackmark(&smark);
 }
 
 
 
-static void
+static union node *
 evalcase(union node *n, int flags)
 {
 	union node *cp;
@@ -383,26 +380,24 @@ evalcase(union node *n, int flags)
 	oexitstatus = exitstatus;
 	exitstatus = 0;
 	expandarg(n->ncase.expr, &arglist, EXP_TILDE);
-	for (cp = n->ncase.cases ; cp && evalskip == 0 ; cp = cp->nclist.next) {
+	for (cp = n->ncase.cases ; cp ; cp = cp->nclist.next) {
 		for (patp = cp->nclist.pattern ; patp ; patp = patp->narg.next) {
 			if (casematch(patp, arglist.list->text)) {
+				popstackmark(&smark);
 				while (cp->nclist.next &&
 				    cp->type == NCLISTFALLTHRU) {
-					if (evalskip != 0)
-						break;
 					evaltree(cp->nclist.body,
 					    flags & ~EV_EXIT);
+					if (evalskip != 0)
+						return (NULL);
 					cp = cp->nclist.next;
 				}
-				if (evalskip == 0) {
-					evaltree(cp->nclist.body, flags);
-				}
-				goto out;
+				return (cp->nclist.body);
 			}
 		}
 	}
-out:
 	popstackmark(&smark);
+	return (NULL);
 }
 
 
@@ -983,7 +978,6 @@ evalcommand(union node *cmd, int flags, 
 			memout.nextc = memout.buf;
 			memout.bufsize = 64;
 			mode |= REDIR_BACKQ;
-			cmdentry.special = 0;
 		}
 		savecmdname = commandname;
 		savetopfile = getcurrentfile();
@@ -1004,7 +998,7 @@ evalcommand(union node *cmd, int flags, 
 		 * If there is no command word, redirection errors should
 		 * not be fatal but assignment errors should.
 		 */
-		if (argc == 0 && !(flags & EV_BACKCMD))
+		if (argc == 0)
 			cmdentry.special = 1;
 		listsetvar(cmdenviron, cmdentry.special ? 0 : VNOSET);
 		if (argc > 0)

Modified: projects/bhyve/bin/sh/exec.c
==============================================================================
--- projects/bhyve/bin/sh/exec.c	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/bin/sh/exec.c	Wed Jan  4 02:01:27 2012	(r229455)
@@ -100,6 +100,7 @@ static void tryexec(char *, char **, cha
 static void printentry(struct tblentry *, int);
 static struct tblentry *cmdlookup(const char *, int);
 static void delete_cmd_entry(void);
+static void addcmdentry(const char *, struct cmdentry *);
 
 
 
@@ -593,7 +594,7 @@ delete_cmd_entry(void)
  * the same name.
  */
 
-void
+static void
 addcmdentry(const char *name, struct cmdentry *entry)
 {
 	struct tblentry *cmdp;

Modified: projects/bhyve/bin/sh/exec.h
==============================================================================
--- projects/bhyve/bin/sh/exec.h	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/bin/sh/exec.h	Wed Jan  4 02:01:27 2012	(r229455)
@@ -70,7 +70,6 @@ void find_command(const char *, struct c
 int find_builtin(const char *, int *);
 void hashcd(void);
 void changepath(const char *);
-void addcmdentry(const char *, struct cmdentry *);
 void defun(const char *, union node *);
 int unsetfunc(const char *);
 int typecmd_impl(int, char **, int, const char *);

Modified: projects/bhyve/bin/sh/expand.c
==============================================================================
--- projects/bhyve/bin/sh/expand.c	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/bin/sh/expand.c	Wed Jan  4 02:01:27 2012	(r229455)
@@ -113,6 +113,7 @@ static void expmeta(char *, char *);
 static void addfname(char *);
 static struct strlist *expsort(struct strlist *);
 static struct strlist *msort(struct strlist *, int);
+static int patmatch(const char *, const char *, int);
 static char *cvtnum(int, char *);
 static int collate_range_cmp(wchar_t, wchar_t);
 
@@ -1186,6 +1187,7 @@ expmeta(char *enddir, char *name)
 	int atend;
 	int matchdot;
 	int esc;
+	int namlen;
 
 	metaflag = 0;
 	start = name;
@@ -1284,17 +1286,22 @@ expmeta(char *enddir, char *name)
 		if (dp->d_name[0] == '.' && ! matchdot)
 			continue;
 		if (patmatch(start, dp->d_name, 0)) {
-			if (enddir + dp->d_namlen + 1 > expdir_end)
+			namlen = dp->d_namlen;
+			if (enddir + namlen + 1 > expdir_end)
 				continue;
-			memcpy(enddir, dp->d_name, dp->d_namlen + 1);
+			memcpy(enddir, dp->d_name, namlen + 1);
 			if (atend)
 				addfname(expdir);
 			else {
-				if (enddir + dp->d_namlen + 2 > expdir_end)
+				if (dp->d_type != DT_UNKNOWN &&
+				    dp->d_type != DT_DIR &&
+				    dp->d_type != DT_LNK)
 					continue;
-				enddir[dp->d_namlen] = '/';
-				enddir[dp->d_namlen + 1] = '\0';
-				expmeta(enddir + dp->d_namlen + 1, endname);
+				if (enddir + namlen + 2 > expdir_end)
+					continue;
+				enddir[namlen] = '/';
+				enddir[namlen + 1] = '\0';
+				expmeta(enddir + namlen + 1, endname);
 			}
 		}
 	}
@@ -1435,61 +1442,67 @@ match_charclass(const char *p, wchar_t c
  * Returns true if the pattern matches the string.
  */
 
-int
+static int
 patmatch(const char *pattern, const char *string, int squoted)
 {
 	const char *p, *q, *end;
+	const char *bt_p, *bt_q;
 	char c;
 	wchar_t wc, wc2;
 
 	p = pattern;
 	q = string;
+	bt_p = NULL;
+	bt_q = NULL;
 	for (;;) {
 		switch (c = *p++) {
 		case '\0':
-			goto breakloop;
+			if (*q != '\0')
+				goto backtrack;
+			return 1;
 		case CTLESC:
 			if (squoted && *q == CTLESC)
 				q++;
 			if (*q++ != *p++)
-				return 0;
+				goto backtrack;
 			break;
 		case CTLQUOTEMARK:
 			continue;
 		case '?':
 			if (squoted && *q == CTLESC)
 				q++;
-			if (localeisutf8)
+			if (*q == '\0')
+				return 0;
+			if (localeisutf8) {
 				wc = get_wc(&q);
-			else
+				/*
+				 * A '?' does not match invalid UTF-8 but a
+				 * '*' does, so backtrack.
+				 */
+				if (wc == 0)
+					goto backtrack;
+			} else
 				wc = (unsigned char)*q++;
-			if (wc == '\0')
-				return 0;
 			break;
 		case '*':
 			c = *p;
 			while (c == CTLQUOTEMARK || c == '*')
 				c = *++p;
-			if (c != CTLESC &&  c != CTLQUOTEMARK &&
-			    c != '?' && c != '*' && c != '[') {
-				while (*q != c) {
-					if (squoted && *q == CTLESC &&
-					    q[1] == c)
-						break;
-					if (*q == '\0')
-						return 0;
-					if (squoted && *q == CTLESC)
-						q++;
-					q++;
-				}
-			}
-			do {
-				if (patmatch(p, q, squoted))
-					return 1;
-				if (squoted && *q == CTLESC)
-					q++;
-			} while (*q++ != '\0');
-			return 0;
+			/*
+			 * If the pattern ends here, we know the string
+			 * matches without needing to look at the rest of it.
+			 */
+			if (c == '\0')
+				return 1;
+			/*
+			 * First try the shortest match for the '*' that
+			 * could work. We can forget any earlier '*' since
+			 * there is no way having it match more characters
+			 * can help us, given that we are already here.
+			 */
+			bt_p = p;
+			bt_q = q;
+			break;
 		case '[': {
 			const char *endp;
 			int invert, found;
@@ -1501,7 +1514,7 @@ patmatch(const char *pattern, const char
 			for (;;) {
 				while (*endp == CTLQUOTEMARK)
 					endp++;
-				if (*endp == '\0')
+				if (*endp == 0)
 					goto dft;		/* no matching ] */
 				if (*endp == CTLESC)
 					endp++;
@@ -1516,12 +1529,14 @@ patmatch(const char *pattern, const char
 			found = 0;
 			if (squoted && *q == CTLESC)
 				q++;
-			if (localeisutf8)
+			if (*q == '\0')
+				return 0;
+			if (localeisutf8) {
 				chr = get_wc(&q);
-			else
+				if (chr == 0)
+					goto backtrack;
+			} else
 				chr = (unsigned char)*q++;
-			if (chr == '\0')
-				return 0;
 			c = *p++;
 			do {
 				if (c == CTLQUOTEMARK)
@@ -1562,21 +1577,34 @@ patmatch(const char *pattern, const char
 				}
 			} while ((c = *p++) != ']');
 			if (found == invert)
-				return 0;
+				goto backtrack;
 			break;
 		}
 dft:	        default:
 			if (squoted && *q == CTLESC)
 				q++;
-			if (*q++ != c)
+			if (*q == '\0')
+				return 0;
+			if (*q++ == c)
+				break;
+backtrack:
+			/*
+			 * If we have a mismatch (other than hitting the end
+			 * of the string), go back to the last '*' seen and
+			 * have it match one additional character.
+			 */
+			if (bt_p == NULL)
+				return 0;
+			if (squoted && *bt_q == CTLESC)
+				bt_q++;
+			if (*bt_q == '\0')
 				return 0;
+			bt_q++;
+			p = bt_p;
+			q = bt_q;
 			break;
 		}
 	}
-breakloop:
-	if (*q != '\0')
-		return 0;
-	return 1;
 }
 
 

Modified: projects/bhyve/bin/sh/expand.h
==============================================================================
--- projects/bhyve/bin/sh/expand.h	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/bin/sh/expand.h	Wed Jan  4 02:01:27 2012	(r229455)
@@ -60,6 +60,5 @@ union node;
 void expandhere(union node *, int);
 void expandarg(union node *, struct arglist *, int);
 void expari(int);
-int patmatch(const char *, const char *, int);
 void rmescapes(char *);
 int casematch(union node *, const char *);

Modified: projects/bhyve/bin/sh/histedit.c
==============================================================================
--- projects/bhyve/bin/sh/histedit.c	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/bin/sh/histedit.c	Wed Jan  4 02:01:27 2012	(r229455)
@@ -70,6 +70,8 @@ int displayhist;
 static FILE *el_in, *el_out, *el_err;
 
 static char *fc_replace(const char *, char *, char *);
+static int not_fcnumber(const char *);
+static int str_to_event(const char *, int);
 
 /*
  * Set history and editing status.  Called whenever the status may
@@ -425,7 +427,7 @@ fc_replace(const char *s, char *p, char 
 	return (dest);
 }
 
-int
+static int
 not_fcnumber(const char *s)
 {
 	if (s == NULL)
@@ -435,7 +437,7 @@ not_fcnumber(const char *s)
 	return (!is_number(s));
 }
 
-int
+static int
 str_to_event(const char *str, int last)
 {
 	HistEvent he;

Modified: projects/bhyve/bin/sh/input.c
==============================================================================
--- projects/bhyve/bin/sh/input.c	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/bin/sh/input.c	Wed Jan  4 02:01:27 2012	(r229455)
@@ -106,6 +106,7 @@ EditLine *el;			/* cookie for editline p
 
 static void pushfile(void);
 static int preadfd(void);
+static void popstring(void);
 
 #ifdef mkinit
 INCLUDE "input.h"
@@ -372,7 +373,7 @@ pushstring(char *s, int len, void *ap)
 	INTON;
 }
 
-void
+static void
 popstring(void)
 {
 	struct strpush *sp = parsefile->strpush;

Modified: projects/bhyve/bin/sh/input.h
==============================================================================
--- projects/bhyve/bin/sh/input.h	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/bin/sh/input.h	Wed Jan  4 02:01:27 2012	(r229455)
@@ -53,7 +53,6 @@ int preadbuffer(void);
 int preadateof(void);
 void pungetc(void);
 void pushstring(char *, int, void *);
-void popstring(void);
 void setinputfile(const char *, int);
 void setinputfd(int, int);
 void setinputstring(char *, int);

Modified: projects/bhyve/bin/sh/main.c
==============================================================================
--- projects/bhyve/bin/sh/main.c	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/bin/sh/main.c	Wed Jan  4 02:01:27 2012	(r229455)
@@ -79,6 +79,7 @@ int rootshell;
 struct jmploc main_handler;
 int localeisutf8, initial_localeisutf8;
 
+static void cmdloop(int);
 static void read_profile(char *);
 static char *find_dot_file(char *);
 
@@ -184,7 +185,7 @@ state4:	/* XXX ??? - why isn't this befo
  * loop; it turns on prompting if the shell is interactive.
  */
 
-void
+static void
 cmdloop(int top)
 {
 	union node *n;

Modified: projects/bhyve/bin/sh/main.h
==============================================================================
--- projects/bhyve/bin/sh/main.h	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/bin/sh/main.h	Wed Jan  4 02:01:27 2012	(r229455)
@@ -38,4 +38,3 @@ extern int rootshell;	/* true if we aren
 extern struct jmploc main_handler;	/* top level exception handler */
 
 void readcmdfile(const char *);
-void cmdloop(int);

Modified: projects/bhyve/bin/sh/mksyntax.c
==============================================================================
--- projects/bhyve/bin/sh/mksyntax.c	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/bin/sh/mksyntax.c	Wed Jan  4 02:01:27 2012	(r229455)
@@ -219,16 +219,16 @@ main(int argc __unused, char **argv __un
 	add("`", "CBQUOTE");
 	add("$", "CVAR");
 	add("}", "CENDVAR");
-	/* ':/' for tilde expansion, '-' for [a\-x] pattern ranges */
-	add("!*?[=~:/-", "CCTL");
+	/* ':/' for tilde expansion, '-^]' for [a\-x] pattern ranges */
+	add("!*?[]=~:/-^", "CCTL");
 	print("dqsyntax");
 	init();
 	fputs("\n/* syntax table used when in single quotes */\n", cfile);
 	add("\n", "CNL");
 	add("\\", "CSBACK");
 	add("'", "CENDQUOTE");
-	/* ':/' for tilde expansion, '-' for [a\-x] pattern ranges */
-	add("!*?[=~:/-", "CCTL");
+	/* ':/' for tilde expansion, '-^]' for [a\-x] pattern ranges */
+	add("!*?[]=~:/-^", "CCTL");
 	print("sqsyntax");
 	init();
 	fputs("\n/* syntax table used when in arithmetic */\n", cfile);

Modified: projects/bhyve/bin/sh/myhistedit.h
==============================================================================
--- projects/bhyve/bin/sh/myhistedit.h	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/bin/sh/myhistedit.h	Wed Jan  4 02:01:27 2012	(r229455)
@@ -39,6 +39,4 @@ extern int displayhist;
 void histedit(void);
 void sethistsize(const char *);
 void setterm(const char *);
-int not_fcnumber(const char *);
-int str_to_event(const char *, int);
 

Modified: projects/bhyve/bin/sh/mystring.c
==============================================================================
--- projects/bhyve/bin/sh/mystring.c	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/bin/sh/mystring.c	Wed Jan  4 02:01:27 2012	(r229455)
@@ -43,7 +43,6 @@ __FBSDID("$FreeBSD$");
  *
  *	equal(s1, s2)		Return true if strings are equal.
  *	scopy(from, to)		Copy a string.
- *	scopyn(from, to, n)	Like scopy, but checks for overflow.
  *	number(s)		Convert a string of digits to an integer.
  *	is_number(s)		Return true if s is a string of digits.
  */
@@ -67,24 +66,6 @@ char nullstr[1];		/* zero length string 
 
 
 /*
- * scopyn - copy a string from "from" to "to", truncating the string
- *		if necessary.  "To" is always nul terminated, even if
- *		truncation is performed.  "Size" is the size of "to".
- */
-
-void
-scopyn(const char *from, char *to, int size)
-{
-
-	while (--size > 0) {
-		if ((*to++ = *from++) == '\0')
-			return;
-	}
-	*to = '\0';
-}
-
-
-/*
  * prefix -- see if pfx is a prefix of string.
  */
 

Modified: projects/bhyve/bin/sh/mystring.h
==============================================================================
--- projects/bhyve/bin/sh/mystring.h	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/bin/sh/mystring.h	Wed Jan  4 02:01:27 2012	(r229455)
@@ -35,7 +35,6 @@
 
 #include <string.h>
 
-void scopyn(const char *, char *, int);
 int prefix(const char *, const char *);
 int number(const char *);
 int is_number(const char *);

Modified: projects/bhyve/bin/stty/modes.c
==============================================================================
--- projects/bhyve/bin/stty/modes.c	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/bin/stty/modes.c	Wed Jan  4 02:01:27 2012	(r229455)
@@ -52,7 +52,7 @@ struct modes {
  * The code in optlist() depends on minus options following regular
  * options, i.e. "foo" must immediately precede "-foo".
  */
-struct modes cmodes[] = {
+static const struct modes cmodes[] = {
 	{ "cs5",	CS5, CSIZE },
 	{ "cs6",	CS6, CSIZE },
 	{ "cs7",	CS7, CSIZE },
@@ -94,7 +94,7 @@ struct modes cmodes[] = {
 	{ NULL,		0, 0 },
 };
 
-struct modes imodes[] = {
+static const struct modes imodes[] = {
 	{ "ignbrk",	IGNBRK, 0 },
 	{ "-ignbrk",	0, IGNBRK },
 	{ "brkint",	BRKINT, 0 },
@@ -130,7 +130,7 @@ struct modes imodes[] = {
 	{ NULL,		0, 0 },
 };
 
-struct modes lmodes[] = {
+static const struct modes lmodes[] = {
 	{ "echo",	ECHO, 0 },
 	{ "-echo",	0, ECHO },
 	{ "echoe",	ECHOE, 0 },
@@ -182,7 +182,7 @@ struct modes lmodes[] = {
 	{ NULL,		0, 0 },
 };
 
-struct modes omodes[] = {
+static const struct modes omodes[] = {
 	{ "opost",	OPOST, 0 },
 	{ "-opost",	0, OPOST },
 	{ "litout",	0, OPOST },
@@ -209,7 +209,7 @@ struct modes omodes[] = {
 int
 msearch(char ***argvp, struct info *ip)
 {
-	struct modes *mp;
+	const struct modes *mp;
 	char *name;
 
 	name = **argvp;

Modified: projects/bhyve/bin/test/test.c
==============================================================================
--- projects/bhyve/bin/test/test.c	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/bin/test/test.c	Wed Jan  4 02:01:27 2012	(r229455)
@@ -119,7 +119,7 @@ enum token_types {
 };
 
 static struct t_op {
-	const char *op_text;
+	char op_text[4];
 	short op_num, op_type;
 } const ops [] = {
 	{"-r",	FILRD,	UNOP},
@@ -162,7 +162,7 @@ static struct t_op {
 	{"-o",	BOR,	BBINOP},
 	{"(",	LPAREN,	PAREN},
 	{")",	RPAREN,	PAREN},
-	{0,	0,	0}
+	{"",	0,	0}
 };
 
 static struct t_op const *t_wp_op;
@@ -427,7 +427,7 @@ t_lex(char *s)
 		t_wp_op = NULL;
 		return EOI;
 	}
-	while (op->op_text) {
+	while (*op->op_text) {
 		if (strcmp(s, op->op_text) == 0) {
 			if (((op->op_type == UNOP || op->op_type == BUNOP)
 						&& isunopoperand()) ||
@@ -456,7 +456,7 @@ isunopoperand(void)
 	if (nargc == 2)
 		return parenlevel == 1 && strcmp(s, ")") == 0;
 	t = *(t_wp + 2);
-	while (op->op_text) {
+	while (*op->op_text) {
 		if (strcmp(s, op->op_text) == 0)
 			return op->op_type == BINOP &&
 			    (parenlevel == 0 || t[0] != ')' || t[1] != '\0');
@@ -478,7 +478,7 @@ islparenoperand(void)
 		return parenlevel == 1 && strcmp(s, ")") == 0;
 	if (nargc != 3)
 		return 0;
-	while (op->op_text) {
+	while (*op->op_text) {
 		if (strcmp(s, op->op_text) == 0)
 			return op->op_type == BINOP;
 		op++;

Modified: projects/bhyve/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
==============================================================================
--- projects/bhyve/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c	Wed Jan  4 02:01:27 2012	(r229455)
@@ -671,9 +671,12 @@ link_prog(dtrace_cmd_t *dcp)
 		p[0] = '\0'; /* strip .d suffix */
 		(void) snprintf(dcp->dc_ofile, sizeof (dcp->dc_ofile),
 		    "%s.o", basename(dcp->dc_arg));
+	} else if (g_cmdc > 1) {
+		(void) snprintf(dcp->dc_ofile, sizeof (dcp->dc_ofile),
+		    "d.out.%td", dcp - g_cmdv);
 	} else {
 		(void) snprintf(dcp->dc_ofile, sizeof (dcp->dc_ofile),
-		    g_cmdc > 1 ?  "%s.%d" : "%s", "d.out", (int)(dcp - g_cmdv));
+		    "d.out");
 	}
 
 	if (dtrace_program_link(g_dtp, dcp->dc_prog, DTRACE_D_PROBES,

Modified: projects/bhyve/cddl/contrib/opensolaris/cmd/zdb/zdb.8
==============================================================================
--- projects/bhyve/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Wed Jan  4 01:53:53 2012	(r229454)
+++ projects/bhyve/cddl/contrib/opensolaris/cmd/zdb/zdb.8	Wed Jan  4 02:01:27 2012	(r229455)
@@ -1,65 +1,79 @@
 '\" te
+.\" Copyright (c) 2011, Martin Matuska <mm@FreeBSD.org>.
+.\" All Rights Reserved.
+.\"
+.\" The contents of this file are subject to the terms of the
+.\" Common Development and Distribution License (the "License").
+.\" You may not use this file except in compliance with the License.
+.\"
+.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+.\" or http://www.opensolaris.org/os/licensing.
+.\" See the License for the specific language governing permissions
+.\" and limitations under the License.
+.\"
+.\" When distributing Covered Code, include this CDDL HEADER in each
+.\" file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+.\" If applicable, add the following below this CDDL HEADER, with the
+.\" fields enclosed by brackets "[]" replaced with your own identifying
+.\" information: Portions Copyright [yyyy] [name of copyright owner]
+.\"
 .\" Copyright (c) 2004, Sun Microsystems, Inc. All Rights Reserved.
-.\" The contents of this file are subject to the terms of the Common Development and Distribution License (the "License").  You may not use this file except in compliance with the License.
-.\" You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE or http://www.opensolaris.org/os/licensing.  See the License for the specific language governing permissions and limitations under the License.
-.\" When distributing Covered Code, include this CDDL HEADER in each file and include the License file at usr/src/OPENSOLARIS.LICENSE.  If applicable, add the following below this CDDL HEADER, with the fields enclosed by brackets "[]" replaced with your own identifying information: Portions Copyright [yyyy] [name of copyright owner]
-.\" Portions Copyright 2011 Martin Matuska <mm@FreeBSD.org>
-.TH ZDB 8 "Oct 31, 2005"

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

From owner-svn-src-projects@FreeBSD.ORG  Wed Jan  4 03:14:11 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 273271065672;
	Wed,  4 Jan 2012 03:14:11 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0FB4C8FC17;
	Wed,  4 Jan 2012 03:14:11 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q043EBxl057355;
	Wed, 4 Jan 2012 03:14:11 GMT (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q043EAWe057348;
	Wed, 4 Jan 2012 03:14:10 GMT (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201201040314.q043EAWe057348@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Wed, 4 Jan 2012 03:14:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229460 - in projects/nfsv4.1-client/sys/fs: nfs
	nfsclient
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Jan 2012 03:14:11 -0000

Author: rmacklem
Date: Wed Jan  4 03:14:10 2012
New Revision: 229460
URL: http://svn.freebsd.org/changeset/base/229460

Log:
  Add the function that does the GetDeviceInfo NFSv4.1 operation and
  stores the file layout in "struct nfsclfldevinfo". Also, add a function
  that can parse netaddr4 XDR structures for both IPv4 and IPv6, which
  is needed by nfsrpc_getdeviceinfo(). The nfsrpc_getdeviceinfo() function
  is not yet tested and it, plus "struct nfsclfldevinfo", could change.

Modified:
  projects/nfsv4.1-client/sys/fs/nfs/nfs_commonport.c
  projects/nfsv4.1-client/sys/fs/nfs/nfs_commonsubs.c
  projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h
  projects/nfsv4.1-client/sys/fs/nfs/nfsclstate.h
  projects/nfsv4.1-client/sys/fs/nfs/nfsport.h
  projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c

Modified: projects/nfsv4.1-client/sys/fs/nfs/nfs_commonport.c
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfs/nfs_commonport.c	Wed Jan  4 02:04:20 2012	(r229459)
+++ projects/nfsv4.1-client/sys/fs/nfs/nfs_commonport.c	Wed Jan  4 03:14:10 2012	(r229460)
@@ -105,6 +105,7 @@ MALLOC_DEFINE(M_NEWNFSDIROFF, "NFSCL dir
 MALLOC_DEFINE(M_NEWNFSDROLLBACK, "NFSD rollback",
     "New NFS local lock rollback");
 MALLOC_DEFINE(M_NEWNFSFLAYOUT, "NFSCL flayout", "NFSv4.1 File Layout");
+MALLOC_DEFINE(M_NEWNFSDEVINFO, "NFSCL devinfo", "NFSv4.1 Device Info");
 
 /*
  * Definition of mutex locks.

Modified: projects/nfsv4.1-client/sys/fs/nfs/nfs_commonsubs.c
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfs/nfs_commonsubs.c	Wed Jan  4 02:04:20 2012	(r229459)
+++ projects/nfsv4.1-client/sys/fs/nfs/nfs_commonsubs.c	Wed Jan  4 03:14:10 2012	(r229460)
@@ -3497,6 +3497,122 @@ newnfs_sndunlock(int *flagp)
 	NFSUNLOCKSOCK();
 }
 
+APPLESTATIC int
+nfsv4_getipaddr(struct nfsrv_descript *nd, struct sockaddr_storage *sa,
+    int *isudp)
+{
+	struct sockaddr_in *sad;
+	struct sockaddr_in6 *sad6;
+	struct in_addr saddr;
+	uint32_t portnum, *tl;
+	int af = 0, i, j, k;
+	char addr[64], protocol[5], *cp;
+	int cantparse = 0, error = 0;
+	uint16_t portv;
+
+	NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED);
+	i = fxdr_unsigned(int, *tl);
+	if (i >= 3 && i <= 4) {
+		error = nfsrv_mtostr(nd, protocol, i);
+		if (error)
+			goto nfsmout;
+		if (strcmp(protocol, "tcp") == 0) {
+			af = AF_INET;
+			*isudp = 0;
+		} else if (strcmp(protocol, "udp") == 0) {
+			af = AF_INET;
+			*isudp = 1;
+		} else if (strcmp(protocol, "tcp6") == 0) {
+			af = AF_INET6;
+			*isudp = 0;
+		} else if (strcmp(protocol, "udp6") == 0) {
+			af = AF_INET6;
+			*isudp = 1;
+		} else
+			cantparse = 1;
+	} else {
+		cantparse = 1;
+		if (i > 0) {
+			error = nfsm_advance(nd, NFSM_RNDUP(i), -1);
+			if (error)
+				goto nfsmout;
+		}
+	}
+	NFSM_DISSECT(tl, u_int32_t *, NFSX_UNSIGNED);
+	i = fxdr_unsigned(int, *tl);
+	if (i < 0) {
+		error = NFSERR_BADXDR;
+		goto nfsmout;
+	} else if (cantparse == 0 && i >= 11 && i < 64) {
+		/*
+		 * The shortest address is 11chars and the longest is < 64.
+		 */
+		error = nfsrv_mtostr(nd, addr, i);
+		if (error)
+			goto nfsmout;
+
+		/* Find the port# at the end and extract that. */
+		i = strlen(addr);
+		k = 0;
+		cp = &addr[i - 1];
+		/* Count back two '.'s from end to get port# field. */
+		for (j = 0; j < i; j++) {
+			if (*cp == '.') {
+				k++;
+				if (k == 2)
+					break;
+			}
+			cp--;
+		}
+		if (k == 2) {
+			/*
+			 * The NFSv4 port# is appended as .N.N, where N is
+			 * a decimal # in the range 0-255, just like an inet4
+			 * address. Cheat and use inet_aton(), which will
+			 * return a Class A address and then shift the high
+			 * order 8bits over to convert it to the port#.
+			 */
+			*cp++ = '\0';
+			if (inet_aton(cp, &saddr) == 1) {
+				portnum = ntohl(saddr.s_addr);
+				portv = (uint16_t)((portnum >> 16) |
+				    (portnum & 0xff));
+			} else
+				cantparse = 1;
+		} else
+			cantparse = 1;
+		if (cantparse == 0) {
+			if (af == AF_INET) {
+				sad = (struct sockaddr_in *)sa;
+				if (inet_pton(af, addr, &sad->sin_addr) == 1) {
+					sad->sin_len = sizeof(*sad);
+					sad->sin_family = AF_INET;
+					sad->sin_port = htons(portv);
+					return (0);
+				}
+			} else {
+				sad6 = (struct sockaddr_in6 *)sa;
+				if (inet_pton(af, addr, &sad6->sin6_addr)
+				    == 1) {
+					sad6->sin6_len = sizeof(*sad6);
+					sad6->sin6_family = AF_INET6;
+					sad6->sin6_port = htons(portv);
+					return (0);
+				}
+			}
+		}
+	} else {
+		if (i > 0) {
+			error = nfsm_advance(nd, NFSM_RNDUP(i), -1);
+			if (error)
+				goto nfsmout;
+		}
+	}
+	error = EPERM;
+nfsmout:
+	return (error);
+}
+
 /*
  * Handle an NFSv4.1 Sequence request for the session.
  */

Modified: projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h	Wed Jan  4 02:04:20 2012	(r229459)
+++ projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h	Wed Jan  4 03:14:10 2012	(r229460)
@@ -74,6 +74,7 @@ struct nfscllockowner;
 struct nfscllock;
 struct nfscldeleg;
 struct nfscllayout;
+struct nfsclfldevinfo;
 struct nfsv4lock;
 struct nfsvattr;
 struct nfs_vattr;
@@ -259,6 +260,8 @@ int nfsrv_mtostr(struct nfsrv_descript *
 int nfsrv_checkutf8(u_int8_t *, int);
 int newnfs_sndlock(int *);
 void newnfs_sndunlock(int *);
+int nfsv4_getipaddr(struct nfsrv_descript *, struct sockaddr_storage *,
+    int *);
 int nfsv4_seqsession(uint32_t, uint32_t, uint32_t, struct nfsslot *,
     struct mbuf **, uint16_t);
 void nfsv4_seqsess_cacherep(uint32_t, struct nfsslot *, struct mbuf *);
@@ -443,6 +446,8 @@ int nfsrpc_destroyclient(struct nfsmount
     struct ucred *, NFSPROC_T *);
 int nfsrpc_layoutget(vnode_t, int, uint64_t, uint64_t, uint64_t,
     struct nfscllayout *, struct ucred *, NFSPROC_T *, void *);
+int nfsrpc_getdeviceinfo(struct nfsmount *, uint8_t *, int, uint32_t *,
+    struct nfsclfldevinfo **, struct ucred *, NFSPROC_T *);
 
 /* nfs_clstate.c */
 int nfscl_open(vnode_t, u_int8_t *, int, u_int32_t, int,

Modified: projects/nfsv4.1-client/sys/fs/nfs/nfsclstate.h
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfs/nfsclstate.h	Wed Jan  4 02:04:20 2012	(r229459)
+++ projects/nfsv4.1-client/sys/fs/nfs/nfsclstate.h	Wed Jan  4 03:14:10 2012	(r229460)
@@ -232,6 +232,79 @@ struct nfsclflayout {
 };
 
 /*
+ * Stores the NFSv4.1 Device Info. Malloc'd to the correct length to
+ * store the list of indices and list of network addresses.
+ * nfsdi_data[] is allocated the following way:
+ * - nfsdi_addrcnt * struct sockaddr_storage
+ * - stripe indices, each stored as one byte, since there can be many
+ *   of them. (This implies a limit of 256 on nfsdi_addrcnt, since the
+ *   indices select which address. It is defined as uint64_t to ensure proper
+ *   alignment.)
+ */
+struct nfsclfldevinfo {
+	TAILQ_ENTRY(nfsclfldevinfo)	nfsdi_list;
+	LIST_ENTRY(nfsclfldevinfo)	nfsdi_hash;
+	uint8_t				nfsdi_deviceid[NFSX_V4DEVICEID];
+	struct nfsclclient		*nfsdi_clp;
+	uint16_t			nfsdi_stripecnt;
+	uint64_t			nfsdi_addrcnt;
+	uint8_t				nfsdi_data[1];
+};
+
+/* These inline functions return values from nfsdi_data[]. */
+/*
+ * Return a pointer to the address at "pos".
+ */
+static __inline void *
+nfsfldi_addr(struct nfsclfldevinfo *ndi, int pos)
+{
+
+	if (pos > ndi->nfsdi_addrcnt)
+		return (NULL);
+	return (&ndi->nfsdi_data[pos * sizeof(struct sockaddr_storage)]);
+}
+
+/*
+ * Return the Nth ("pos") stripe index.
+ */
+static __inline int
+nfsfldi_stripeindex(struct nfsclfldevinfo *ndi, int pos)
+{
+
+	if (pos > ndi->nfsdi_stripecnt)
+		return (-1);
+	return ((int)ndi->nfsdi_data[pos + ndi->nfsdi_addrcnt *
+	    sizeof(struct sockaddr_storage)]);
+}
+
+/*
+ * Set the Nth ("pos") stripe index to "val".
+ */
+static __inline void
+nfsfldi_setstripeindex(struct nfsclfldevinfo *ndi, int pos, uint8_t val)
+{
+
+	if (pos > ndi->nfsdi_stripecnt)
+		return;
+	ndi->nfsdi_data[pos + ndi->nfsdi_addrcnt *
+	    sizeof(struct sockaddr_storage)] = val;
+}
+
+/*
+ * Return a pointer to the address referred to by stripe index "pos".
+ */
+static __inline void *
+nfsfldi_stripeaddr(struct nfsclfldevinfo *ndi, int pos)
+{
+	int i;
+
+	i = nfsfldi_stripeindex(ndi, pos);
+	if (i < 0)
+		return (NULL);
+	return (nfsfldi_addr(ndi, i));
+}
+
+/*
  * Macro for incrementing the seqid#.
  */
 #define	NFSCL_INCRSEQID(s, n)	do { 					\

Modified: projects/nfsv4.1-client/sys/fs/nfs/nfsport.h
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfs/nfsport.h	Wed Jan  4 02:04:20 2012	(r229459)
+++ projects/nfsv4.1-client/sys/fs/nfs/nfsport.h	Wed Jan  4 03:14:10 2012	(r229460)
@@ -733,6 +733,7 @@ MALLOC_DECLARE(M_NEWNFSDIRECTIO);
 MALLOC_DECLARE(M_NEWNFSMNT);
 MALLOC_DECLARE(M_NEWNFSDROLLBACK);
 MALLOC_DECLARE(M_NEWNFSFLAYOUT);
+MALLOC_DECLARE(M_NEWNFSDEVINFO);
 #define	M_NFSRVCACHE	M_NEWNFSRVCACHE
 #define	M_NFSDCLIENT	M_NEWNFSDCLIENT
 #define	M_NFSDSTATE	M_NEWNFSDSTATE
@@ -753,6 +754,7 @@ MALLOC_DECLARE(M_NEWNFSFLAYOUT);
 #define	M_NFSDIRECTIO	M_NEWNFSDIRECTIO
 #define	M_NFSDROLLBACK	M_NEWNFSDROLLBACK
 #define	M_NFSFLAYOUT	M_NEWNFSFLAYOUT
+#define	M_NFSDEVINFO	M_NEWNFSDEVINFO
 
 #define	NFSINT_SIGMASK(set) 						\
 	(SIGISMEMBER(set, SIGINT) || SIGISMEMBER(set, SIGTERM) ||	\

Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c	Wed Jan  4 02:04:20 2012	(r229459)
+++ projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c	Wed Jan  4 03:14:10 2012	(r229460)
@@ -4593,3 +4593,144 @@ nfsmout:
 	return (error);
 }
 
+/*
+ * Do the NFSv4.1 Get Device Info.
+ */
+int
+nfsrpc_getdeviceinfo(struct nfsmount *nmp, uint8_t *deviceid, int layouttype,
+    uint32_t *notifybitsp, struct nfsclfldevinfo **ndip, struct ucred *cred,
+    NFSPROC_T *p)
+{
+	uint32_t cnt, *tl;
+	struct nfsrv_descript nfsd;
+	struct sockaddr_storage ss, *sa;
+	struct nfsrv_descript *nd = &nfsd;
+	struct nfsclfldevinfo *ndi;
+	int addrcnt, bitcnt, error, i, isudp, j, pos, safilled, stripecnt;
+	uint8_t stripeindex;
+
+	*ndip = NULL;
+	ndi = NULL;
+	nfscl_reqstart(nd, NFSPROC_GETDEVICEINFO, nmp, NULL, 0, NULL, NULL);
+	NFSM_BUILD(tl, uint32_t *, NFSX_V4DEVICEID + 3 * NFSX_UNSIGNED);
+	NFSBCOPY(deviceid, tl, NFSX_V4DEVICEID);
+	tl += (NFSX_V4DEVICEID / NFSX_UNSIGNED);
+	*tl++ = txdr_unsigned(layouttype);
+	*tl++ = txdr_unsigned(100000);
+	if (*notifybitsp != 0) {
+		*tl = txdr_unsigned(1);		/* One word of bits. */
+		NFSM_BUILD(tl, uint32_t *, NFSX_UNSIGNED);
+		*tl = txdr_unsigned(*notifybitsp);
+	} else
+		*tl = txdr_unsigned(0);
+	nd->nd_flag |= ND_USEGSSNAME;
+	error = newnfs_request(nd, nmp, NULL, &nmp->nm_sockreq, NULL, p, cred,
+	    NFS_PROG, NFS_VER4, NULL, 1, NULL, NULL);
+	if (error != 0)
+		return (error);
+	if (nd->nd_repstat == 0) {
+		NFSM_DISSECT(tl, uint32_t *, 3 * NFSX_UNSIGNED);
+		if (layouttype != fxdr_unsigned(int, *tl++))
+			printf("EEK! devinfo layout type not same!\n");
+		stripecnt = fxdr_unsigned(int, *++tl);
+		if (stripecnt < 1 || stripecnt > 4096) {
+			printf("NFS devinfo stripecnt %d: out of range\n",
+			    stripecnt);
+			error = NFSERR_BADXDR;
+			goto nfsmout;
+		}
+		NFSM_DISSECT(tl, uint32_t *, (stripecnt + 1) * NFSX_UNSIGNED);
+		addrcnt = fxdr_unsigned(int, *(tl + stripecnt));
+		if (addrcnt < 0 || addrcnt > 128) {
+			printf("NFS devinfo addrcnt %d: out of range\n",
+			    addrcnt);
+			error = NFSERR_BADXDR;
+			goto nfsmout;
+		}
+
+		/*
+		 * Now we know how many stripe indices and addresses, so
+		 * we can allocate the structure the correct size.
+		 */
+		ndi = malloc(sizeof(*ndi) + addrcnt *
+		    sizeof(struct sockaddr_storage) + stripecnt - 1,
+		    M_NFSDEVINFO, M_WAITOK);
+		NFSBCOPY(deviceid, ndi->nfsdi_deviceid, NFSX_V4DEVICEID);
+		ndi->nfsdi_stripecnt = stripecnt;
+		ndi->nfsdi_addrcnt = addrcnt;
+		/* Fill in the stripe indices. */
+		for (i = 0; i < stripecnt; i++) {
+			stripeindex = fxdr_unsigned(uint8_t, *tl++);
+			if (stripeindex >= addrcnt) {
+				printf("NFS devinfo stripeindex %d: too big\n",
+				    (int)stripeindex);
+				error = NFSERR_BADXDR;
+				goto nfsmout;
+			}
+			nfsfldi_setstripeindex(ndi, i, stripeindex);
+		}
+
+		/* Now, dissect the server address(es). */
+		for (i = 0; i < addrcnt; i++) {
+			NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED);
+			cnt = fxdr_unsigned(uint32_t, *tl);
+			if (cnt == 0) {
+				printf("NFS devinfo 0 len addrlist\n");
+				error = NFSERR_BADXDR;
+				goto nfsmout;
+			}
+			sa = nfsfldi_addr(ndi, i);
+			pos = arc4random() % cnt;	/* Choose one. */
+			safilled = 0;
+			for (j = 0; j < cnt; j++) {
+				error = nfsv4_getipaddr(nd, &ss, &isudp);
+				if (error != 0 && error != EPERM) {
+					error = NFSERR_BADXDR;
+					goto nfsmout;
+				}
+				if (error == 0 && isudp == 0) {
+					/*
+					 * The algorithm is:
+					 * - use "pos" entry if it is of the
+					 *   same af_family or none of them
+					 *   is of the same af_family
+					 * else
+					 * - use the first one of the same
+					 *   af_family.
+					 */
+					if ((safilled == 0 && ss.ss_family ==
+					     nmp->nm_nam->sa_family) ||
+					    (j == pos &&
+					     (safilled == 0 || ss.ss_family ==
+					      nmp->nm_nam->sa_family)) ||
+					    (safilled == 1 && ss.ss_family ==
+					     nmp->nm_nam->sa_family)) {
+						NFSBCOPY(&ss, sa, sizeof(ss));
+						if (ss.ss_family ==
+						    nmp->nm_nam->sa_family)
+							safilled = 2;
+						else
+							safilled = 1;
+					}
+				}
+			}
+		}
+
+		/* And the notify bits. */
+		NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED);
+		bitcnt = fxdr_unsigned(int, *tl);
+		if (bitcnt > 0) {
+			NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED);
+			*notifybitsp = fxdr_unsigned(uint32_t, *tl);
+		}
+		*ndip = ndi;
+	}
+	if (nd->nd_repstat != 0)
+		error = nd->nd_repstat;
+nfsmout:
+	if (error != 0 && ndi != NULL)
+		free(ndi, M_NFSDEVINFO);
+	mbuf_freem(nd->nd_mrep);
+	return (error);
+}
+

From owner-svn-src-projects@FreeBSD.ORG  Wed Jan  4 17:01:13 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 80357106564A;
	Wed,  4 Jan 2012 17:01:13 +0000 (UTC)
	(envelope-from sbruno@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6F26C8FC14;
	Wed,  4 Jan 2012 17:01:13 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q04H1Dlg088011;
	Wed, 4 Jan 2012 17:01:13 GMT (envelope-from sbruno@svn.freebsd.org)
Received: (from sbruno@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q04H1DHT088009;
	Wed, 4 Jan 2012 17:01:13 GMT (envelope-from sbruno@svn.freebsd.org)
Message-Id: <201201041701.q04H1DHT088009@svn.freebsd.org>
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Wed, 4 Jan 2012 17:01:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229507 - projects/bhyve/sys/dev/bvm
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 04 Jan 2012 17:01:13 -0000

Author: sbruno
Date: Wed Jan  4 17:01:12 2012
New Revision: 229507
URL: http://svn.freebsd.org/changeset/base/229507

Log:
  Update the byve console code with stubs for cngrab and cnungrab
  
  Reviewed by:	grehan@

Modified:
  projects/bhyve/sys/dev/bvm/bvm_console.c

Modified: projects/bhyve/sys/dev/bvm/bvm_console.c
==============================================================================
--- projects/bhyve/sys/dev/bvm/bvm_console.c	Wed Jan  4 16:51:04 2012	(r229506)
+++ projects/bhyve/sys/dev/bvm/bvm_console.c	Wed Jan  4 17:01:12 2012	(r229507)
@@ -77,6 +77,8 @@ static cn_init_t	bvm_cninit;
 static cn_term_t	bvm_cnterm;
 static cn_getc_t	bvm_cngetc;
 static cn_putc_t	bvm_cnputc;
+static cn_grab_t 	bvm_cngrab;
+static cn_ungrab_t 	bvm_cnungrab;
 
 CONSOLE_DRIVER(bvm);
 
@@ -225,4 +227,14 @@ bvm_cnputc(struct consdev *cp, int c)
 	bvm_wcons(c);
 }
 
+static void
+bvm_cngrab(struct consdev *cp)
+{
+}
+
+static void
+bvm_cnungrab(struct consdev *cp)
+{
+}
+
 SYSINIT(cndev, SI_SUB_CONFIGURE, SI_ORDER_MIDDLE, cn_drvinit, NULL);

From owner-svn-src-projects@FreeBSD.ORG  Thu Jan  5 02:16:56 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 190421065670;
	Thu,  5 Jan 2012 02:16:56 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F05FD8FC12;
	Thu,  5 Jan 2012 02:16:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q052GtOw009955;
	Thu, 5 Jan 2012 02:16:55 GMT (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q052GtW6009952;
	Thu, 5 Jan 2012 02:16:55 GMT (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201201050216.q052GtW6009952@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Thu, 5 Jan 2012 02:16:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229553 - in projects/nfsv4.1-client/sys/fs: nfs
	nfsclient
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Jan 2012 02:16:56 -0000

Author: rmacklem
Date: Thu Jan  5 02:16:55 2012
New Revision: 229553
URL: http://svn.freebsd.org/changeset/base/229553

Log:
  Fix up "struct nfsclfldevinfo" and the inline functions that use it.
  Basically, redefine nfsdi_data[] as an array of "struct sockaddr_storage"
  to avoid alignment/packing issues.

Modified:
  projects/nfsv4.1-client/sys/fs/nfs/nfsclstate.h
  projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c

Modified: projects/nfsv4.1-client/sys/fs/nfs/nfsclstate.h
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfs/nfsclstate.h	Thu Jan  5 02:05:15 2012	(r229552)
+++ projects/nfsv4.1-client/sys/fs/nfs/nfsclstate.h	Thu Jan  5 02:16:55 2012	(r229553)
@@ -233,13 +233,12 @@ struct nfsclflayout {
 
 /*
  * Stores the NFSv4.1 Device Info. Malloc'd to the correct length to
- * store the list of indices and list of network addresses.
+ * store the list of network addresses and list of indices.
  * nfsdi_data[] is allocated the following way:
  * - nfsdi_addrcnt * struct sockaddr_storage
  * - stripe indices, each stored as one byte, since there can be many
  *   of them. (This implies a limit of 256 on nfsdi_addrcnt, since the
- *   indices select which address. It is defined as uint64_t to ensure proper
- *   alignment.)
+ *   indices select which address.)
  */
 struct nfsclfldevinfo {
 	TAILQ_ENTRY(nfsclfldevinfo)	nfsdi_list;
@@ -247,21 +246,21 @@ struct nfsclfldevinfo {
 	uint8_t				nfsdi_deviceid[NFSX_V4DEVICEID];
 	struct nfsclclient		*nfsdi_clp;
 	uint16_t			nfsdi_stripecnt;
-	uint64_t			nfsdi_addrcnt;
-	uint8_t				nfsdi_data[1];
+	uint16_t			nfsdi_addrcnt;
+	struct sockaddr_storage		nfsdi_data[1];
 };
 
 /* These inline functions return values from nfsdi_data[]. */
 /*
  * Return a pointer to the address at "pos".
  */
-static __inline void *
+static __inline struct sockaddr_storage *
 nfsfldi_addr(struct nfsclfldevinfo *ndi, int pos)
 {
 
-	if (pos > ndi->nfsdi_addrcnt)
+	if (pos >= ndi->nfsdi_addrcnt)
 		return (NULL);
-	return (&ndi->nfsdi_data[pos * sizeof(struct sockaddr_storage)]);
+	return (&ndi->nfsdi_data[pos]);
 }
 
 /*
@@ -270,11 +269,13 @@ nfsfldi_addr(struct nfsclfldevinfo *ndi,
 static __inline int
 nfsfldi_stripeindex(struct nfsclfldevinfo *ndi, int pos)
 {
+	uint8_t *valp;
 
-	if (pos > ndi->nfsdi_stripecnt)
+	if (pos >= ndi->nfsdi_stripecnt)
 		return (-1);
-	return ((int)ndi->nfsdi_data[pos + ndi->nfsdi_addrcnt *
-	    sizeof(struct sockaddr_storage)]);
+	valp = (uint8_t *)&ndi->nfsdi_data[ndi->nfsdi_addrcnt];
+	valp += pos;
+	return ((int)*valp);
 }
 
 /*
@@ -283,25 +284,13 @@ nfsfldi_stripeindex(struct nfsclfldevinf
 static __inline void
 nfsfldi_setstripeindex(struct nfsclfldevinfo *ndi, int pos, uint8_t val)
 {
+	uint8_t *valp;
 
-	if (pos > ndi->nfsdi_stripecnt)
+	if (pos >= ndi->nfsdi_stripecnt)
 		return;
-	ndi->nfsdi_data[pos + ndi->nfsdi_addrcnt *
-	    sizeof(struct sockaddr_storage)] = val;
-}
-
-/*
- * Return a pointer to the address referred to by stripe index "pos".
- */
-static __inline void *
-nfsfldi_stripeaddr(struct nfsclfldevinfo *ndi, int pos)
-{
-	int i;
-
-	i = nfsfldi_stripeindex(ndi, pos);
-	if (i < 0)
-		return (NULL);
-	return (nfsfldi_addr(ndi, i));
+	valp = (uint8_t *)&ndi->nfsdi_data[ndi->nfsdi_addrcnt];
+	valp += pos;
+	*valp = val;
 }
 
 /*

Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c	Thu Jan  5 02:05:15 2012	(r229552)
+++ projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c	Thu Jan  5 02:16:55 2012	(r229553)
@@ -4652,8 +4652,9 @@ nfsrpc_getdeviceinfo(struct nfsmount *nm
 		 * Now we know how many stripe indices and addresses, so
 		 * we can allocate the structure the correct size.
 		 */
-		ndi = malloc(sizeof(*ndi) + addrcnt *
-		    sizeof(struct sockaddr_storage) + stripecnt - 1,
+		i = stripecnt / sizeof(struct sockaddr_storage) + 1;
+		ndi = malloc(sizeof(*ndi) + (addrcnt + i - 1) *
+		    sizeof(struct sockaddr_storage),
 		    M_NFSDEVINFO, M_WAITOK);
 		NFSBCOPY(deviceid, ndi->nfsdi_deviceid, NFSX_V4DEVICEID);
 		ndi->nfsdi_stripecnt = stripecnt;

From owner-svn-src-projects@FreeBSD.ORG  Thu Jan  5 03:22:21 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C044F106566B;
	Thu,  5 Jan 2012 03:22:21 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id ADD5F8FC08;
	Thu,  5 Jan 2012 03:22:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q053MLmt012347;
	Thu, 5 Jan 2012 03:22:21 GMT (envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q053MLkR012344;
	Thu, 5 Jan 2012 03:22:21 GMT (envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201201050322.q053MLkR012344@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Thu, 5 Jan 2012 03:22:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229555 - in projects/nfsv4.1-client/sys/fs: nfs
	nfsclient
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Jan 2012 03:22:21 -0000

Author: rmacklem
Date: Thu Jan  5 03:22:21 2012
New Revision: 229555
URL: http://svn.freebsd.org/changeset/base/229555

Log:
  Add functions that perform the LayoutCommit and LayoutReturn NFSv4.1
  pNFS operations. These functions are not yet tested and probably
  will change.

Modified:
  projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h
  projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c

Modified: projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h	Thu Jan  5 02:36:37 2012	(r229554)
+++ projects/nfsv4.1-client/sys/fs/nfs/nfs_var.h	Thu Jan  5 03:22:21 2012	(r229555)
@@ -448,6 +448,11 @@ int nfsrpc_layoutget(vnode_t, int, uint6
     struct nfscllayout *, struct ucred *, NFSPROC_T *, void *);
 int nfsrpc_getdeviceinfo(struct nfsmount *, uint8_t *, int, uint32_t *,
     struct nfsclfldevinfo **, struct ucred *, NFSPROC_T *);
+int nfsrpc_layoutcommit(vnode_t, off_t, uint64_t, int, nfsv4stateid_t *, int,
+    off_t, int, struct timespec, int, int, uint8_t *, int *, uint64_t *,
+    struct ucred *, NFSPROC_T *, void *);
+int nfsrpc_layoutreturn(vnode_t, int, int, int, int, off_t, uint64_t,
+    nfsv4stateid_t *, int, uint32_t *, struct ucred *, NFSPROC_T *, void *);
 
 /* nfs_clstate.c */
 int nfscl_open(vnode_t, u_int8_t *, int, u_int32_t, int,

Modified: projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c
==============================================================================
--- projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c	Thu Jan  5 02:36:37 2012	(r229554)
+++ projects/nfsv4.1-client/sys/fs/nfsclient/nfs_clrpcops.c	Thu Jan  5 03:22:21 2012	(r229555)
@@ -4735,3 +4735,143 @@ nfsmout:
 	return (error);
 }
 
+/*
+ * Do the NFSv4.1 LayoutCommit.
+ */
+int
+nfsrpc_layoutcommit(vnode_t vp, off_t offset, uint64_t len, int reclaim,
+    nfsv4stateid_t *stateidp, int newoff, off_t newoffset, int newtime,
+    struct timespec newtimespec, int layouttype, int layoutupdatecnt,
+    uint8_t *layp, int *sizechangedp, uint64_t *newsizep, struct ucred *cred,
+    NFSPROC_T *p, void *stuff)
+{
+	uint32_t *tl;
+	struct nfsrv_descript nfsd, *nd = &nfsd;
+	int error, outcnt, i;
+	uint8_t *cp;
+
+	NFSCL_REQSTART(nd, NFSPROC_LAYOUTCOMMIT, vp);
+	NFSM_BUILD(tl, uint32_t *, 2 * NFSX_UNSIGNED + 2 * NFSX_HYPER +
+	    NFSX_STATEID);
+	txdr_hyper(offset, tl);
+	tl += 2;
+	txdr_hyper(len, tl);
+	tl += 2;
+	if (reclaim != 0)
+		*tl++ = newnfs_true;
+	else
+		*tl++ = newnfs_false;
+	*tl++ = stateidp->seqid;
+	*tl++ = stateidp->other[0];
+	*tl++ = stateidp->other[1];
+	*tl++ = stateidp->other[2];
+	if (newoff != 0) {
+		*tl = newnfs_true;
+		NFSM_BUILD(tl, uint32_t *, NFSX_HYPER);
+		txdr_hyper(newoffset, tl);
+	} else
+		*tl = newnfs_false;
+	if (newtime != 0) {
+		NFSM_BUILD(tl, uint32_t *, NFSX_V4SETTIME + 2 * NFSX_UNSIGNED);
+		*tl++ = newnfs_true;
+		txdr_nfsv4time(&newtimespec, tl);
+		tl += NFSX_V4TIME / NFSX_UNSIGNED;
+	} else {
+		NFSM_BUILD(tl, uint32_t *, 3 * NFSX_UNSIGNED);
+		*tl++ = newnfs_false;
+	}
+	*tl++ = txdr_unsigned(layouttype);
+	*tl = txdr_unsigned(layoutupdatecnt);
+	if (layoutupdatecnt > 0) {
+		KASSERT(layouttype != NFSLAYOUT_NFSV4_1_FILES,
+		    ("Must be nil for Files Layout"));
+		outcnt = NFSM_RNDUP(layoutupdatecnt);
+		NFSM_BUILD(cp, uint8_t *, outcnt);
+		NFSBCOPY(layp, cp, layoutupdatecnt);
+		cp += layoutupdatecnt;
+		for (i = 0; i < (outcnt - layoutupdatecnt); i++)
+			*cp++ = 0x0;
+	}
+	nd->nd_flag |= ND_USEGSSNAME;
+	error = nfscl_request(nd, vp, p, cred, stuff);
+	if (error)
+		return (error);
+	if (nd->nd_repstat == 0) {
+		NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED);
+		if (*tl != 0) {
+			NFSM_DISSECT(tl, uint32_t *, NFSX_HYPER);
+			*sizechangedp = 1;
+			*newsizep = fxdr_hyper(tl);
+		} else
+			*sizechangedp = 0;
+	} else
+		error = nd->nd_repstat;
+nfsmout:
+	mbuf_freem(nd->nd_mrep);
+	return (error);
+}
+
+/*
+ * Do the NFSv4.1 LayoutReturn.
+ */
+int
+nfsrpc_layoutreturn(vnode_t vp, int reclaim, int layouttype, int iomode,
+    int layoutreturn, off_t offset, uint64_t len, nfsv4stateid_t *stateidp,
+    int layoutcnt, uint32_t *layp,
+    struct ucred *cred, NFSPROC_T *p, void *stuff)
+{
+	uint32_t *tl;
+	struct nfsrv_descript nfsd, *nd = &nfsd;
+	int error, outcnt, i;
+	uint8_t *cp;
+
+	NFSCL_REQSTART(nd, NFSPROC_LAYOUTRETURN, vp);
+	NFSM_BUILD(tl, uint32_t *, 4 * NFSX_UNSIGNED);
+	if (reclaim != 0)
+		*tl++ = newnfs_true;
+	else
+		*tl++ = newnfs_false;
+	*tl++ = txdr_unsigned(layouttype);
+	*tl++ = txdr_unsigned(iomode);
+	*tl = txdr_unsigned(layoutreturn);
+	if (layoutreturn == NFSLAYOUTRETURN_FILE) {
+		NFSM_BUILD(tl, uint32_t *, 2 * NFSX_HYPER + NFSX_STATEID +
+		    NFSX_UNSIGNED);
+		txdr_hyper(offset, tl);
+		tl += 2;
+		txdr_hyper(len, tl);
+		tl += 2;
+		*tl++ = stateidp->seqid;
+		*tl++ = stateidp->other[0];
+		*tl++ = stateidp->other[1];
+		*tl++ = stateidp->other[2];
+		*tl = txdr_unsigned(layoutcnt);
+		if (layoutcnt > 0) {
+			outcnt = NFSM_RNDUP(layoutcnt);
+			NFSM_BUILD(cp, uint8_t *, outcnt);
+			NFSBCOPY(layp, cp, layoutcnt);
+			cp += layoutcnt;
+			for (i = 0; i < (outcnt - layoutcnt); i++)
+				*cp++ = 0x0;
+		}
+	}
+	nd->nd_flag |= ND_USEGSSNAME;
+	error = nfscl_request(nd, vp, p, cred, stuff);
+	if (error)
+		return (error);
+	if (nd->nd_repstat == 0) {
+		NFSM_DISSECT(tl, uint32_t *, NFSX_UNSIGNED);
+		if (*tl != 0) {
+			NFSM_DISSECT(tl, uint32_t *, NFSX_STATEID);
+			stateidp->seqid = *tl++;
+			stateidp->other[0] = *tl++;
+			stateidp->other[1] = *tl++;
+			stateidp->other[2] = *tl;
+		}
+	} else
+		error = nd->nd_repstat;
+nfsmout:
+	mbuf_freem(nd->nd_mrep);
+	return (error);
+}
+

From owner-svn-src-projects@FreeBSD.ORG  Thu Jan  5 19:44:44 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BED951065672;
	Thu,  5 Jan 2012 19:44:44 +0000 (UTC) (envelope-from wxs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 959658FC18;
	Thu,  5 Jan 2012 19:44:44 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q05JiiNs052047;
	Thu, 5 Jan 2012 19:44:44 GMT (envelope-from wxs@svn.freebsd.org)
Received: (from wxs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q05Jiib3052046;
	Thu, 5 Jan 2012 19:44:44 GMT (envelope-from wxs@svn.freebsd.org)
Message-Id: <201201051944.q05Jiib3052046@svn.freebsd.org>
From: Wesley Shields <wxs@FreeBSD.org>
Date: Thu, 5 Jan 2012 19:44:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229629 - in projects/libpcap-update: . contrib
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Jan 2012 19:44:44 -0000

Author: wxs (ports committer)
Date: Thu Jan  5 19:44:44 2012
New Revision: 229629
URL: http://svn.freebsd.org/changeset/base/229629

Log:
  Create libpcap-update project.

Added:
  projects/libpcap-update/
  projects/libpcap-update/contrib/
     - copied from r229628, head/contrib/libpcap/
Directory Properties:
  projects/libpcap-update/contrib/libpcap/   (props changed)

From owner-svn-src-projects@FreeBSD.ORG  Thu Jan  5 19:45:53 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7A60410656B5;
	Thu,  5 Jan 2012 19:45:53 +0000 (UTC) (envelope-from wxs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4F7798FC15;
	Thu,  5 Jan 2012 19:45:53 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q05Jjrjh052124;
	Thu, 5 Jan 2012 19:45:53 GMT (envelope-from wxs@svn.freebsd.org)
Received: (from wxs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q05Jjrtx052122;
	Thu, 5 Jan 2012 19:45:53 GMT (envelope-from wxs@svn.freebsd.org)
Message-Id: <201201051945.q05Jjrtx052122@svn.freebsd.org>
From: Wesley Shields <wxs@FreeBSD.org>
Date: Thu, 5 Jan 2012 19:45:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229630 - projects/libpcap-update/contrib/tcpdump
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Jan 2012 19:45:53 -0000

Author: wxs (ports committer)
Date: Thu Jan  5 19:45:52 2012
New Revision: 229630
URL: http://svn.freebsd.org/changeset/base/229630

Log:
  Bring tcpdump into libpcap-update project.

Added:
     - copied from r229629, head/contrib/tcpdump/
Directory Properties:
  projects/libpcap-update/contrib/tcpdump/   (props changed)

From owner-svn-src-projects@FreeBSD.ORG  Thu Jan  5 19:46:56 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DAE631065680;
	Thu,  5 Jan 2012 19:46:56 +0000 (UTC) (envelope-from wxs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B03898FC1E;
	Thu,  5 Jan 2012 19:46:56 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q05JkuH0052186;
	Thu, 5 Jan 2012 19:46:56 GMT (envelope-from wxs@svn.freebsd.org)
Received: (from wxs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q05JkueR052185;
	Thu, 5 Jan 2012 19:46:56 GMT (envelope-from wxs@svn.freebsd.org)
Message-Id: <201201051946.q05JkueR052185@svn.freebsd.org>
From: Wesley Shields <wxs@FreeBSD.org>
Date: Thu, 5 Jan 2012 19:46:56 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229631 - projects/libpcap-update/lib
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Jan 2012 19:46:56 -0000

Author: wxs (ports committer)
Date: Thu Jan  5 19:46:56 2012
New Revision: 229631
URL: http://svn.freebsd.org/changeset/base/229631

Log:
  Bring libpcap build stuff in.

Added:
  projects/libpcap-update/lib/
     - copied from r229630, head/lib/libpcap/
Directory Properties:
  projects/libpcap-update/lib/libpcap/   (props changed)

From owner-svn-src-projects@FreeBSD.ORG  Thu Jan  5 19:47:55 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 36F75106566B;
	Thu,  5 Jan 2012 19:47:55 +0000 (UTC) (envelope-from wxs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 0C61E8FC21;
	Thu,  5 Jan 2012 19:47:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q05JlsaV052245;
	Thu, 5 Jan 2012 19:47:54 GMT (envelope-from wxs@svn.freebsd.org)
Received: (from wxs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q05JlsGj052243;
	Thu, 5 Jan 2012 19:47:54 GMT (envelope-from wxs@svn.freebsd.org)
Message-Id: <201201051947.q05JlsGj052243@svn.freebsd.org>
From: Wesley Shields <wxs@FreeBSD.org>
Date: Thu, 5 Jan 2012 19:47:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229632 - projects/libpcap-update/usr.sbin
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 05 Jan 2012 19:47:55 -0000

Author: wxs (ports committer)
Date: Thu Jan  5 19:47:54 2012
New Revision: 229632
URL: http://svn.freebsd.org/changeset/base/229632

Log:
  Bring tcpdump build stuff in.

Added:
  projects/libpcap-update/usr.sbin/
     - copied from r229631, head/usr.sbin/tcpdump/
Directory Properties:
  projects/libpcap-update/usr.sbin/tcpdump/   (props changed)

From owner-svn-src-projects@FreeBSD.ORG  Fri Jan  6 23:33:33 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E6547106567A;
	Fri,  6 Jan 2012 23:33:33 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D5BD88FC1F;
	Fri,  6 Jan 2012 23:33:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q06NXXHK013440;
	Fri, 6 Jan 2012 23:33:33 GMT (envelope-from gonzo@svn.freebsd.org)
Received: (from gonzo@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q06NXXB0013438;
	Fri, 6 Jan 2012 23:33:33 GMT (envelope-from gonzo@svn.freebsd.org)
Message-Id: <201201062333.q06NXXB0013438@svn.freebsd.org>
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Fri, 6 Jan 2012 23:33:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229743 - projects/armv6/sys/arm/arm
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 06 Jan 2012 23:33:34 -0000

Author: gonzo
Date: Fri Jan  6 23:33:33 2012
New Revision: 229743
URL: http://svn.freebsd.org/changeset/base/229743

Log:
  Unbreak build with VERBOSE_INIT_ARM enabled

Modified:
  projects/armv6/sys/arm/arm/pmap-v6.c

Modified: projects/armv6/sys/arm/arm/pmap-v6.c
==============================================================================
--- projects/armv6/sys/arm/arm/pmap-v6.c	Fri Jan  6 23:20:33 2012	(r229742)
+++ projects/armv6/sys/arm/arm/pmap-v6.c	Fri Jan  6 23:33:33 2012	(r229743)
@@ -3612,7 +3612,7 @@ pmap_map_chunk(vm_offset_t l1pt, vm_offs
 
 #ifdef VERBOSE_INIT_ARM
 	printf("pmap_map_chunk: pa=0x%x va=0x%x size=0x%x resid=0x%x "
-	    "prot=0x%x cache=%d\n", pa, va, size, resid, prot, cache);
+	    "prot=0x%x type=%d\n", pa, va, size, resid, prot, type);
 #endif
 
 	f1 = l1_mem_types[type];

From owner-svn-src-projects@FreeBSD.ORG  Sat Jan  7 00:15:02 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BF615106564A;
	Sat,  7 Jan 2012 00:15:02 +0000 (UTC)
	(envelope-from cognet@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AE9FB8FC08;
	Sat,  7 Jan 2012 00:15:02 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q070F2cc015148;
	Sat, 7 Jan 2012 00:15:02 GMT (envelope-from cognet@svn.freebsd.org)
Received: (from cognet@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q070F2R0015147;
	Sat, 7 Jan 2012 00:15:02 GMT (envelope-from cognet@svn.freebsd.org)
Message-Id: <201201070015.q070F2R0015147@svn.freebsd.org>
From: Olivier Houchard <cognet@FreeBSD.org>
Date: Sat, 7 Jan 2012 00:15:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r229750 - projects/armv6/sys/arm/include
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Jan 2012 00:15:02 -0000

Author: cognet
Date: Sat Jan  7 00:15:02 2012
New Revision: 229750
URL: http://svn.freebsd.org/changeset/base/229750

Log:
  Define ARM_ARCH_6 for arm11
  
  Submitted by:	dmarion

Modified:
  projects/armv6/sys/arm/include/cpuconf.h

Modified: projects/armv6/sys/arm/include/cpuconf.h
==============================================================================
--- projects/armv6/sys/arm/include/cpuconf.h	Sat Jan  7 00:11:36 2012	(r229749)
+++ projects/armv6/sys/arm/include/cpuconf.h	Sat Jan  7 00:15:02 2012	(r229750)
@@ -88,6 +88,12 @@
 #define	ARM_ARCH_5	0
 #endif
 
+#if defined(CPU_ARM11)
+#define ARM_ARCH_6	1
+#else
+#define ARM_ARCH_6	0
+#endif
+
 #if defined(CPU_CORTEXA)
 #define ARM_ARCH_7A	1
 #else