From owner-svn-src-projects@FreeBSD.ORG Sun Aug 18 04:22:14 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id F114F234; Sun, 18 Aug 2013 04:22:13 +0000 (UTC) (envelope-from bryanv@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D833A2D64; Sun, 18 Aug 2013 04:22:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7I4MDBn067822; Sun, 18 Aug 2013 04:22:13 GMT (envelope-from bryanv@svn.freebsd.org) Received: (from bryanv@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7I4MDvm067821; Sun, 18 Aug 2013 04:22:13 GMT (envelope-from bryanv@svn.freebsd.org) Message-Id: <201308180422.r7I4MDvm067821@svn.freebsd.org> From: Bryan Venteicher Date: Sun, 18 Aug 2013 04:22:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r254475 - projects/vmxnet/sys/dev/vmware/vmxnet3 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Aug 2013 04:22:14 -0000 Author: bryanv Date: Sun Aug 18 04:22:13 2013 New Revision: 254475 URL: http://svnweb.freebsd.org/changeset/base/254475 Log: Do not populate the second Rx ring unless the configuration makes sense (LRO is enabled or a large MTU). Modified: projects/vmxnet/sys/dev/vmware/vmxnet3/if_vmx.c Modified: projects/vmxnet/sys/dev/vmware/vmxnet3/if_vmx.c ============================================================================== --- projects/vmxnet/sys/dev/vmware/vmxnet3/if_vmx.c Sun Aug 18 01:29:57 2013 (r254474) +++ projects/vmxnet/sys/dev/vmware/vmxnet3/if_vmx.c Sun Aug 18 04:22:13 2013 (r254475) @@ -1649,6 +1649,10 @@ vmxnet3_newbuf(struct vmxnet3_softc *sc, } KASSERT(nsegs == 1, ("%s: mbuf %p with too many segments %d", __func__, m, nsegs)); +#if __FreeBSD_version < 902001 + if (btype == VMXNET3_BTYPE_BODY) + m->m_flags &= ~M_PKTHDR; +#endif if (rxb->vrxb_m != NULL) { bus_dmamap_sync(tag, rxb->vrxb_dmamap, BUS_DMASYNC_POSTREAD); @@ -2098,7 +2102,7 @@ vmxnet3_rxinit(struct vmxnet3_softc *sc, struct ifnet *ifp; struct vmxnet3_rxring *rxr; struct vmxnet3_comp_ring *rxc; - int i, idx, frame_size, error; + int i, npopulate, idx, frame_size, error; ifp = sc->vmx_ifp; frame_size = ifp->if_mtu + sizeof(struct ether_vlan_header); @@ -2106,22 +2110,30 @@ vmxnet3_rxinit(struct vmxnet3_softc *sc, /* * If the MTU causes us to exceed what a regular sized cluster * can handle, we allocate a second MJUMPAGESIZE cluster after - * it in ring 0. Ring 1 always contains MJUMPAGESIZE clusters. + * it in ring 0. If in use, ring 1 always contains MJUMPAGESIZE + * clusters. * * Keep rx_max_chain a divisor of the maximum Rx ring size to * to make our life easier. We do not support changing the ring * size after the attach. - * - * TODO If LRO is not enabled, there is little point of even - * populating the second ring. - * */ if (frame_size <= MCLBYTES) sc->vmx_rx_max_chain = 1; else sc->vmx_rx_max_chain = 2; - for (i = 0; i < VMXNET3_RXRINGS_PERQ; i++) { + /* + * Only populate ring 1 if the configuration will take advantage + * of it. That is either when LRO is enabled or the frame size + * exceeds what ring 0 can contain. + */ + if ((ifp->if_capenable & IFCAP_LRO) == 0 && + frame_size <= MCLBYTES + MJUMPAGESIZE) + npopulate = 1; + else + npopulate = VMXNET3_RXRINGS_PERQ; + + for (i = 0; i < npopulate; i++) { rxr = &rxq->vxrxq_cmd_ring[i]; rxr->vxrxr_fill = 0; rxr->vxrxr_gen = VMXNET3_INIT_GEN; @@ -2135,11 +2147,19 @@ vmxnet3_rxinit(struct vmxnet3_softc *sc, } } + for (/**/; i < VMXNET3_RXRINGS_PERQ; i++) { + rxr = &rxq->vxrxq_cmd_ring[i]; + rxr->vxrxr_fill = 0; + rxr->vxrxr_gen = 0; + bzero(rxr->vxrxr_rxd, + rxr->vxrxr_ndesc * sizeof(struct vmxnet3_rxdesc)); + } + rxc = &rxq->vxrxq_comp_ring; rxc->vxcr_next = 0; rxc->vxcr_gen = VMXNET3_INIT_GEN; bzero(rxc->vxcr_u.rxcd, - rxc->vxcr_ndesc * sizeof(struct vmxnet3_rxcompdesc)); + rxc->vxcr_ndesc * sizeof(struct vmxnet3_rxcompdesc)); return (0); } @@ -3023,7 +3043,6 @@ vmxnet3_setup_debug_sysctl(struct vmxnet "debug", CTLFLAG_RD, NULL, ""); list = SYSCTL_CHILDREN(node); - /* Assumes VMXNET3_RXRINGS_PERQ == 2. */ SYSCTL_ADD_UINT(ctx, list, OID_AUTO, "cmd0_fill", CTLFLAG_RD, &rxq->vxrxq_cmd_ring[0].vxrxr_fill, 0, ""); SYSCTL_ADD_UINT(ctx, list, OID_AUTO, "cmd0_ndesc", CTLFLAG_RD, From owner-svn-src-projects@FreeBSD.ORG Sun Aug 18 22:04:53 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 436C2ED4; Sun, 18 Aug 2013 22:04:53 +0000 (UTC) (envelope-from davide@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 16EFE2F6D; Sun, 18 Aug 2013 22:04:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7IM4qWW014892; Sun, 18 Aug 2013 22:04:52 GMT (envelope-from davide@svn.freebsd.org) Received: (from davide@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7IM4qeo014889; Sun, 18 Aug 2013 22:04:52 GMT (envelope-from davide@svn.freebsd.org) Message-Id: <201308182204.r7IM4qeo014889@svn.freebsd.org> From: Davide Italiano Date: Sun, 18 Aug 2013 22:04:52 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r254502 - projects/calloutng X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Aug 2013 22:04:53 -0000 Author: davide Date: Sun Aug 18 22:04:52 2013 New Revision: 254502 URL: http://svnweb.freebsd.org/changeset/base/254502 Log: Garbage collect the old calloutng repository, now that everything was committed to HEAD. Thanks to Peter Wemm who pointed out to me the existence of 'svn delete'. Deleted: projects/calloutng/ From owner-svn-src-projects@FreeBSD.ORG Sun Aug 18 22:20:54 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id BAC422FC; Sun, 18 Aug 2013 22:20:54 +0000 (UTC) (envelope-from davide@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8E75D2028; Sun, 18 Aug 2013 22:20:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7IMKsqN072095; Sun, 18 Aug 2013 22:20:54 GMT (envelope-from davide@svn.freebsd.org) Received: (from davide@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7IMKsNd072092; Sun, 18 Aug 2013 22:20:54 GMT (envelope-from davide@svn.freebsd.org) Message-Id: <201308182220.r7IMKsNd072092@svn.freebsd.org> From: Davide Italiano Date: Sun, 18 Aug 2013 22:20:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r254503 - projects/umtx X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Aug 2013 22:20:54 -0000 Author: davide Date: Sun Aug 18 22:20:53 2013 New Revision: 254503 URL: http://svnweb.freebsd.org/changeset/base/254503 Log: Create a branch for umtx adaptive spinning implementation. Added: - copied from r254502, head/ Directory Properties: projects/umtx/ (props changed) From owner-svn-src-projects@FreeBSD.ORG Sun Aug 18 23:12:18 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id DCEB0FFA; Sun, 18 Aug 2013 23:12:18 +0000 (UTC) (envelope-from davide@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C909422C3; Sun, 18 Aug 2013 23:12:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7INCIuI039252; Sun, 18 Aug 2013 23:12:18 GMT (envelope-from davide@svn.freebsd.org) Received: (from davide@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7INCGbB039132; Sun, 18 Aug 2013 23:12:16 GMT (envelope-from davide@svn.freebsd.org) Message-Id: <201308182312.r7INCGbB039132@svn.freebsd.org> From: Davide Italiano Date: Sun, 18 Aug 2013 23:12:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r254504 - in projects/umtx: include sys/conf sys/kern sys/sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Aug 2013 23:12:18 -0000 Author: davide Date: Sun Aug 18 23:12:16 2013 New Revision: 254504 URL: http://svnweb.freebsd.org/changeset/base/254504 Log: Introduce a facility to share the thread state between kernel and userland. The API is the same of Solaris' schedctl(), even though the implementation is probably different. There are still some rough edges (e.g. structures are not cleaned up upon thread exit/proc exit) but I'll have some patches to address them and I'm going to fix in the next days after some testing. Discussed with: kib, attilio Modified: projects/umtx/include/unistd.h projects/umtx/sys/conf/files projects/umtx/sys/kern/init_sysent.c projects/umtx/sys/kern/sched_ule.c projects/umtx/sys/kern/syscalls.c projects/umtx/sys/kern/syscalls.master projects/umtx/sys/kern/systrace_args.c projects/umtx/sys/sys/proc.h projects/umtx/sys/sys/syscall.h projects/umtx/sys/sys/syscall.mk projects/umtx/sys/sys/sysproto.h Modified: projects/umtx/include/unistd.h ============================================================================== --- projects/umtx/include/unistd.h Sun Aug 18 22:20:53 2013 (r254503) +++ projects/umtx/include/unistd.h Sun Aug 18 23:12:16 2013 (r254504) @@ -534,6 +534,7 @@ char *mktemp(char *); #endif int nfssvc(int, void *); int nlm_syscall(int, int, int, char **); +caddr_t schedctl(void); int pipe2(int *, int); int profil(char *, size_t, vm_offset_t, int); int rcmd(char **, int, const char *, const char *, const char *, int *); Modified: projects/umtx/sys/conf/files ============================================================================== --- projects/umtx/sys/conf/files Sun Aug 18 22:20:53 2013 (r254503) +++ projects/umtx/sys/conf/files Sun Aug 18 23:12:16 2013 (r254504) @@ -2811,6 +2811,7 @@ kern/kern_rctl.c standard kern/kern_resource.c standard kern/kern_rmlock.c standard kern/kern_rwlock.c standard +kern/kern_schedctl.c standard kern/kern_sdt.c optional kdtrace_hooks kern/kern_sema.c standard kern/kern_sharedpage.c standard Modified: projects/umtx/sys/kern/init_sysent.c ============================================================================== --- projects/umtx/sys/kern/init_sysent.c Sun Aug 18 22:20:53 2013 (r254503) +++ projects/umtx/sys/kern/init_sysent.c Sun Aug 18 23:12:16 2013 (r254504) @@ -578,4 +578,5 @@ struct sysent sysent[] = { { AS(accept4_args), (sy_call_t *)sys_accept4, AUE_ACCEPT, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 541 = accept4 */ { AS(pipe2_args), (sy_call_t *)sys_pipe2, AUE_PIPE, NULL, 0, 0, SYF_CAPENABLED, SY_THR_STATIC }, /* 542 = pipe2 */ { AS(aio_mlock_args), (sy_call_t *)lkmressys, AUE_NULL, NULL, 0, 0, 0, SY_THR_ABSENT }, /* 543 = aio_mlock */ + { 0, (sy_call_t *)sys_schedctl, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 544 = schedctl */ }; Modified: projects/umtx/sys/kern/sched_ule.c ============================================================================== --- projects/umtx/sys/kern/sched_ule.c Sun Aug 18 22:20:53 2013 (r254503) +++ projects/umtx/sys/kern/sched_ule.c Sun Aug 18 23:12:16 2013 (r254504) @@ -25,7 +25,7 @@ */ /* - * This file implements the ULE scheduler. ULE supports independent CPU + * This file implements the ULE Scheduler. ULE supports independent CPU * run queues and fine grain locking. It has superior interactive * performance under load even on uni-processor systems. * @@ -1944,7 +1944,8 @@ sched_switch(struct thread *td, struct t if (dtrace_vtime_active) (*dtrace_vtime_switch_func)(newtd); #endif - + if (td->td_schedctl != NULL) + td->td_schedctl->sh_state = STATE_OFFCPU; cpu_switch(td, newtd, mtx); /* * We may return from cpu_switch on a different cpu. However, @@ -1971,6 +1972,8 @@ sched_switch(struct thread *td, struct t TDQ_LOCK_ASSERT(tdq, MA_OWNED|MA_NOTRECURSED); MPASS(td->td_lock == TDQ_LOCKPTR(tdq)); td->td_oncpu = cpuid; + if (td->td_schedctl != NULL) + td->td_schedctl->sh_state = STATE_ONCPU; } /* Modified: projects/umtx/sys/kern/syscalls.c ============================================================================== --- projects/umtx/sys/kern/syscalls.c Sun Aug 18 22:20:53 2013 (r254503) +++ projects/umtx/sys/kern/syscalls.c Sun Aug 18 23:12:16 2013 (r254504) @@ -551,4 +551,5 @@ const char *syscallnames[] = { "accept4", /* 541 = accept4 */ "pipe2", /* 542 = pipe2 */ "aio_mlock", /* 543 = aio_mlock */ + "schedctl", /* 544 = schedctl */ }; Modified: projects/umtx/sys/kern/syscalls.master ============================================================================== --- projects/umtx/sys/kern/syscalls.master Sun Aug 18 22:20:53 2013 (r254503) +++ projects/umtx/sys/kern/syscalls.master Sun Aug 18 23:12:16 2013 (r254504) @@ -978,5 +978,6 @@ int flags); } 542 AUE_PIPE STD { int pipe2(int *fildes, int flags); } 543 AUE_NULL NOSTD { int aio_mlock(struct aiocb *aiocbp); } +544 AUE_NULL STD { caddr_t schedctl(void); } ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master Modified: projects/umtx/sys/kern/systrace_args.c ============================================================================== --- projects/umtx/sys/kern/systrace_args.c Sun Aug 18 22:20:53 2013 (r254503) +++ projects/umtx/sys/kern/systrace_args.c Sun Aug 18 23:12:16 2013 (r254504) @@ -3383,6 +3383,11 @@ systrace_args(int sysnum, void *params, *n_args = 1; break; } + /* schedctl */ + case 544: { + *n_args = 0; + break; + } default: *n_args = 0; break; @@ -9012,6 +9017,9 @@ systrace_entry_setargdesc(int sysnum, in break; }; break; + /* schedctl */ + case 544: + break; default: break; }; @@ -10960,6 +10968,8 @@ systrace_return_setargdesc(int sysnum, i if (ndx == 0 || ndx == 1) p = "int"; break; + /* schedctl */ + case 544: default: break; }; Modified: projects/umtx/sys/sys/proc.h ============================================================================== --- projects/umtx/sys/sys/proc.h Sun Aug 18 22:20:53 2013 (r254503) +++ projects/umtx/sys/sys/proc.h Sun Aug 18 23:12:16 2013 (r254504) @@ -53,6 +53,7 @@ #include /* XXX. */ #include #include +#include #include #include #include @@ -275,6 +276,8 @@ struct thread { u_int td_vp_reserv; /* (k) Count of reserved vnodes. */ int td_no_sleeping; /* (k) Sleeping disabled count. */ int td_dom_rr_idx; /* (k) RR Numa domain selection. */ + shstate_t *td_schedctl; /* (k) Schedctl informations. */ + shstate_t *td_usrschedctl; #define td_endzero td_sigmask /* Copied during fork1() or create_thread(). */ @@ -546,6 +549,7 @@ struct proc { int p_pendingcnt; /* how many signals are pending */ struct itimers *p_itimers; /* (c) POSIX interval timers. */ struct procdesc *p_procdesc; /* (e) Process descriptor, if any. */ + SLIST_HEAD(, page_shared) p_shpg; /* List of shared pages, if any. */ /* End area that is zeroed on creation. */ #define p_endzero p_magic Modified: projects/umtx/sys/sys/syscall.h ============================================================================== --- projects/umtx/sys/sys/syscall.h Sun Aug 18 22:20:53 2013 (r254503) +++ projects/umtx/sys/sys/syscall.h Sun Aug 18 23:12:16 2013 (r254504) @@ -463,4 +463,5 @@ #define SYS_accept4 541 #define SYS_pipe2 542 #define SYS_aio_mlock 543 -#define SYS_MAXSYSCALL 544 +#define SYS_schedctl 544 +#define SYS_MAXSYSCALL 545 Modified: projects/umtx/sys/sys/syscall.mk ============================================================================== --- projects/umtx/sys/sys/syscall.mk Sun Aug 18 22:20:53 2013 (r254503) +++ projects/umtx/sys/sys/syscall.mk Sun Aug 18 23:12:16 2013 (r254504) @@ -411,4 +411,5 @@ MIASM = \ chflagsat.o \ accept4.o \ pipe2.o \ - aio_mlock.o + aio_mlock.o \ + schedctl.o Modified: projects/umtx/sys/sys/sysproto.h ============================================================================== --- projects/umtx/sys/sys/sysproto.h Sun Aug 18 22:20:53 2013 (r254503) +++ projects/umtx/sys/sys/sysproto.h Sun Aug 18 23:12:16 2013 (r254504) @@ -1815,6 +1815,9 @@ struct pipe2_args { struct aio_mlock_args { char aiocbp_l_[PADL_(struct aiocb *)]; struct aiocb * aiocbp; char aiocbp_r_[PADR_(struct aiocb *)]; }; +struct schedctl_args { + register_t dummy; +}; int nosys(struct thread *, struct nosys_args *); void sys_sys_exit(struct thread *, struct sys_exit_args *); int sys_fork(struct thread *, struct fork_args *); @@ -2208,6 +2211,7 @@ int sys_chflagsat(struct thread *, struc int sys_accept4(struct thread *, struct accept4_args *); int sys_pipe2(struct thread *, struct pipe2_args *); int sys_aio_mlock(struct thread *, struct aio_mlock_args *); +int sys_schedctl(struct thread *, struct schedctl_args *); #ifdef COMPAT_43 @@ -2915,6 +2919,7 @@ int freebsd7_shmctl(struct thread *, str #define SYS_AUE_accept4 AUE_ACCEPT #define SYS_AUE_pipe2 AUE_PIPE #define SYS_AUE_aio_mlock AUE_NULL +#define SYS_AUE_schedctl AUE_NULL #undef PAD_ #undef PADL_ From owner-svn-src-projects@FreeBSD.ORG Sun Aug 18 23:15:30 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1A646198; Sun, 18 Aug 2013 23:15:30 +0000 (UTC) (envelope-from davide@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0620F22D9; Sun, 18 Aug 2013 23:15:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7INFTSk048609; Sun, 18 Aug 2013 23:15:29 GMT (envelope-from davide@svn.freebsd.org) Received: (from davide@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7INFTiu048598; Sun, 18 Aug 2013 23:15:29 GMT (envelope-from davide@svn.freebsd.org) Message-Id: <201308182315.r7INFTiu048598@svn.freebsd.org> From: Davide Italiano Date: Sun, 18 Aug 2013 23:15:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r254505 - in projects/umtx/sys: kern sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Aug 2013 23:15:30 -0000 Author: davide Date: Sun Aug 18 23:15:29 2013 New Revision: 254505 URL: http://svnweb.freebsd.org/changeset/base/254505 Log: Commit the actual schedctl() implementation. Added: projects/umtx/sys/kern/kern_schedctl.c projects/umtx/sys/sys/schedctl.h Added: projects/umtx/sys/kern/kern_schedctl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/umtx/sys/kern/kern_schedctl.c Sun Aug 18 23:15:29 2013 (r254505) @@ -0,0 +1,195 @@ +/*- + * Copyright (c) 2013 Davide Italiano + * 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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +static uma_zone_t shpage_zone; /* Zone from which allocate structures */ +static size_t avail_pagesize; /* size of usable page on page */ +static size_t bitmap_len; /* # of bits in allocation bitmap */ + +/* + * Public prototypes. + */ +int schedctl(struct thread *td, struct schedctl_args *uap); + +static int +schedctl_alloc_page(struct proc *p, shpage_t **ret) +{ + vm_map_t map; + vm_page_t m; + shpage_t *spg; + int error; + + spg = uma_zalloc(shpage_zone, M_ZERO | M_WAITOK); + spg->bitmap = ~0; + spg->available = bitmap_len; + + spg->shared_page_obj = vm_pager_allocate(OBJT_PHYS, 0, PAGE_SIZE, + VM_PROT_DEFAULT, 0, NULL); + VM_OBJECT_WLOCK(spg->shared_page_obj); + m = vm_page_grab(spg->shared_page_obj, 0, VM_ALLOC_RETRY | + VM_ALLOC_NOBUSY | VM_ALLOC_ZERO); + m->valid = VM_PAGE_BITS_ALL; + VM_OBJECT_WUNLOCK(spg->shared_page_obj); + spg->pageaddr = kva_alloc(PAGE_SIZE); + pmap_qenter(spg->pageaddr, &m, 1); + + /* Map in userspace */ + PROC_LOCK(p); + SLIST_INSERT_HEAD(&(p->p_shpg), spg, pg_next); + PROC_UNLOCK(p); + map = &p->p_vmspace->vm_map; + vm_object_reference(spg->shared_page_obj); + + /* XXX: is really VMFS_ANY_SPACE the right policy? */ + error = vm_map_find(map, spg->shared_page_obj, 0, &spg->usraddr, + PAGE_SIZE, VMFS_ANY_SPACE, VM_PROT_READ | VM_PROT_WRITE, + VM_PROT_READ | VM_PROT_WRITE, 0); + if (error) { + vm_object_deallocate(spg->shared_page_obj); + return (error); + } + *ret = spg; + return (0); +} + +static int +schedctl_bmp_findfirst(shpage_t *shpg) +{ + int idx; + + /* Find first bit set in the bitmap */ + idx = ffsl(shpg->bitmap) - 1; + if (idx > bitmap_len) + return (-1); + shpg->available--; + clrbit(&(shpg->bitmap), idx); + return (idx); +} + +static int +schedctl_shared_alloc(struct thread *td, vm_offset_t *usroff, + vm_offset_t *krnoff) +{ + struct proc *p; + shpage_t *sh_pg; + u_int idx; + int error; + + sh_pg = NULL; + p = curproc; + KASSERT(p != NULL, ("proc should never be NULL")); + if (!SLIST_EMPTY(&(p->p_shpg))) { + + /* + * Iterate over the set of shared pages allocated for the process. + * If this process hasn't pages allocated or they're all completely + * full, allocate a new one. + */ + SLIST_FOREACH(sh_pg, &(p->p_shpg), pg_next) { + KASSERT(sh_pg->available >= 0, ("invalid shared page counter")); + if (sh_pg->available > 0) + break; + } + } + if (sh_pg == NULL) { + error = schedctl_alloc_page(p, &sh_pg); + if (error != 0) + return (ENOMEM); + } + + /* Now were's (mostly) sure there's room for allocation. */ + KASSERT(sh_pg != NULL && sh_pg->available > 0, + ("schedctl_page_alloc: null shpg")); + idx = schedctl_bmp_findfirst(sh_pg); + KASSERT(idx != -1, ("schedctl_page_alloc: invalid bitmap index")); + *usroff = sh_pg->usraddr + (sizeof(shstate_t) * idx); + *krnoff = sh_pg->pageaddr + (sizeof(shstate_t) * idx); + return (0); +} + +static void +kern_schedctl(struct thread *td) +{ + vm_offset_t usroff, krnoff; + + if (td->td_schedctl == NULL) { + if (schedctl_shared_alloc(td, &usroff, &krnoff) != 0) + panic("schedctl: impossible set structure for thread"); + td->td_schedctl = (shstate_t *)krnoff; + td->td_schedctl->sh_state = STATE_ONCPU; + td->td_usrschedctl = (shstate_t *)usroff; + } +} + +int +sys_schedctl(struct thread *td, struct schedctl_args *uap) +{ + + KASSERT(td != NULL, ("td should never be NULL")); + kern_schedctl(td); + td->td_retval[0] = (register_t)(td->td_usrschedctl); + return (0); +} + +void +schedctl_init(void) +{ + + avail_pagesize = PAGE_SIZE - (PAGE_SIZE % sizeof(shstate_t)); + bitmap_len = avail_pagesize / sizeof(shstate_t); + shpage_zone = uma_zcreate("schedctl structures", sizeof(shpage_t), NULL, + NULL, NULL, NULL, 0, 0); +} + +/* + * XXX: SI_SUB_KMEM is the right place to call schedctl_init? + */ +SYSINIT(schedctl, SI_SUB_KMEM, SI_ORDER_ANY, schedctl_init, NULL); Added: projects/umtx/sys/sys/schedctl.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/umtx/sys/sys/schedctl.h Sun Aug 18 23:15:29 2013 (r254505) @@ -0,0 +1,72 @@ +/*- + * Copyright (c) 2013 Davide Italiano + * 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. + */ + +#ifndef _SYS_SCHEDCTL_H_ +#define _SYS_SCHEDCTL_H_ + +#include +#include + +#include +#include +#include +#include +#include +#include + +/* + * Thread possible states. + */ +#define STATE_FREE 0x01 +#define STATE_ONCPU 0x02 +#define STATE_OFFCPU 0x04 + +/* XXX: what is the proper 'pad' size? */ +struct state_shared { + volatile int sh_state; + char pad[CACHE_LINE_SIZE - sizeof(int)]; +} __aligned(CACHE_LINE_SIZE); + +struct page_shared { + long bitmap; + int available; + vm_object_t shared_page_obj; + vm_offset_t pageaddr; + vm_offset_t usraddr; + SLIST_ENTRY(page_shared) pg_next; +}; + +typedef struct state_shared shstate_t; +typedef struct page_shared shpage_t; + +/* + * Function prototypes. + */ +void schedctl_init(void); +void schedctl_thread_cleanup(struct thread *); +void schedctl_proc_cleanup(void); + +#endif /* _SYS_SCHEDCTL_H_ */ From owner-svn-src-projects@FreeBSD.ORG Mon Aug 19 18:58:00 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 2A6E8152; Mon, 19 Aug 2013 18:58:00 +0000 (UTC) (envelope-from neel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 09B9321FF; Mon, 19 Aug 2013 18:58:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7JIvxo8092090; Mon, 19 Aug 2013 18:57:59 GMT (envelope-from neel@svn.freebsd.org) Received: (from neel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7JIvwHc092084; Mon, 19 Aug 2013 18:57:58 GMT (envelope-from neel@svn.freebsd.org) Message-Id: <201308191857.r7JIvwHc092084@svn.freebsd.org> From: Neel Natu Date: Mon, 19 Aug 2013 18:57:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r254540 - in projects/bhyve_npt_pmap: lib/libvmmapi sys/amd64/include usr.sbin/bhyve usr.sbin/bhyvectl usr.sbin/bhyveload X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Aug 2013 18:58:00 -0000 Author: neel Date: Mon Aug 19 18:57:58 2013 New Revision: 254540 URL: http://svnweb.freebsd.org/changeset/base/254540 Log: Add a parameter to the "get memory segment" ioctl to indicate whether or not the segment is wired. In general the memory segments belonging to a virtual machine are not wired unless the virtual machine is attached to a passthru pci device. Modified: projects/bhyve_npt_pmap/lib/libvmmapi/vmmapi.c projects/bhyve_npt_pmap/lib/libvmmapi/vmmapi.h projects/bhyve_npt_pmap/sys/amd64/include/vmm_dev.h projects/bhyve_npt_pmap/usr.sbin/bhyve/pci_emul.c projects/bhyve_npt_pmap/usr.sbin/bhyvectl/bhyvectl.c projects/bhyve_npt_pmap/usr.sbin/bhyveload/bhyveload.c Modified: projects/bhyve_npt_pmap/lib/libvmmapi/vmmapi.c ============================================================================== --- projects/bhyve_npt_pmap/lib/libvmmapi/vmmapi.c Mon Aug 19 17:44:19 2013 (r254539) +++ projects/bhyve_npt_pmap/lib/libvmmapi/vmmapi.c Mon Aug 19 18:57:58 2013 (r254540) @@ -124,7 +124,8 @@ vm_destroy(struct vmctx *vm) } int -vm_get_memory_seg(struct vmctx *ctx, vm_paddr_t gpa, size_t *ret_len) +vm_get_memory_seg(struct vmctx *ctx, vm_paddr_t gpa, size_t *ret_len, + int *wired) { int error; struct vm_memory_segment seg; @@ -133,6 +134,8 @@ vm_get_memory_seg(struct vmctx *ctx, vm_ seg.gpa = gpa; error = ioctl(ctx->fd, VM_GET_MEMORY_SEG, &seg); *ret_len = seg.len; + if (wired != NULL) + *wired = seg.wired; return (error); } Modified: projects/bhyve_npt_pmap/lib/libvmmapi/vmmapi.h ============================================================================== --- projects/bhyve_npt_pmap/lib/libvmmapi/vmmapi.h Mon Aug 19 17:44:19 2013 (r254539) +++ projects/bhyve_npt_pmap/lib/libvmmapi/vmmapi.h Mon Aug 19 18:57:58 2013 (r254540) @@ -45,7 +45,8 @@ enum vm_mmap_style { int vm_create(const char *name); struct vmctx *vm_open(const char *name); void vm_destroy(struct vmctx *ctx); -int vm_get_memory_seg(struct vmctx *ctx, vm_paddr_t gpa, size_t *ret_len); +int vm_get_memory_seg(struct vmctx *ctx, vm_paddr_t gpa, size_t *ret_len, + int *wired); int vm_setup_memory(struct vmctx *ctx, size_t len, enum vm_mmap_style s); void *vm_map_gpa(struct vmctx *ctx, vm_paddr_t gaddr, size_t len); int vm_get_gpa_pmap(struct vmctx *, uint64_t gpa, uint64_t *pte, int *num); Modified: projects/bhyve_npt_pmap/sys/amd64/include/vmm_dev.h ============================================================================== --- projects/bhyve_npt_pmap/sys/amd64/include/vmm_dev.h Mon Aug 19 17:44:19 2013 (r254539) +++ projects/bhyve_npt_pmap/sys/amd64/include/vmm_dev.h Mon Aug 19 18:57:58 2013 (r254540) @@ -36,7 +36,8 @@ int vmmdev_cleanup(void); struct vm_memory_segment { vm_paddr_t gpa; /* in */ - size_t len; /* in */ + size_t len; + int wired; }; struct vm_register { Modified: projects/bhyve_npt_pmap/usr.sbin/bhyve/pci_emul.c ============================================================================== --- projects/bhyve_npt_pmap/usr.sbin/bhyve/pci_emul.c Mon Aug 19 17:44:19 2013 (r254539) +++ projects/bhyve_npt_pmap/usr.sbin/bhyve/pci_emul.c Mon Aug 19 18:57:58 2013 (r254540) @@ -1039,7 +1039,7 @@ init_pci(struct vmctx *ctx) * Accesses to memory addresses that are not allocated to system * memory or PCI devices return 0xff's. */ - error = vm_get_memory_seg(ctx, 0, &lowmem); + error = vm_get_memory_seg(ctx, 0, &lowmem, NULL); assert(error == 0); memset(&memp, 0, sizeof(struct mem_range)); Modified: projects/bhyve_npt_pmap/usr.sbin/bhyvectl/bhyvectl.c ============================================================================== --- projects/bhyve_npt_pmap/usr.sbin/bhyvectl/bhyvectl.c Mon Aug 19 17:44:19 2013 (r254539) +++ projects/bhyve_npt_pmap/usr.sbin/bhyvectl/bhyvectl.c Mon Aug 19 18:57:58 2013 (r254540) @@ -391,6 +391,7 @@ main(int argc, char *argv[]) struct vm_exit vmexit; uint64_t ctl, eptp, bm, addr, u64, pteval[4], *pte; struct vmctx *ctx; + int wired; uint64_t cr0, cr3, cr4, dr7, rsp, rip, rflags, efer, pat; uint64_t rax, rbx, rcx, rdx, rsi, rdi, rbp; @@ -826,16 +827,18 @@ main(int argc, char *argv[]) if (!error && (get_lowmem || get_all)) { gpa = 0; - error = vm_get_memory_seg(ctx, gpa, &len); + error = vm_get_memory_seg(ctx, gpa, &len, &wired); if (error == 0) - printf("lowmem\t\t0x%016lx/%ld\n", gpa, len); + printf("lowmem\t\t0x%016lx/%ld%s\n", gpa, len, + wired ? " wired" : ""); } if (!error && (get_highmem || get_all)) { gpa = 4 * GB; - error = vm_get_memory_seg(ctx, gpa, &len); + error = vm_get_memory_seg(ctx, gpa, &len, &wired); if (error == 0) - printf("highmem\t\t0x%016lx/%ld\n", gpa, len); + printf("highmem\t\t0x%016lx/%ld%s\n", gpa, len, + wired ? " wired" : ""); } if (!error && (get_efer || get_all)) { Modified: projects/bhyve_npt_pmap/usr.sbin/bhyveload/bhyveload.c ============================================================================== --- projects/bhyve_npt_pmap/usr.sbin/bhyveload/bhyveload.c Mon Aug 19 17:44:19 2013 (r254539) +++ projects/bhyve_npt_pmap/usr.sbin/bhyveload/bhyveload.c Mon Aug 19 18:57:58 2013 (r254540) @@ -492,8 +492,8 @@ static void cb_getmem(void *arg, uint64_t *ret_lowmem, uint64_t *ret_highmem) { - vm_get_memory_seg(ctx, 0, ret_lowmem); - vm_get_memory_seg(ctx, 4 * GB, ret_highmem); + vm_get_memory_seg(ctx, 0, ret_lowmem, NULL); + vm_get_memory_seg(ctx, 4 * GB, ret_highmem, NULL); } static const char * From owner-svn-src-projects@FreeBSD.ORG Mon Aug 19 20:46:15 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 171C7DE5; Mon, 19 Aug 2013 20:46:15 +0000 (UTC) (envelope-from davide@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 05CE327D8; Mon, 19 Aug 2013 20:46:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7JKkEda034861; Mon, 19 Aug 2013 20:46:14 GMT (envelope-from davide@svn.freebsd.org) Received: (from davide@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7JKkEt7034858; Mon, 19 Aug 2013 20:46:14 GMT (envelope-from davide@svn.freebsd.org) Message-Id: <201308192046.r7JKkEt7034858@svn.freebsd.org> From: Davide Italiano Date: Mon, 19 Aug 2013 20:46:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r254541 - in projects/umtx/sys: kern sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Aug 2013 20:46:15 -0000 Author: davide Date: Mon Aug 19 20:46:14 2013 New Revision: 254541 URL: http://svnweb.freebsd.org/changeset/base/254541 Log: - Unset the proper bit in the bitmap that keeps track which structures are in use and which aren't when the thread exits. - Protect the bitmap using PROC_SLOCK. Discussed with: attilio[1] Pointed out by: jhb[2] Modified: projects/umtx/sys/kern/kern_schedctl.c projects/umtx/sys/kern/kern_thread.c projects/umtx/sys/sys/schedctl.h Modified: projects/umtx/sys/kern/kern_schedctl.c ============================================================================== --- projects/umtx/sys/kern/kern_schedctl.c Mon Aug 19 18:57:58 2013 (r254540) +++ projects/umtx/sys/kern/kern_schedctl.c Mon Aug 19 20:46:14 2013 (r254541) @@ -58,6 +58,7 @@ static size_t bitmap_len; /* # of bits * Public prototypes. */ int schedctl(struct thread *td, struct schedctl_args *uap); +void schedctl_thread_exit(struct thread *td); static int schedctl_alloc_page(struct proc *p, shpage_t **ret) @@ -82,9 +83,9 @@ schedctl_alloc_page(struct proc *p, shpa pmap_qenter(spg->pageaddr, &m, 1); /* Map in userspace */ - PROC_LOCK(p); + PROC_SLOCK(p); SLIST_INSERT_HEAD(&(p->p_shpg), spg, pg_next); - PROC_UNLOCK(p); + PROC_SUNLOCK(p); map = &p->p_vmspace->vm_map; vm_object_reference(spg->shared_page_obj); @@ -126,6 +127,7 @@ schedctl_shared_alloc(struct thread *td, sh_pg = NULL; p = curproc; KASSERT(p != NULL, ("proc should never be NULL")); + PROC_SLOCK(p); if (!SLIST_EMPTY(&(p->p_shpg))) { /* @@ -140,9 +142,11 @@ schedctl_shared_alloc(struct thread *td, } } if (sh_pg == NULL) { + PROC_SUNLOCK(p); error = schedctl_alloc_page(p, &sh_pg); if (error != 0) return (ENOMEM); + PROC_SLOCK(p); } /* Now were's (mostly) sure there's room for allocation. */ @@ -152,6 +156,7 @@ schedctl_shared_alloc(struct thread *td, KASSERT(idx != -1, ("schedctl_page_alloc: invalid bitmap index")); *usroff = sh_pg->usraddr + (sizeof(shstate_t) * idx); *krnoff = sh_pg->pageaddr + (sizeof(shstate_t) * idx); + PROC_SUNLOCK(p); return (0); } @@ -190,6 +195,43 @@ schedctl_init(void) } /* + * thread_exit() hook. + */ +void +schedctl_thread_exit(struct thread *td) +{ + struct proc *p; + shpage_t *sh_pg; + vm_offset_t end, shptr, start; + int idx; + + if (td->td_schedctl == NULL) + return; + p = td->td_proc; + shptr = (vm_offset_t)td->td_schedctl; + SLIST_FOREACH(sh_pg, &(p->p_shpg), pg_next) { + start = (vm_offset_t)sh_pg->pageaddr; + end = (vm_offset_t)start + PAGE_SIZE; + if ((shptr >= start) && (shptr < end)) + break; + } + KASSERT(sh_pg != NULL, ("schedctl_thread_exit: can't find shpage_t")); + idx = 0; + while (start <= end) { + if (shptr == start) + break; + start += sizeof(shstate_t); + idx++; + } + KASSERT(idx <= bitmap_len, ("schedctl_thread_exit: invalid bmp idx")); + setbit(&(sh_pg->bitmap), idx); + sh_pg->available++; + td->td_schedctl->sh_state = STATE_FREE; + td->td_schedctl = NULL; + td->td_usrschedctl = NULL; +} + +/* * XXX: SI_SUB_KMEM is the right place to call schedctl_init? */ SYSINIT(schedctl, SI_SUB_KMEM, SI_ORDER_ANY, schedctl_init, NULL); Modified: projects/umtx/sys/kern/kern_thread.c ============================================================================== --- projects/umtx/sys/kern/kern_thread.c Mon Aug 19 18:57:58 2013 (r254540) +++ projects/umtx/sys/kern/kern_thread.c Mon Aug 19 20:46:14 2013 (r254541) @@ -416,6 +416,7 @@ thread_exit(void) AUDIT_SYSCALL_EXIT(0, td); #endif umtx_thread_exit(td); + schedctl_thread_exit(td); /* * drop FPU & debug register state storage, or any other * architecture specific resources that Modified: projects/umtx/sys/sys/schedctl.h ============================================================================== --- projects/umtx/sys/sys/schedctl.h Mon Aug 19 18:57:58 2013 (r254540) +++ projects/umtx/sys/sys/schedctl.h Mon Aug 19 20:46:14 2013 (r254541) @@ -66,7 +66,7 @@ typedef struct page_shared shpage_t; * Function prototypes. */ void schedctl_init(void); -void schedctl_thread_cleanup(struct thread *); -void schedctl_proc_cleanup(void); +void schedctl_thread_exit(struct thread *); +void schedctl_proc_exit(void); #endif /* _SYS_SCHEDCTL_H_ */ From owner-svn-src-projects@FreeBSD.ORG Tue Aug 20 07:48:21 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 93196812; Tue, 20 Aug 2013 07:48:21 +0000 (UTC) (envelope-from neel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8196529C8; Tue, 20 Aug 2013 07:48:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7K7mLID091298; Tue, 20 Aug 2013 07:48:21 GMT (envelope-from neel@svn.freebsd.org) Received: (from neel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7K7mLNx091296; Tue, 20 Aug 2013 07:48:21 GMT (envelope-from neel@svn.freebsd.org) Message-Id: <201308200748.r7K7mLNx091296@svn.freebsd.org> From: Neel Natu Date: Tue, 20 Aug 2013 07:48:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r254557 - projects/bhyve_npt_pmap/sys/amd64/vmm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Aug 2013 07:48:21 -0000 Author: neel Date: Tue Aug 20 07:48:20 2013 New Revision: 254557 URL: http://svnweb.freebsd.org/changeset/base/254557 Log: APIs to manipulate guest physical address space mappings to host MMIO regions. These APIs will be used for mapping BARs of the pci passthru devices assigned to the guest. Modified: projects/bhyve_npt_pmap/sys/amd64/vmm/vmm_mem.c projects/bhyve_npt_pmap/sys/amd64/vmm/vmm_mem.h Modified: projects/bhyve_npt_pmap/sys/amd64/vmm/vmm_mem.c ============================================================================== --- projects/bhyve_npt_pmap/sys/amd64/vmm/vmm_mem.c Tue Aug 20 07:40:40 2013 (r254556) +++ projects/bhyve_npt_pmap/sys/amd64/vmm/vmm_mem.c Tue Aug 20 07:48:20 2013 (r254557) @@ -31,12 +31,18 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include +#include +#include #include #include #include #include #include +#include +#include #include @@ -50,6 +56,65 @@ vmm_mem_init(void) } vm_object_t +vmm_mmio_alloc(struct vmspace *vmspace, vm_paddr_t gpa, size_t len, + vm_paddr_t hpa) +{ + int error; + vm_object_t obj; + struct sglist *sg; + + sg = sglist_alloc(1, M_WAITOK); + error = sglist_append_phys(sg, hpa, len); + KASSERT(error == 0, ("error %d appending physaddr to sglist", error)); + + obj = vm_pager_allocate(OBJT_SG, sg, len, VM_PROT_RW, 0, NULL); + if (obj != NULL) { + /* + * VT-x ignores the MTRR settings when figuring out the + * memory type for translations obtained through EPT. + * + * Therefore we explicitly force the pages provided by + * this object to be mapped as uncacheable. + */ + VM_OBJECT_WLOCK(obj); + error = vm_object_set_memattr(obj, VM_MEMATTR_UNCACHEABLE); + VM_OBJECT_WUNLOCK(obj); + if (error != KERN_SUCCESS) { + panic("vmm_mmio_alloc: vm_object_set_memattr error %d", + error); + } + error = vm_map_find(&vmspace->vm_map, obj, 0, &gpa, len, + VMFS_NO_SPACE, VM_PROT_RW, VM_PROT_RW, 0); + if (error != KERN_SUCCESS) { + vm_object_deallocate(obj); + obj = NULL; + } + } + + /* + * Drop the reference on the sglist. + * + * If the scatter/gather object was successfully allocated then it + * has incremented the reference count on the sglist. Dropping the + * initial reference count ensures that the sglist will be freed + * when the object is deallocated. + * + * If the object could not be allocated then we end up freeing the + * sglist. + */ + sglist_free(sg); + + return (obj); +} + +void +vmm_mmio_free(struct vmspace *vmspace, vm_paddr_t gpa, size_t len) +{ + + vm_map_remove(&vmspace->vm_map, gpa, gpa + len); +} + +vm_object_t vmm_mem_alloc(struct vmspace *vmspace, vm_paddr_t gpa, size_t len) { int error; Modified: projects/bhyve_npt_pmap/sys/amd64/vmm/vmm_mem.h ============================================================================== --- projects/bhyve_npt_pmap/sys/amd64/vmm/vmm_mem.h Tue Aug 20 07:40:40 2013 (r254556) +++ projects/bhyve_npt_pmap/sys/amd64/vmm/vmm_mem.h Tue Aug 20 07:48:20 2013 (r254557) @@ -34,7 +34,10 @@ struct vm_object; int vmm_mem_init(void); struct vm_object *vmm_mem_alloc(struct vmspace *, vm_paddr_t gpa, size_t size); +struct vm_object *vmm_mmio_alloc(struct vmspace *, vm_paddr_t gpa, size_t len, + vm_paddr_t hpa); void vmm_mem_free(struct vmspace *, vm_paddr_t gpa, size_t size); +void vmm_mmio_free(struct vmspace *, vm_paddr_t gpa, size_t size); vm_paddr_t vmm_mem_maxaddr(void); #endif From owner-svn-src-projects@FreeBSD.ORG Tue Aug 20 18:05:32 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 138C3F6C; Tue, 20 Aug 2013 18:05:32 +0000 (UTC) (envelope-from neel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E6EC92141; Tue, 20 Aug 2013 18:05:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7KI5VuB039250; Tue, 20 Aug 2013 18:05:31 GMT (envelope-from neel@svn.freebsd.org) Received: (from neel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7KI5VfK039249; Tue, 20 Aug 2013 18:05:31 GMT (envelope-from neel@svn.freebsd.org) Message-Id: <201308201805.r7KI5VfK039249@svn.freebsd.org> From: Neel Natu Date: Tue, 20 Aug 2013 18:05:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r254574 - projects/bhyve_npt_pmap/sys/amd64/vmm/intel X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Aug 2013 18:05:32 -0000 Author: neel Date: Tue Aug 20 18:05:31 2013 New Revision: 254574 URL: http://svnweb.freebsd.org/changeset/base/254574 Log: IFC r254548 and r254549 Modified: projects/bhyve_npt_pmap/sys/amd64/vmm/intel/vtd.c Modified: projects/bhyve_npt_pmap/sys/amd64/vmm/intel/vtd.c ============================================================================== --- projects/bhyve_npt_pmap/sys/amd64/vmm/intel/vtd.c Tue Aug 20 17:50:30 2013 (r254573) +++ projects/bhyve_npt_pmap/sys/amd64/vmm/intel/vtd.c Tue Aug 20 18:05:31 2013 (r254574) @@ -41,7 +41,7 @@ __FBSDID("$FreeBSD$"); #include #include -#include +#include #include "io/iommu.h" @@ -123,60 +123,6 @@ static uint64_t ctx_tables[256][PAGE_SIZ static MALLOC_DEFINE(M_VTD, "vtd", "vtd"); -/* - * Config space register definitions from the "Intel 5520 and 5500" datasheet. - */ -static int -tylersburg_vtd_ident(void) -{ - int units, nlbus; - uint16_t did, vid; - uint32_t miscsts, vtbar; - - const int bus = 0; - const int slot = 20; - const int func = 0; - - units = 0; - - vid = pci_cfgregread(bus, slot, func, PCIR_VENDOR, 2); - did = pci_cfgregread(bus, slot, func, PCIR_DEVICE, 2); - if (vid != 0x8086 || did != 0x342E) - goto done; - - /* - * Check if this is a dual IOH configuration. - */ - miscsts = pci_cfgregread(bus, slot, func, 0x9C, 4); - if (miscsts & (1 << 25)) - nlbus = pci_cfgregread(bus, slot, func, 0x160, 1); - else - nlbus = -1; - - vtbar = pci_cfgregread(bus, slot, func, 0x180, 4); - if (vtbar & 0x1) { - vtdmaps[units++] = (struct vtdmap *) - PHYS_TO_DMAP(vtbar & 0xffffe000); - } else if (bootverbose) - printf("VT-d unit in legacy IOH is disabled!\n"); - - if (nlbus != -1) { - vtbar = pci_cfgregread(nlbus, slot, func, 0x180, 4); - if (vtbar & 0x1) { - vtdmaps[units++] = (struct vtdmap *) - PHYS_TO_DMAP(vtbar & 0xffffe000); - } else if (bootverbose) - printf("VT-d unit in non-legacy IOH is disabled!\n"); - } -done: - return (units); -} - -static drhd_ident_func_t drhd_ident_funcs[] = { - tylersburg_vtd_ident, - NULL -}; - static int vtd_max_domains(struct vtdmap *vtdmap) { @@ -291,19 +237,67 @@ vtd_translation_disable(struct vtdmap *v static int vtd_init(void) { - int i, units; + int i, units, remaining; struct vtdmap *vtdmap; vm_paddr_t ctx_paddr; - - for (i = 0; drhd_ident_funcs[i] != NULL; i++) { - units = (*drhd_ident_funcs[i])(); - if (units > 0) + char *end, envname[32]; + unsigned long mapaddr; + ACPI_STATUS status; + ACPI_TABLE_DMAR *dmar; + ACPI_DMAR_HEADER *hdr; + ACPI_DMAR_HARDWARE_UNIT *drhd; + + /* + * Allow the user to override the ACPI DMAR table by specifying the + * physical address of each remapping unit. + * + * The following example specifies two remapping units at + * physical addresses 0xfed90000 and 0xfeda0000 respectively. + * set vtd.regmap.0.addr=0xfed90000 + * set vtd.regmap.1.addr=0xfeda0000 + */ + for (units = 0; units < DRHD_MAX_UNITS; units++) { + snprintf(envname, sizeof(envname), "vtd.regmap.%d.addr", units); + if (getenv_ulong(envname, &mapaddr) == 0) break; + vtdmaps[units] = (struct vtdmap *)PHYS_TO_DMAP(mapaddr); + } + + if (units > 0) + goto skip_dmar; + + /* Search for DMAR table. */ + status = AcpiGetTable(ACPI_SIG_DMAR, 0, (ACPI_TABLE_HEADER **)&dmar); + if (ACPI_FAILURE(status)) + return (ENXIO); + + end = (char *)dmar + dmar->Header.Length; + remaining = dmar->Header.Length - sizeof(ACPI_TABLE_DMAR); + while (remaining > sizeof(ACPI_DMAR_HEADER)) { + hdr = (ACPI_DMAR_HEADER *)(end - remaining); + if (hdr->Length > remaining) + break; + /* + * From Intel VT-d arch spec, version 1.3: + * BIOS implementations must report mapping structures + * in numerical order, i.e. All remapping structures of + * type 0 (DRHD) enumerated before remapping structures of + * type 1 (RMRR) and so forth. + */ + if (hdr->Type != ACPI_DMAR_TYPE_HARDWARE_UNIT) + break; + + drhd = (ACPI_DMAR_HARDWARE_UNIT *)hdr; + vtdmaps[units++] = (struct vtdmap *)PHYS_TO_DMAP(drhd->Address); + if (units >= DRHD_MAX_UNITS) + break; + remaining -= hdr->Length; } if (units <= 0) return (ENXIO); +skip_dmar: drhd_num = units; vtdmap = vtdmaps[0]; @@ -617,13 +611,30 @@ vtd_create_domain(vm_paddr_t maxaddr) dom = malloc(sizeof(struct domain), M_VTD, M_ZERO | M_WAITOK); dom->pt_levels = pt_levels; dom->addrwidth = addrwidth; - dom->spsmask = VTD_CAP_SPS(vtdmap->cap); dom->id = domain_id(); dom->maxaddr = maxaddr; dom->ptp = malloc(PAGE_SIZE, M_VTD, M_ZERO | M_WAITOK); if ((uintptr_t)dom->ptp & PAGE_MASK) panic("vtd_create_domain: ptp (%p) not page aligned", dom->ptp); +#ifdef notyet + /* + * XXX superpage mappings for the iommu do not work correctly. + * + * By default all physical memory is mapped into the host_domain. + * When a VM is allocated wired memory the pages belonging to it + * are removed from the host_domain and added to the vm's domain. + * + * If the page being removed was mapped using a superpage mapping + * in the host_domain then we need to demote the mapping before + * removing the page. + * + * There is not any code to deal with the demotion at the moment + * so we disable superpage mappings altogether. + */ + dom->spsmask = VTD_CAP_SPS(vtdmap->cap); +#endif + SLIST_INSERT_HEAD(&domhead, dom, next); return (dom); From owner-svn-src-projects@FreeBSD.ORG Tue Aug 20 18:06:19 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 7DA33D7; Tue, 20 Aug 2013 18:06:19 +0000 (UTC) (envelope-from neel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5C80F2147; Tue, 20 Aug 2013 18:06:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7KI6JHT039486; Tue, 20 Aug 2013 18:06:19 GMT (envelope-from neel@svn.freebsd.org) Received: (from neel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7KI6Ib4039481; Tue, 20 Aug 2013 18:06:18 GMT (envelope-from neel@svn.freebsd.org) Message-Id: <201308201806.r7KI6Ib4039481@svn.freebsd.org> From: Neel Natu Date: Tue, 20 Aug 2013 18:06:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r254575 - in projects/bhyve_npt_pmap/sys/amd64: include vmm vmm/io X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Aug 2013 18:06:19 -0000 Author: neel Date: Tue Aug 20 18:06:18 2013 New Revision: 254575 URL: http://svnweb.freebsd.org/changeset/base/254575 Log: Virtual machines with PCI passthru devices get special treatment: - the entire guest address space is wired - iommu mappings need to be created to map guest physical addresses to the wired host physical pages. This happens automatically when the first PCI passthru device is attached to the guest. The reverse happens automatically when the last PCI passthru device is detached from the guest. Modified: projects/bhyve_npt_pmap/sys/amd64/include/vmm.h projects/bhyve_npt_pmap/sys/amd64/vmm/io/ppt.c projects/bhyve_npt_pmap/sys/amd64/vmm/io/ppt.h projects/bhyve_npt_pmap/sys/amd64/vmm/vmm.c projects/bhyve_npt_pmap/sys/amd64/vmm/vmm_dev.c Modified: projects/bhyve_npt_pmap/sys/amd64/include/vmm.h ============================================================================== --- projects/bhyve_npt_pmap/sys/amd64/include/vmm.h Tue Aug 20 18:05:31 2013 (r254574) +++ projects/bhyve_npt_pmap/sys/amd64/include/vmm.h Tue Aug 20 18:06:18 2013 (r254575) @@ -153,6 +153,8 @@ vcpu_is_running(struct vm *vm, int vcpu, void *vcpu_stats(struct vm *vm, int vcpu); void vm_interrupt_hostcpu(struct vm *vm, int vcpu); struct vmspace *vm_get_vmspace(struct vm *vm); +int vm_assign_pptdev(struct vm *vm, int bus, int slot, int func); +int vm_unassign_pptdev(struct vm *vm, int bus, int slot, int func); #endif /* KERNEL */ #include Modified: projects/bhyve_npt_pmap/sys/amd64/vmm/io/ppt.c ============================================================================== --- projects/bhyve_npt_pmap/sys/amd64/vmm/io/ppt.c Tue Aug 20 18:05:31 2013 (r254574) +++ projects/bhyve_npt_pmap/sys/amd64/vmm/io/ppt.c Tue Aug 20 18:06:18 2013 (r254575) @@ -282,6 +282,43 @@ ppt_teardown_msix(struct pptdev *ppt) } int +ppt_num_devices(struct vm *vm) +{ + int i, num; + + num = 0; + for (i = 0; i < num_pptdevs; i++) { + if (pptdevs[i].vm == vm) + num++; + } + return (num); +} + +boolean_t +ppt_is_mmio(struct vm *vm, vm_paddr_t gpa) +{ + int i, n; + struct pptdev *ppt; + struct vm_memory_segment *seg; + + for (n = 0; n < num_pptdevs; n++) { + ppt = &pptdevs[n]; + if (ppt->vm != vm) + continue; + + for (i = 0; i < MAX_MMIOSEGS; i++) { + seg = &ppt->mmio[i]; + if (seg->len == 0) + continue; + if (gpa >= seg->gpa && gpa < seg->gpa + seg->len) + return (TRUE); + } + } + + return (FALSE); +} + +int ppt_assign_device(struct vm *vm, int bus, int slot, int func) { struct pptdev *ppt; @@ -336,7 +373,7 @@ ppt_unassign_all(struct vm *vm) bus = pci_get_bus(dev); slot = pci_get_slot(dev); func = pci_get_function(dev); - ppt_unassign_device(vm, bus, slot, func); + vm_unassign_pptdev(vm, bus, slot, func); } } @@ -591,4 +628,3 @@ ppt_setup_msix(struct vm *vm, int vcpu, return (0); } - Modified: projects/bhyve_npt_pmap/sys/amd64/vmm/io/ppt.h ============================================================================== --- projects/bhyve_npt_pmap/sys/amd64/vmm/io/ppt.h Tue Aug 20 18:05:31 2013 (r254574) +++ projects/bhyve_npt_pmap/sys/amd64/vmm/io/ppt.h Tue Aug 20 18:06:18 2013 (r254575) @@ -29,13 +29,20 @@ #ifndef _IO_PPT_H_ #define _IO_PPT_H_ -int ppt_assign_device(struct vm *vm, int bus, int slot, int func); -int ppt_unassign_device(struct vm *vm, int bus, int slot, int func); int ppt_unassign_all(struct vm *vm); int ppt_map_mmio(struct vm *vm, int bus, int slot, int func, vm_paddr_t gpa, size_t len, vm_paddr_t hpa); int ppt_setup_msi(struct vm *vm, int vcpu, int bus, int slot, int func, int destcpu, int vector, int numvec); int ppt_setup_msix(struct vm *vm, int vcpu, int bus, int slot, int func, - int idx, uint32_t msg, uint32_t vector_control, uint64_t addr); + int idx, uint32_t msg, uint32_t vector_control, uint64_t addr); +int ppt_num_devices(struct vm *vm); +boolean_t ppt_is_mmio(struct vm *vm, vm_paddr_t gpa); + +/* + * The following functions should never be called directly. + * Use 'vm_assign_pptdev()' and 'vm_unassign_pptdev()' instead. + */ +int ppt_assign_device(struct vm *vm, int bus, int slot, int func); +int ppt_unassign_device(struct vm *vm, int bus, int slot, int func); #endif Modified: projects/bhyve_npt_pmap/sys/amd64/vmm/vmm.c ============================================================================== --- projects/bhyve_npt_pmap/sys/amd64/vmm/vmm.c Tue Aug 20 18:05:31 2013 (r254574) +++ projects/bhyve_npt_pmap/sys/amd64/vmm/vmm.c Tue Aug 20 18:06:18 2013 (r254575) @@ -99,6 +99,7 @@ struct vcpu { struct mem_seg { vm_paddr_t gpa; size_t len; + boolean_t wired; vm_object_t object; }; #define VM_MAX_MEMORY_SEGMENTS 2 @@ -311,9 +312,6 @@ vm_create(const char *name, struct vm ** return (0); } -/* - * XXX need to deal with iommu mappings - */ static void vm_free_mem_seg(struct vm *vm, struct mem_seg *seg) { @@ -357,15 +355,20 @@ vm_name(struct vm *vm) int vm_map_mmio(struct vm *vm, vm_paddr_t gpa, size_t len, vm_paddr_t hpa) { + vm_object_t obj; - return (ENXIO); /* XXX fixme */ + if ((obj = vmm_mmio_alloc(vm->vmspace, gpa, len, hpa)) == NULL) + return (ENOMEM); + else + return (0); } int vm_unmap_mmio(struct vm *vm, vm_paddr_t gpa, size_t len) { - return (ENXIO); /* XXX fixme */ + vmm_mmio_free(vm->vmspace, gpa, len); + return (0); } boolean_t @@ -378,15 +381,15 @@ vm_mem_allocated(struct vm *vm, vm_paddr gpabase = vm->mem_segs[i].gpa; gpalimit = gpabase + vm->mem_segs[i].len; if (gpa >= gpabase && gpa < gpalimit) - return (TRUE); + return (TRUE); /* 'gpa' is regular memory */ } + if (ppt_is_mmio(vm, gpa)) + return (TRUE); /* 'gpa' is pci passthru mmio */ + return (FALSE); } -/* - * XXX need to deal with iommu - */ int vm_malloc(struct vm *vm, vm_paddr_t gpa, size_t len) { @@ -434,12 +437,159 @@ vm_malloc(struct vm *vm, vm_paddr_t gpa, seg->gpa = gpa; seg->len = len; seg->object = object; + seg->wired = FALSE; vm->num_mem_segs++; return (0); } +static void +vm_gpa_unwire(struct vm *vm) +{ + int i, rv; + struct mem_seg *seg; + + for (i = 0; i < vm->num_mem_segs; i++) { + seg = &vm->mem_segs[i]; + if (!seg->wired) + continue; + + rv = vm_map_unwire(&vm->vmspace->vm_map, + seg->gpa, seg->gpa + seg->len, + VM_MAP_WIRE_USER | VM_MAP_WIRE_NOHOLES); + KASSERT(rv == KERN_SUCCESS, ("vm(%s) memory segment " + "%#lx/%ld could not be unwired: %d", + vm_name(vm), seg->gpa, seg->len, rv)); + + seg->wired = FALSE; + } +} + +static int +vm_gpa_wire(struct vm *vm) +{ + int i, rv; + struct mem_seg *seg; + + for (i = 0; i < vm->num_mem_segs; i++) { + seg = &vm->mem_segs[i]; + if (seg->wired) + continue; + + /* XXX rlimits? */ + rv = vm_map_wire(&vm->vmspace->vm_map, + seg->gpa, seg->gpa + seg->len, + VM_MAP_WIRE_USER | VM_MAP_WIRE_NOHOLES); + if (rv != KERN_SUCCESS) + break; + + seg->wired = TRUE; + } + + if (i < vm->num_mem_segs) { + /* + * Undo the wiring before returning an error. + */ + vm_gpa_unwire(vm); + return (EAGAIN); + } + + return (0); +} + +static void +vm_iommu_modify(struct vm *vm, boolean_t map) +{ + int i, sz; + vm_paddr_t gpa, hpa; + struct mem_seg *seg; + void *vp, *cookie, *host_domain; + + sz = PAGE_SIZE; + host_domain = iommu_host_domain(); + + for (i = 0; i < vm->num_mem_segs; i++) { + seg = &vm->mem_segs[i]; + KASSERT(seg->wired, + ("vm(%s) memory segment %#lx/%ld not wired", + vm_name(vm), seg->gpa, seg->len)); + + gpa = seg->gpa; + while (gpa < seg->gpa + seg->len) { + vp = vm_gpa_hold(vm, gpa, PAGE_SIZE, VM_PROT_WRITE, + &cookie); + KASSERT(vp != NULL, ("vm(%s) could not map gpa %#lx", + vm_name(vm), gpa)); + + vm_gpa_release(cookie); + + hpa = DMAP_TO_PHYS((uintptr_t)vp); + if (map) { + iommu_create_mapping(vm->iommu, gpa, hpa, sz); + iommu_remove_mapping(host_domain, hpa, sz); + } else { + iommu_remove_mapping(vm->iommu, gpa, sz); + iommu_create_mapping(host_domain, hpa, hpa, sz); + } + + gpa += PAGE_SIZE; + } + } + + /* + * Invalidate the cached translations associated with the domain + * from which pages were removed. + */ + if (map) + iommu_invalidate_tlb(host_domain); + else + iommu_invalidate_tlb(vm->iommu); +} + +#define vm_iommu_unmap(vm) vm_iommu_modify((vm), FALSE) +#define vm_iommu_map(vm) vm_iommu_modify((vm), TRUE) + +int +vm_unassign_pptdev(struct vm *vm, int bus, int slot, int func) +{ + int error; + + error = ppt_unassign_device(vm, bus, slot, func); + if (error) + return (error); + + if (ppt_num_devices(vm) == 0) { + vm_iommu_unmap(vm); + vm_gpa_unwire(vm); + } + return (0); +} + +int +vm_assign_pptdev(struct vm *vm, int bus, int slot, int func) +{ + int error; + + /* + * Virtual machines with pci passthru devices get special treatment: + * - the guest physical memory is wired + * - the iommu is programmed to do the 'gpa' to 'hpa' translation + * + * We need to do this before the first pci passthru device is attached. + */ + if (ppt_num_devices(vm) == 0) { + error = vm_gpa_wire(vm); + if (error) + return (error); + + vm_iommu_map(vm); + } + + error = ppt_assign_device(vm, bus, slot, func); + return (error); +} + void * vm_gpa_hold(struct vm *vm, vm_paddr_t gpa, size_t len, int reqprot, void **cookie) @@ -483,6 +633,7 @@ vm_gpabase2memseg(struct vm *vm, vm_padd if (gpabase == vm->mem_segs[i].gpa) { seg->gpa = vm->mem_segs[i].gpa; seg->len = vm->mem_segs[i].len; + seg->wired = vm->mem_segs[i].wired; return (0); } } Modified: projects/bhyve_npt_pmap/sys/amd64/vmm/vmm_dev.c ============================================================================== --- projects/bhyve_npt_pmap/sys/amd64/vmm/vmm_dev.c Tue Aug 20 18:05:31 2013 (r254574) +++ projects/bhyve_npt_pmap/sys/amd64/vmm/vmm_dev.c Tue Aug 20 18:06:18 2013 (r254575) @@ -271,13 +271,13 @@ vmmdev_ioctl(struct cdev *cdev, u_long c break; case VM_BIND_PPTDEV: pptdev = (struct vm_pptdev *)data; - error = ppt_assign_device(sc->vm, pptdev->bus, pptdev->slot, - pptdev->func); + error = vm_assign_pptdev(sc->vm, pptdev->bus, pptdev->slot, + pptdev->func); break; case VM_UNBIND_PPTDEV: pptdev = (struct vm_pptdev *)data; - error = ppt_unassign_device(sc->vm, pptdev->bus, pptdev->slot, - pptdev->func); + error = vm_unassign_pptdev(sc->vm, pptdev->bus, pptdev->slot, + pptdev->func); break; case VM_INJECT_EVENT: vmevent = (struct vm_event *)data; From owner-svn-src-projects@FreeBSD.ORG Tue Aug 20 21:43:55 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 916FDD25; Tue, 20 Aug 2013 21:43:55 +0000 (UTC) (envelope-from neel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7ABFA2F0B; Tue, 20 Aug 2013 21:43:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7KLhtZ2042393; Tue, 20 Aug 2013 21:43:55 GMT (envelope-from neel@svn.freebsd.org) Received: (from neel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7KLhldX042350; Tue, 20 Aug 2013 21:43:47 GMT (envelope-from neel@svn.freebsd.org) Message-Id: <201308202143.r7KLhldX042350@svn.freebsd.org> From: Neel Natu Date: Tue, 20 Aug 2013 21:43:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r254583 - in projects/bhyve_npt_pmap: . bin/ed bin/sh cddl/contrib/opensolaris/lib/libzfs/common cddl/contrib/opensolaris/lib/libzfs_core/common contrib/libstdc++/libsupc++ contrib/llvm... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Aug 2013 21:43:55 -0000 Author: neel Date: Tue Aug 20 21:43:46 2013 New Revision: 254583 URL: http://svnweb.freebsd.org/changeset/base/254583 Log: IFC @r252646 Added: projects/bhyve_npt_pmap/etc/rc.d/swap - copied unchanged from r252646, head/etc/rc.d/swap projects/bhyve_npt_pmap/etc/rc.d/swaplate - copied unchanged from r252646, head/etc/rc.d/swaplate projects/bhyve_npt_pmap/sbin/nvmecontrol/devlist.c - copied unchanged from r252646, head/sbin/nvmecontrol/devlist.c projects/bhyve_npt_pmap/sbin/nvmecontrol/firmware.c - copied unchanged from r252646, head/sbin/nvmecontrol/firmware.c projects/bhyve_npt_pmap/sbin/nvmecontrol/identify.c - copied unchanged from r252646, head/sbin/nvmecontrol/identify.c projects/bhyve_npt_pmap/sbin/nvmecontrol/logpage.c - copied unchanged from r252646, head/sbin/nvmecontrol/logpage.c projects/bhyve_npt_pmap/sbin/nvmecontrol/nvmecontrol.h - copied unchanged from r252646, head/sbin/nvmecontrol/nvmecontrol.h projects/bhyve_npt_pmap/sbin/nvmecontrol/perftest.c - copied unchanged from r252646, head/sbin/nvmecontrol/perftest.c projects/bhyve_npt_pmap/sbin/nvmecontrol/reset.c - copied unchanged from r252646, head/sbin/nvmecontrol/reset.c projects/bhyve_npt_pmap/share/man/man4/cc_cdg.4 - copied unchanged from r252646, head/share/man/man4/cc_cdg.4 projects/bhyve_npt_pmap/share/man/man4/qlxge.4 - copied unchanged from r252646, head/share/man/man4/qlxge.4 projects/bhyve_npt_pmap/sys/arm/arm/generic_timer.c - copied unchanged from r252646, head/sys/arm/arm/generic_timer.c projects/bhyve_npt_pmap/sys/arm/conf/ARNDALE - copied unchanged from r252646, head/sys/arm/conf/ARNDALE projects/bhyve_npt_pmap/sys/arm/samsung/ - copied from r252646, head/sys/arm/samsung/ projects/bhyve_npt_pmap/sys/boot/fdt/dts/bcm2835.dtsi - copied unchanged from r252646, head/sys/boot/fdt/dts/bcm2835.dtsi projects/bhyve_npt_pmap/sys/boot/fdt/dts/exynos5250-arndale.dts - copied unchanged from r252646, head/sys/boot/fdt/dts/exynos5250-arndale.dts projects/bhyve_npt_pmap/sys/boot/fdt/dts/exynos5250.dtsi - copied unchanged from r252646, head/sys/boot/fdt/dts/exynos5250.dtsi projects/bhyve_npt_pmap/sys/boot/fdt/dts/rpi.dts - copied unchanged from r252646, head/sys/boot/fdt/dts/rpi.dts projects/bhyve_npt_pmap/sys/boot/i386/gptboot/gptboot.8 - copied unchanged from r252646, head/sys/boot/i386/gptboot/gptboot.8 projects/bhyve_npt_pmap/sys/dev/qlxge/ - copied from r252646, head/sys/dev/qlxge/ projects/bhyve_npt_pmap/sys/kern/subr_vmem.c - copied unchanged from r252646, head/sys/kern/subr_vmem.c projects/bhyve_npt_pmap/sys/modules/cc/cc_cdg/ - copied from r252646, head/sys/modules/cc/cc_cdg/ projects/bhyve_npt_pmap/sys/modules/qlxge/ - copied from r252646, head/sys/modules/qlxge/ projects/bhyve_npt_pmap/sys/netinet/cc/cc_cdg.c - copied unchanged from r252646, head/sys/netinet/cc/cc_cdg.c projects/bhyve_npt_pmap/sys/sys/vmem.h - copied unchanged from r252646, head/sys/sys/vmem.h projects/bhyve_npt_pmap/tools/build/options/WITHOUT_SVNLITE - copied unchanged from r252646, head/tools/build/options/WITHOUT_SVNLITE projects/bhyve_npt_pmap/tools/build/options/WITH_SVN - copied unchanged from r252646, head/tools/build/options/WITH_SVN Deleted: projects/bhyve_npt_pmap/contrib/smbfs/mount_smbfs/Makefile projects/bhyve_npt_pmap/etc/rc.d/encswap projects/bhyve_npt_pmap/etc/rc.d/swap1 projects/bhyve_npt_pmap/sys/boot/fdt/dts/bcm2835-rpi-b.dts Modified: projects/bhyve_npt_pmap/Makefile.inc1 projects/bhyve_npt_pmap/ObsoleteFiles.inc projects/bhyve_npt_pmap/UPDATING projects/bhyve_npt_pmap/bin/ed/re.c projects/bhyve_npt_pmap/bin/sh/eval.c projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c projects/bhyve_npt_pmap/contrib/libstdc++/libsupc++/unwind-cxx.h projects/bhyve_npt_pmap/contrib/llvm/lib/Target/ARM/ARMFrameLowering.h projects/bhyve_npt_pmap/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp projects/bhyve_npt_pmap/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h projects/bhyve_npt_pmap/crypto/openssh/sshd_config projects/bhyve_npt_pmap/crypto/openssh/sshd_config.5 projects/bhyve_npt_pmap/etc/defaults/rc.conf projects/bhyve_npt_pmap/etc/devd/usb.conf projects/bhyve_npt_pmap/etc/mtree/BSD.include.dist projects/bhyve_npt_pmap/etc/mtree/BSD.usr.dist projects/bhyve_npt_pmap/etc/network.subr projects/bhyve_npt_pmap/etc/newsyslog.conf projects/bhyve_npt_pmap/etc/periodic/daily/450.status-security projects/bhyve_npt_pmap/etc/rc.d/Makefile projects/bhyve_npt_pmap/etc/rc.d/addswap projects/bhyve_npt_pmap/etc/rc.d/fsck projects/bhyve_npt_pmap/etc/rc.d/hostapd projects/bhyve_npt_pmap/etc/rc.d/mdconfig projects/bhyve_npt_pmap/etc/syslog.conf projects/bhyve_npt_pmap/gnu/usr.bin/patch/pch.c projects/bhyve_npt_pmap/include/Makefile projects/bhyve_npt_pmap/include/gssapi/gssapi.h projects/bhyve_npt_pmap/include/iconv.h projects/bhyve_npt_pmap/include/paths.h projects/bhyve_npt_pmap/include/stdlib.h projects/bhyve_npt_pmap/lib/Makefile projects/bhyve_npt_pmap/lib/libc/gen/siginterrupt.c projects/bhyve_npt_pmap/lib/libc/gen/signal.c projects/bhyve_npt_pmap/lib/libc/iconv/Symbol.map projects/bhyve_npt_pmap/lib/libc/iconv/citrus_csmapper.c projects/bhyve_npt_pmap/lib/libc/iconv/citrus_iconv.c projects/bhyve_npt_pmap/lib/libc/iconv/citrus_iconv.h projects/bhyve_npt_pmap/lib/libc/iconv/citrus_iconv_local.h projects/bhyve_npt_pmap/lib/libc/iconv/citrus_lock.h projects/bhyve_npt_pmap/lib/libc/iconv/citrus_mapper.c projects/bhyve_npt_pmap/lib/libc/iconv/citrus_none.c projects/bhyve_npt_pmap/lib/libc/iconv/citrus_stdenc.h projects/bhyve_npt_pmap/lib/libc/iconv/citrus_stdenc_local.h projects/bhyve_npt_pmap/lib/libc/iconv/citrus_stdenc_template.h projects/bhyve_npt_pmap/lib/libc/iconv/iconv.c projects/bhyve_npt_pmap/lib/libc/locale/cXXrtomb_iconv.h projects/bhyve_npt_pmap/lib/libc/locale/mbrtocXX_iconv.h projects/bhyve_npt_pmap/lib/libc/stdlib/rand.c projects/bhyve_npt_pmap/lib/libdwarf/dwarf_init.c projects/bhyve_npt_pmap/lib/libdwarf/dwarf_loc.c projects/bhyve_npt_pmap/lib/libfetch/fetch.c projects/bhyve_npt_pmap/lib/libiconv_modules/BIG5/citrus_big5.c projects/bhyve_npt_pmap/lib/libiconv_modules/DECHanyu/citrus_dechanyu.c projects/bhyve_npt_pmap/lib/libiconv_modules/EUC/citrus_euc.c projects/bhyve_npt_pmap/lib/libiconv_modules/EUCTW/citrus_euctw.c projects/bhyve_npt_pmap/lib/libiconv_modules/GBK2K/citrus_gbk2k.c projects/bhyve_npt_pmap/lib/libiconv_modules/HZ/citrus_hz.c projects/bhyve_npt_pmap/lib/libiconv_modules/ISO2022/citrus_iso2022.c projects/bhyve_npt_pmap/lib/libiconv_modules/JOHAB/citrus_johab.c projects/bhyve_npt_pmap/lib/libiconv_modules/MSKanji/citrus_mskanji.c projects/bhyve_npt_pmap/lib/libiconv_modules/UES/citrus_ues.c projects/bhyve_npt_pmap/lib/libiconv_modules/UTF1632/citrus_utf1632.c projects/bhyve_npt_pmap/lib/libiconv_modules/UTF7/citrus_utf7.c projects/bhyve_npt_pmap/lib/libiconv_modules/UTF8/citrus_utf8.c projects/bhyve_npt_pmap/lib/libiconv_modules/VIQR/citrus_viqr.c projects/bhyve_npt_pmap/lib/libiconv_modules/ZW/citrus_zw.c projects/bhyve_npt_pmap/lib/libiconv_modules/iconv_none/citrus_iconv_none.c projects/bhyve_npt_pmap/lib/libiconv_modules/iconv_std/citrus_iconv_std.c projects/bhyve_npt_pmap/lib/libprocstat/Makefile projects/bhyve_npt_pmap/lib/libprocstat/common_kvm.h projects/bhyve_npt_pmap/lib/libprocstat/libprocstat.c projects/bhyve_npt_pmap/lib/librt/sigev_thread.c projects/bhyve_npt_pmap/lib/libstand/nfs.c projects/bhyve_npt_pmap/lib/libutil/login_times.c projects/bhyve_npt_pmap/rescue/rescue/Makefile projects/bhyve_npt_pmap/sbin/devd/devd.8 projects/bhyve_npt_pmap/sbin/devd/devd.cc projects/bhyve_npt_pmap/sbin/dhclient/bpf.c projects/bhyve_npt_pmap/sbin/dhclient/clparse.c projects/bhyve_npt_pmap/sbin/dhclient/dhclient.c projects/bhyve_npt_pmap/sbin/dhclient/dhcpd.h projects/bhyve_npt_pmap/sbin/dhclient/packet.c projects/bhyve_npt_pmap/sbin/dhclient/privsep.c projects/bhyve_npt_pmap/sbin/dhclient/privsep.h projects/bhyve_npt_pmap/sbin/geom/class/part/gpart.8 projects/bhyve_npt_pmap/sbin/hastctl/hastctl.c projects/bhyve_npt_pmap/sbin/hastd/control.c projects/bhyve_npt_pmap/sbin/hastd/hastd.8 projects/bhyve_npt_pmap/sbin/hastd/refcnt.h projects/bhyve_npt_pmap/sbin/ifconfig/af_nd6.c projects/bhyve_npt_pmap/sbin/mdconfig/mdconfig.8 projects/bhyve_npt_pmap/sbin/mdconfig/mdconfig.c projects/bhyve_npt_pmap/sbin/mount/mount.8 projects/bhyve_npt_pmap/sbin/mount/mount.c projects/bhyve_npt_pmap/sbin/nvmecontrol/Makefile projects/bhyve_npt_pmap/sbin/nvmecontrol/nvmecontrol.8 projects/bhyve_npt_pmap/sbin/nvmecontrol/nvmecontrol.c projects/bhyve_npt_pmap/sbin/reboot/boot_i386.8 projects/bhyve_npt_pmap/sbin/swapon/swapon.8 projects/bhyve_npt_pmap/sbin/swapon/swapon.c projects/bhyve_npt_pmap/share/examples/Makefile projects/bhyve_npt_pmap/share/examples/etc/README.examples projects/bhyve_npt_pmap/share/examples/etc/make.conf projects/bhyve_npt_pmap/share/man/man4/Makefile projects/bhyve_npt_pmap/share/man/man4/axe.4 projects/bhyve_npt_pmap/share/man/man4/oce.4 projects/bhyve_npt_pmap/share/man/man4/urtwn.4 projects/bhyve_npt_pmap/share/man/man5/fstab.5 projects/bhyve_npt_pmap/share/man/man5/rc.conf.5 projects/bhyve_npt_pmap/share/man/man5/src.conf.5 projects/bhyve_npt_pmap/share/man/man9/Makefile projects/bhyve_npt_pmap/share/man/man9/locking.9 projects/bhyve_npt_pmap/share/man/man9/rmlock.9 projects/bhyve_npt_pmap/share/misc/committers-ports.dot projects/bhyve_npt_pmap/share/mk/bsd.libnames.mk projects/bhyve_npt_pmap/sys/amd64/include/acpica_machdep.h projects/bhyve_npt_pmap/sys/amd64/include/counter.h projects/bhyve_npt_pmap/sys/amd64/vmm/vmm_instruction_emul.c projects/bhyve_npt_pmap/sys/amd64/vmm/x86.c projects/bhyve_npt_pmap/sys/arm/arm/bus_space_generic.c projects/bhyve_npt_pmap/sys/arm/arm/cpufunc.c projects/bhyve_npt_pmap/sys/arm/arm/db_trace.c projects/bhyve_npt_pmap/sys/arm/arm/exception.S projects/bhyve_npt_pmap/sys/arm/arm/gic.c projects/bhyve_npt_pmap/sys/arm/arm/identcpu.c projects/bhyve_npt_pmap/sys/arm/broadcom/bcm2835/bcm2835_mbox.c projects/bhyve_npt_pmap/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c projects/bhyve_npt_pmap/sys/arm/conf/RPI-B projects/bhyve_npt_pmap/sys/arm/include/armreg.h projects/bhyve_npt_pmap/sys/arm/include/asmacros.h projects/bhyve_npt_pmap/sys/arm/include/counter.h projects/bhyve_npt_pmap/sys/arm/include/intr.h projects/bhyve_npt_pmap/sys/arm/ti/am335x/am335x_lcd.c projects/bhyve_npt_pmap/sys/arm/ti/ti_scm.c projects/bhyve_npt_pmap/sys/arm/versatile/versatile_pci.c projects/bhyve_npt_pmap/sys/arm/versatile/versatile_sic.c projects/bhyve_npt_pmap/sys/boot/i386/gptboot/Makefile projects/bhyve_npt_pmap/sys/cam/cam_ccb.h projects/bhyve_npt_pmap/sys/cam/ctl/ctl_backend_ramdisk.c projects/bhyve_npt_pmap/sys/cam/scsi/scsi_all.c projects/bhyve_npt_pmap/sys/cam/scsi/scsi_xpt.c projects/bhyve_npt_pmap/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_userhold.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/bhyve_npt_pmap/sys/cddl/dev/dtmalloc/dtmalloc.c projects/bhyve_npt_pmap/sys/conf/NOTES projects/bhyve_npt_pmap/sys/conf/files projects/bhyve_npt_pmap/sys/conf/files.amd64 projects/bhyve_npt_pmap/sys/conf/files.arm projects/bhyve_npt_pmap/sys/conf/files.i386 projects/bhyve_npt_pmap/sys/conf/files.ia64 projects/bhyve_npt_pmap/sys/conf/files.mips projects/bhyve_npt_pmap/sys/conf/files.pc98 projects/bhyve_npt_pmap/sys/conf/files.powerpc projects/bhyve_npt_pmap/sys/conf/files.sparc64 projects/bhyve_npt_pmap/sys/conf/newvers.sh projects/bhyve_npt_pmap/sys/conf/options projects/bhyve_npt_pmap/sys/contrib/dev/acpica/acpica_prep.sh projects/bhyve_npt_pmap/sys/contrib/dev/acpica/changes.txt (contents, props changed) projects/bhyve_npt_pmap/sys/contrib/dev/acpica/common/dmrestag.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/common/dmtable.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/common/dmtbdump.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/common/dmtbinfo.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/aslcompile.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/aslmessages.h projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/asltree.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/aslutils.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/dtfield.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/dtio.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/dttable.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/dttemplate.h projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/dtutils.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/preprocess.h projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/prscan.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/debugger/dbcmds.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/debugger/dbdisply.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/debugger/dbinput.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/debugger/dbnames.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/disassembler/dmbuffer.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/disassembler/dmopcode.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/disassembler/dmresrcl.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/disassembler/dmresrcl2.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/events/evgpeinit.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/executer/exdump.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/namespace/nsdump.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/namespace/nsrepair2.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/namespace/nsxfname.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/resources/rsdump.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/resources/rsutils.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/tables/tbxfroot.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/utilities/uteval.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/utilities/utstring.c projects/bhyve_npt_pmap/sys/contrib/dev/acpica/include/acdisasm.h projects/bhyve_npt_pmap/sys/contrib/dev/acpica/include/acpixf.h projects/bhyve_npt_pmap/sys/contrib/dev/acpica/include/actables.h projects/bhyve_npt_pmap/sys/contrib/dev/acpica/include/actypes.h projects/bhyve_npt_pmap/sys/contrib/dev/acpica/include/acutils.h projects/bhyve_npt_pmap/sys/contrib/dev/acpica/include/platform/acfreebsd.h projects/bhyve_npt_pmap/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c projects/bhyve_npt_pmap/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd.c projects/bhyve_npt_pmap/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_freebsd_inc.h projects/bhyve_npt_pmap/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_radio.c projects/bhyve_npt_pmap/sys/dev/acpi_support/atk0110.c projects/bhyve_npt_pmap/sys/dev/acpica/acpi_pcib.c projects/bhyve_npt_pmap/sys/dev/acpica/acpi_pcib_acpi.c projects/bhyve_npt_pmap/sys/dev/ata/chipsets/ata-intel.c projects/bhyve_npt_pmap/sys/dev/ath/ath_hal/ah.c projects/bhyve_npt_pmap/sys/dev/ath/ath_hal/ah_internal.h projects/bhyve_npt_pmap/sys/dev/ath/if_ath_ahb.c projects/bhyve_npt_pmap/sys/dev/ath/if_ath_rx_edma.c projects/bhyve_npt_pmap/sys/dev/bce/if_bce.c projects/bhyve_npt_pmap/sys/dev/bce/if_bcereg.h projects/bhyve_npt_pmap/sys/dev/bge/if_bge.c projects/bhyve_npt_pmap/sys/dev/bge/if_bgereg.h projects/bhyve_npt_pmap/sys/dev/cpuctl/cpuctl.c projects/bhyve_npt_pmap/sys/dev/cxgbe/t4_main.c projects/bhyve_npt_pmap/sys/dev/isci/scil/sati_passthrough.c projects/bhyve_npt_pmap/sys/dev/iwn/if_iwn.c projects/bhyve_npt_pmap/sys/dev/mfi/mfi.c projects/bhyve_npt_pmap/sys/dev/nvme/nvme.h projects/bhyve_npt_pmap/sys/dev/nvme/nvme_ctrlr.c projects/bhyve_npt_pmap/sys/dev/nvme/nvme_private.h projects/bhyve_npt_pmap/sys/dev/nvme/nvme_qpair.c projects/bhyve_npt_pmap/sys/dev/pci/pci.c projects/bhyve_npt_pmap/sys/dev/pci/pci_private.h projects/bhyve_npt_pmap/sys/dev/qlxgbe/ql_os.c projects/bhyve_npt_pmap/sys/dev/re/if_re.c projects/bhyve_npt_pmap/sys/dev/uart/uart.h projects/bhyve_npt_pmap/sys/dev/uart/uart_bus_fdt.c projects/bhyve_npt_pmap/sys/dev/uart/uart_cpu_fdt.c projects/bhyve_npt_pmap/sys/dev/uart/uart_subr.c projects/bhyve_npt_pmap/sys/dev/usb/net/if_axe.c projects/bhyve_npt_pmap/sys/dev/usb/quirk/usb_quirk.c projects/bhyve_npt_pmap/sys/dev/usb/serial/u3g.c projects/bhyve_npt_pmap/sys/dev/usb/usbdevs projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_urtwn.c projects/bhyve_npt_pmap/sys/dev/xen/blkfront/blkfront.c projects/bhyve_npt_pmap/sys/dev/xen/blkfront/block.h projects/bhyve_npt_pmap/sys/fs/ext2fs/ext2_extern.h projects/bhyve_npt_pmap/sys/fs/ext2fs/ext2_lookup.c projects/bhyve_npt_pmap/sys/fs/ext2fs/ext2_vfsops.c projects/bhyve_npt_pmap/sys/fs/nfsclient/nfs_clport.c projects/bhyve_npt_pmap/sys/fs/smbfs/smbfs_node.c projects/bhyve_npt_pmap/sys/fs/smbfs/smbfs_smb.c projects/bhyve_npt_pmap/sys/fs/smbfs/smbfs_vfsops.c projects/bhyve_npt_pmap/sys/fs/smbfs/smbfs_vnops.c projects/bhyve_npt_pmap/sys/geom/geom_io.c projects/bhyve_npt_pmap/sys/i386/include/acpica_machdep.h projects/bhyve_npt_pmap/sys/i386/include/counter.h projects/bhyve_npt_pmap/sys/ia64/include/acpica_machdep.h projects/bhyve_npt_pmap/sys/ia64/include/counter.h projects/bhyve_npt_pmap/sys/kern/Make.tags.inc projects/bhyve_npt_pmap/sys/kern/kern_acct.c projects/bhyve_npt_pmap/sys/kern/kern_clock.c projects/bhyve_npt_pmap/sys/kern/kern_cpuset.c projects/bhyve_npt_pmap/sys/kern/kern_descrip.c projects/bhyve_npt_pmap/sys/kern/kern_lock.c projects/bhyve_npt_pmap/sys/kern/kern_mutex.c projects/bhyve_npt_pmap/sys/kern/kern_rmlock.c projects/bhyve_npt_pmap/sys/kern/kern_rwlock.c projects/bhyve_npt_pmap/sys/kern/kern_sx.c projects/bhyve_npt_pmap/sys/kern/kern_synch.c projects/bhyve_npt_pmap/sys/kern/subr_bus.c projects/bhyve_npt_pmap/sys/kern/subr_counter.c projects/bhyve_npt_pmap/sys/kern/subr_lock.c projects/bhyve_npt_pmap/sys/kern/sys_generic.c projects/bhyve_npt_pmap/sys/kern/uipc_usrreq.c projects/bhyve_npt_pmap/sys/kern/vfs_bio.c projects/bhyve_npt_pmap/sys/mips/conf/AR933X_BASE projects/bhyve_npt_pmap/sys/mips/conf/AR933X_BASE.hints projects/bhyve_npt_pmap/sys/mips/conf/CARAMBOLA2.hints projects/bhyve_npt_pmap/sys/mips/include/counter.h projects/bhyve_npt_pmap/sys/modules/Makefile projects/bhyve_npt_pmap/sys/modules/cc/Makefile projects/bhyve_npt_pmap/sys/net/if_bridge.c projects/bhyve_npt_pmap/sys/net/if_lagg.c projects/bhyve_npt_pmap/sys/net80211/ieee80211_ioctl.c projects/bhyve_npt_pmap/sys/netinet/if_ether.c projects/bhyve_npt_pmap/sys/netinet/in_mcast.c projects/bhyve_npt_pmap/sys/netinet/sctp_indata.c projects/bhyve_npt_pmap/sys/netinet/sctp_indata.h projects/bhyve_npt_pmap/sys/netinet/sctp_input.c projects/bhyve_npt_pmap/sys/netinet/sctp_pcb.c projects/bhyve_npt_pmap/sys/netinet6/in6.c projects/bhyve_npt_pmap/sys/netinet6/in6_ifattach.c projects/bhyve_npt_pmap/sys/netinet6/in6_var.h projects/bhyve_npt_pmap/sys/netinet6/nd6.c projects/bhyve_npt_pmap/sys/netsmb/smb_conn.c projects/bhyve_npt_pmap/sys/nfsclient/nfs_vnops.c projects/bhyve_npt_pmap/sys/powerpc/include/counter.h projects/bhyve_npt_pmap/sys/powerpc/wii/wii_ipcreg.h projects/bhyve_npt_pmap/sys/sparc64/include/counter.h projects/bhyve_npt_pmap/sys/sys/_rmlock.h projects/bhyve_npt_pmap/sys/sys/bus.h projects/bhyve_npt_pmap/sys/sys/cpuset.h projects/bhyve_npt_pmap/sys/sys/lock.h projects/bhyve_npt_pmap/sys/sys/malloc.h projects/bhyve_npt_pmap/sys/sys/rmlock.h projects/bhyve_npt_pmap/sys/sys/socketvar.h projects/bhyve_npt_pmap/sys/sys/stdatomic.h projects/bhyve_npt_pmap/sys/ufs/ffs/ffs_alloc.c projects/bhyve_npt_pmap/sys/ufs/ffs/ffs_balloc.c projects/bhyve_npt_pmap/sys/ufs/ufs/dinode.h projects/bhyve_npt_pmap/sys/ufs/ufs/inode.h projects/bhyve_npt_pmap/sys/ufs/ufs/ufs_extattr.c projects/bhyve_npt_pmap/sys/ufs/ufs/ufs_vnops.c projects/bhyve_npt_pmap/sys/vm/uma.h projects/bhyve_npt_pmap/sys/vm/uma_core.c projects/bhyve_npt_pmap/sys/vm/uma_int.h projects/bhyve_npt_pmap/sys/vm/vm.h projects/bhyve_npt_pmap/sys/vm/vm_init.c projects/bhyve_npt_pmap/sys/vm/vm_kern.c projects/bhyve_npt_pmap/sys/vm/vm_kern.h projects/bhyve_npt_pmap/sys/vm/vm_object.c projects/bhyve_npt_pmap/sys/vm/vm_pager.c projects/bhyve_npt_pmap/sys/vm/vm_pager.h projects/bhyve_npt_pmap/tools/tools/ath/Makefile.inc projects/bhyve_npt_pmap/tools/tools/cxgbetool/cxgbetool.c projects/bhyve_npt_pmap/usr.bin/Makefile projects/bhyve_npt_pmap/usr.bin/Makefile.amd64 projects/bhyve_npt_pmap/usr.bin/Makefile.i386 projects/bhyve_npt_pmap/usr.bin/Makefile.ia64 projects/bhyve_npt_pmap/usr.bin/Makefile.powerpc projects/bhyve_npt_pmap/usr.bin/Makefile.sparc64 projects/bhyve_npt_pmap/usr.bin/calendar/calendars/calendar.freebsd projects/bhyve_npt_pmap/usr.bin/iconv/iconv.c projects/bhyve_npt_pmap/usr.bin/kdump/kdump.c projects/bhyve_npt_pmap/usr.bin/killall/killall.1 projects/bhyve_npt_pmap/usr.bin/killall/killall.c projects/bhyve_npt_pmap/usr.bin/mkcsmapper/lex.l projects/bhyve_npt_pmap/usr.bin/mkesdb/lex.l projects/bhyve_npt_pmap/usr.bin/patch/pch.c projects/bhyve_npt_pmap/usr.bin/rwho/rwho.c projects/bhyve_npt_pmap/usr.bin/sed/main.c projects/bhyve_npt_pmap/usr.bin/svn/lib/libapr_util/Makefile projects/bhyve_npt_pmap/usr.bin/svn/lib/libapr_util/apr_ldap.h projects/bhyve_npt_pmap/usr.bin/svn/lib/libapr_util/apu.h projects/bhyve_npt_pmap/usr.bin/svn/lib/libapr_util/apu_config.h projects/bhyve_npt_pmap/usr.bin/truss/syscalls.c projects/bhyve_npt_pmap/usr.sbin/Makefile.amd64 projects/bhyve_npt_pmap/usr.sbin/Makefile.i386 projects/bhyve_npt_pmap/usr.sbin/Makefile.ia64 projects/bhyve_npt_pmap/usr.sbin/Makefile.powerpc projects/bhyve_npt_pmap/usr.sbin/Makefile.sparc64 projects/bhyve_npt_pmap/usr.sbin/acpi/acpidb/acpidb.c projects/bhyve_npt_pmap/usr.sbin/acpi/acpidump/acpi.c projects/bhyve_npt_pmap/usr.sbin/bhyve/atpic.c projects/bhyve_npt_pmap/usr.sbin/bhyve/pci_emul.c projects/bhyve_npt_pmap/usr.sbin/bsnmpd/modules/snmp_hast/BEGEMOT-HAST-MIB.txt projects/bhyve_npt_pmap/usr.sbin/bsnmpd/modules/snmp_hast/hast_snmp.c projects/bhyve_npt_pmap/usr.sbin/bsnmpd/modules/snmp_hast/hast_tree.def projects/bhyve_npt_pmap/usr.sbin/newsyslog/newsyslog.c projects/bhyve_npt_pmap/usr.sbin/nfsd/nfsv4.4 projects/bhyve_npt_pmap/usr.sbin/pkg_install/add/extract.c projects/bhyve_npt_pmap/usr.sbin/pkg_install/create/pl.c projects/bhyve_npt_pmap/usr.sbin/pkg_install/lib/exec.c projects/bhyve_npt_pmap/usr.sbin/pw/pw_user.c projects/bhyve_npt_pmap/usr.sbin/rwhod/rwhod.c Directory Properties: projects/bhyve_npt_pmap/ (props changed) projects/bhyve_npt_pmap/cddl/ (props changed) projects/bhyve_npt_pmap/cddl/contrib/opensolaris/ (props changed) projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/ (props changed) projects/bhyve_npt_pmap/contrib/libstdc++/ (props changed) projects/bhyve_npt_pmap/contrib/llvm/ (props changed) projects/bhyve_npt_pmap/contrib/llvm/tools/clang/ (props changed) projects/bhyve_npt_pmap/crypto/heimdal/ (props changed) projects/bhyve_npt_pmap/crypto/openssh/ (props changed) projects/bhyve_npt_pmap/lib/libc/ (props changed) projects/bhyve_npt_pmap/lib/libutil/ (props changed) projects/bhyve_npt_pmap/sbin/ (props changed) projects/bhyve_npt_pmap/share/man/man4/ (props changed) projects/bhyve_npt_pmap/sys/ (props changed) projects/bhyve_npt_pmap/sys/amd64/vmm/ (props changed) projects/bhyve_npt_pmap/sys/boot/ (props changed) projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/ (props changed) projects/bhyve_npt_pmap/sys/conf/ (props changed) projects/bhyve_npt_pmap/sys/contrib/dev/acpica/ (props changed) projects/bhyve_npt_pmap/sys/contrib/dev/acpica/common/ (props changed) projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/ (props changed) projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/debugger/ (props changed) projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/disassembler/ (props changed) projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/events/ (props changed) projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/executer/ (props changed) projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/namespace/ (props changed) projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/resources/ (props changed) projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/tables/ (props changed) projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/utilities/ (props changed) projects/bhyve_npt_pmap/sys/contrib/dev/acpica/include/ (props changed) projects/bhyve_npt_pmap/sys/contrib/dev/acpica/os_specific/ (props changed) projects/bhyve_npt_pmap/usr.bin/calendar/ (props changed) projects/bhyve_npt_pmap/usr.sbin/bhyve/ (props changed) Modified: projects/bhyve_npt_pmap/Makefile.inc1 ============================================================================== --- projects/bhyve_npt_pmap/Makefile.inc1 Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/Makefile.inc1 Tue Aug 20 21:43:46 2013 (r254583) @@ -1131,11 +1131,11 @@ legacy: .endif .for _tool in tools/build ${_+_}@${ECHODIR} "===> ${_tool} (obj,includes,depend,all,install)"; \ - cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ - ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes; \ - ${MAKE} DIRPRFX=${_tool}/ depend; \ - ${MAKE} DIRPRFX=${_tool}/ all; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ + ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy includes && \ + ${MAKE} DIRPRFX=${_tool}/ depend && \ + ${MAKE} DIRPRFX=${_tool}/ all && \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install .endfor @@ -1264,10 +1264,10 @@ bootstrap-tools: ${_crunch} \ ${_nmtree} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ - ${MAKE} DIRPRFX=${_tool}/ depend; \ - ${MAKE} DIRPRFX=${_tool}/ all; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ + ${MAKE} DIRPRFX=${_tool}/ depend && \ + ${MAKE} DIRPRFX=${_tool}/ all && \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX}/legacy install .endfor @@ -1305,16 +1305,16 @@ build-tools: usr.bin/mkesdb_static \ usr.bin/mkcsmapper_static ${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools)"; \ - cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ ${MAKE} DIRPRFX=${_tool}/ build-tools .endfor .for _tool in \ ${_gcc_tools} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \ - cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ - ${MAKE} DIRPRFX=${_tool}/ depend; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ + ${MAKE} DIRPRFX=${_tool}/ depend && \ ${MAKE} DIRPRFX=${_tool}/ all .endfor @@ -1363,10 +1363,10 @@ cross-tools: ${_crunchide} \ ${_kgzip} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_tool}; \ - ${MAKE} DIRPRFX=${_tool}/ obj; \ - ${MAKE} DIRPRFX=${_tool}/ depend; \ - ${MAKE} DIRPRFX=${_tool}/ all; \ + cd ${.CURDIR}/${_tool} && \ + ${MAKE} DIRPRFX=${_tool}/ obj && \ + ${MAKE} DIRPRFX=${_tool}/ depend && \ + ${MAKE} DIRPRFX=${_tool}/ all && \ ${MAKE} DIRPRFX=${_tool}/ DESTDIR=${MAKEOBJDIRPREFIX} install .endfor @@ -1545,10 +1545,10 @@ lib/libradius__L: lib/libmd__L ${_lib}__PL: .PHONY .if exists(${.CURDIR}/${_lib}) ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_lib}; \ - ${MAKE} DIRPRFX=${_lib}/ obj; \ - ${MAKE} DIRPRFX=${_lib}/ depend; \ - ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all; \ + cd ${.CURDIR}/${_lib} && \ + ${MAKE} DIRPRFX=${_lib}/ obj && \ + ${MAKE} DIRPRFX=${_lib}/ depend && \ + ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ all && \ ${MAKE} -DNO_PROFILE -DNO_PIC DIRPRFX=${_lib}/ install .endif .endfor @@ -1557,10 +1557,10 @@ ${_lib}__PL: .PHONY ${_lib}__L: .PHONY .if exists(${.CURDIR}/${_lib}) ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_lib}; \ - ${MAKE} DIRPRFX=${_lib}/ obj; \ - ${MAKE} DIRPRFX=${_lib}/ depend; \ - ${MAKE} DIRPRFX=${_lib}/ all; \ + cd ${.CURDIR}/${_lib} && \ + ${MAKE} DIRPRFX=${_lib}/ obj && \ + ${MAKE} DIRPRFX=${_lib}/ depend && \ + ${MAKE} DIRPRFX=${_lib}/ all && \ ${MAKE} DIRPRFX=${_lib}/ install .endif .endfor @@ -1570,10 +1570,10 @@ ${_lib}__L: .PHONY # 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; \ + 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/} @@ -1584,7 +1584,7 @@ _generic_libs: ${_generic_libs:S/$/__L/} .for __target in all clean cleandepend cleandir depend includes obj .for entry in ${SUBDIR} ${entry}.${__target}__D: .PHONY - ${_+_}@if test -d ${.CURDIR}/${entry}.${MACHINE_ARCH}; then \ + ${_+_}@set -e; if test -d ${.CURDIR}/${entry}.${MACHINE_ARCH}; then \ ${ECHODIR} "===> ${DIRPRFX}${entry}.${MACHINE_ARCH} (${__target})"; \ edir=${entry}.${MACHINE_ARCH}; \ cd ${.CURDIR}/$${edir}; \ @@ -1822,10 +1822,10 @@ _xb-bootstrap-tools: .for _tool in \ ${_clang_tblgen} ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ - cd ${.CURDIR}/${_tool}; \ - ${CDMAKE} DIRPRFX=${_tool}/ obj; \ - ${CDMAKE} DIRPRFX=${_tool}/ depend; \ - ${CDMAKE} DIRPRFX=${_tool}/ all; \ + cd ${.CURDIR}/${_tool} && \ + ${CDMAKE} DIRPRFX=${_tool}/ obj && \ + ${CDMAKE} DIRPRFX=${_tool}/ depend && \ + ${CDMAKE} DIRPRFX=${_tool}/ all && \ ${CDMAKE} DIRPRFX=${_tool}/ DESTDIR=${CDTMP} install .endfor @@ -1841,9 +1841,9 @@ _xb-cross-tools: ${_clang_libs} \ ${_clang} ${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,depend,all)"; \ - cd ${.CURDIR}/${_tool}; \ - ${CDMAKE} DIRPRFX=${_tool}/ obj; \ - ${CDMAKE} DIRPRFX=${_tool}/ depend; \ + cd ${.CURDIR}/${_tool} && \ + ${CDMAKE} DIRPRFX=${_tool}/ obj && \ + ${CDMAKE} DIRPRFX=${_tool}/ depend && \ ${CDMAKE} DIRPRFX=${_tool}/ all .endfor Modified: projects/bhyve_npt_pmap/ObsoleteFiles.inc ============================================================================== --- projects/bhyve_npt_pmap/ObsoleteFiles.inc Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/ObsoleteFiles.inc Tue Aug 20 21:43:46 2013 (r254583) @@ -41,7 +41,7 @@ # 20130623: dialog update from 1.1 to 1.2 OLD_LIBS+=usr/lib/libdialog.so.7 OLD_LIBS+=usr/lib32/libdialog.so.7 -# 20130616: vfs_mounted.9 removed +# 20130616: vfs_mount.9 removed OLD_FILES+=usr/share/man/man9/vfs_mount.9.gz # 20130614: remove CVS from base OLD_FILES+=usr/bin/cvs Modified: projects/bhyve_npt_pmap/UPDATING ============================================================================== --- projects/bhyve_npt_pmap/UPDATING Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/UPDATING Tue Aug 20 21:43:46 2013 (r254583) @@ -31,6 +31,14 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20130629: + Fix targets that run multiple make's to use && rather than ; + so that subsequent steps depend on success of previous. + + NOTE: if building 'universe' with -j* on stable/8 or stable/9 + it would be better to start the build using bmake, to avoid + overloading the machine. + 20130618: Fix a bug that allowed a tracing process (e.g. gdb) to write to a memory-mapped file in the traced process's address space Modified: projects/bhyve_npt_pmap/bin/ed/re.c ============================================================================== --- projects/bhyve_npt_pmap/bin/ed/re.c Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/bin/ed/re.c Tue Aug 20 21:43:46 2013 (r254583) @@ -89,7 +89,7 @@ extract_pattern(int delimiter) default: break; case '[': - if ((nd = parse_char_class(++nd)) == NULL) { + if ((nd = parse_char_class(nd + 1)) == NULL) { errmsg = "unbalanced brackets ([])"; return NULL; } Modified: projects/bhyve_npt_pmap/bin/sh/eval.c ============================================================================== --- projects/bhyve_npt_pmap/bin/sh/eval.c Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/bin/sh/eval.c Tue Aug 20 21:43:46 2013 (r254583) @@ -589,7 +589,8 @@ evalpipe(union node *n) pip[1] = -1; if (lp->next) { if (pipe(pip) < 0) { - close(prevfd); + if (prevfd >= 0) + close(prevfd); error("Pipe call failed: %s", strerror(errno)); } } Modified: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c ============================================================================== --- projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c Tue Aug 20 21:43:46 2013 (r254583) @@ -21,9 +21,9 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright 2012 Nexenta Systems, Inc. All rights reserved. - * Copyright (c) 2011 by Delphix. All rights reserved. + * Copyright (c) 2013 by Delphix. All rights reserved. * Copyright (c) 2012 DEY Storage Systems, Inc. All rights reserved. + * Copyright 2012 Nexenta Systems, Inc. All rights reserved. * Copyright (c) 2011-2012 Pawel Jakub Dawidek . * All rights reserved. * Copyright (c) 2012 Martin Matuska . All rights reserved. @@ -4159,6 +4159,7 @@ struct holdarg { const char *snapname; const char *tag; boolean_t recursive; + int error; }; static int @@ -4286,15 +4287,20 @@ zfs_release_one(zfs_handle_t *zhp, void struct holdarg *ha = arg; char name[ZFS_MAXNAMELEN]; int rv = 0; + nvlist_t *existing_holds; (void) snprintf(name, sizeof (name), "%s@%s", zhp->zfs_name, ha->snapname); - if (lzc_exists(name)) { - nvlist_t *holds = fnvlist_alloc(); - fnvlist_add_boolean(holds, ha->tag); - fnvlist_add_nvlist(ha->nvl, name, holds); - fnvlist_free(holds); + if (lzc_get_holds(name, &existing_holds) != 0) { + ha->error = ENOENT; + } else if (!nvlist_exists(existing_holds, ha->tag)) { + ha->error = ESRCH; + } else { + nvlist_t *torelease = fnvlist_alloc(); + fnvlist_add_boolean(torelease, ha->tag); + fnvlist_add_nvlist(ha->nvl, name, torelease); + fnvlist_free(torelease); } if (ha->recursive) @@ -4318,16 +4324,21 @@ zfs_release(zfs_handle_t *zhp, const cha ha.snapname = snapname; ha.tag = tag; ha.recursive = recursive; + ha.error = 0; (void) zfs_release_one(zfs_handle_dup(zhp), &ha); if (nvlist_empty(ha.nvl)) { fnvlist_free(ha.nvl); - ret = ENOENT; + ret = ha.error; (void) snprintf(errbuf, sizeof (errbuf), dgettext(TEXT_DOMAIN, "cannot release hold from snapshot '%s@%s'"), zhp->zfs_name, snapname); - (void) zfs_standard_error(hdl, ret, errbuf); + if (ret == ESRCH) { + (void) zfs_error(hdl, EZFS_REFTAG_RELE, errbuf); + } else { + (void) zfs_standard_error(hdl, ret, errbuf); + } return (ret); } Modified: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c ============================================================================== --- projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c Tue Aug 20 21:43:46 2013 (r254583) @@ -22,6 +22,7 @@ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012 by Delphix. All rights reserved. + * Copyright (c) 2013 Steven Hartland. All rights reserved. */ /* Modified: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c ============================================================================== --- projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs_core/common/libzfs_core.c Tue Aug 20 21:43:46 2013 (r254583) @@ -302,11 +302,8 @@ lzc_snapshot(nvlist_t *snaps, nvlist_t * * marked for deferred destruction, and will be destroyed when the last hold * or clone is removed/destroyed. * - * The return value will be ENOENT if none of the snapshots existed. - * * The return value will be 0 if all snapshots were destroyed (or marked for - * later destruction if 'defer' is set) or didn't exist to begin with and - * at least one snapshot was destroyed. + * later destruction if 'defer' is set) or didn't exist to begin with. * * Otherwise the return value will be the errno of a (unspecified) snapshot * that failed, no snapshots will be destroyed, and the errlist will have an @@ -397,15 +394,10 @@ lzc_exists(const char *dataset) * or imported. * * Holds for snapshots which don't exist will be skipped and have an entry - * added to errlist, but will not cause an overall failure, except in the - * case that all holds where skipped. - * - * The return value will be ENOENT if none of the snapshots for the requested - * holds existed. + * added to errlist, but will not cause an overall failure. * - * The return value will be 0 if the nvl holds was empty or all holds, for - * snapshots that existed, were succesfully created and at least one hold - * was created. + * The return value will be 0 if all holds, for snapshots that existed, + * were succesfully created. * * Otherwise the return value will be the errno of a (unspecified) hold that * failed and no holds will be created. @@ -449,13 +441,10 @@ lzc_hold(nvlist_t *holds, int cleanup_fd * The value is a nvlist whose keys are the holds to remove. * * Holds which failed to release because they didn't exist will have an entry - * added to errlist, but will not cause an overall failure, except in the - * case that all releases where skipped. - * - * The return value will be ENOENT if none of the specified holds existed. + * added to errlist, but will not cause an overall failure. * * The return value will be 0 if the nvl holds was empty or all holds that - * existed, were successfully removed and at least one hold was removed. + * existed, were successfully removed. * * Otherwise the return value will be the errno of a (unspecified) hold that * failed to release and no holds will be released. Modified: projects/bhyve_npt_pmap/contrib/libstdc++/libsupc++/unwind-cxx.h ============================================================================== --- projects/bhyve_npt_pmap/contrib/libstdc++/libsupc++/unwind-cxx.h Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/contrib/libstdc++/libsupc++/unwind-cxx.h Tue Aug 20 21:43:46 2013 (r254583) @@ -133,7 +133,7 @@ extern "C" void __cxa_bad_typeid (); // throws, and if bad_exception needs to be thrown. Called from the // compiler. extern "C" void __cxa_call_unexpected (void *) __attribute__((noreturn)); -extern "C" void __cxa_call_terminate (void*) __attribute__((noreturn)); +extern "C" void __cxa_call_terminate (_Unwind_Exception*) __attribute__((noreturn)); #ifdef __ARM_EABI_UNWINDER__ // Arm EABI specified routines. Modified: projects/bhyve_npt_pmap/contrib/llvm/lib/Target/ARM/ARMFrameLowering.h ============================================================================== --- projects/bhyve_npt_pmap/contrib/llvm/lib/Target/ARM/ARMFrameLowering.h Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/contrib/llvm/lib/Target/ARM/ARMFrameLowering.h Tue Aug 20 21:43:46 2013 (r254583) @@ -27,7 +27,7 @@ protected: public: explicit ARMFrameLowering(const ARMSubtarget &sti) - : TargetFrameLowering(StackGrowsDown, sti.getStackAlignment(), 0, 4), + : TargetFrameLowering(StackGrowsDown, sti.getStackAlignment(), 0, 8), STI(sti) { } Modified: projects/bhyve_npt_pmap/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp ============================================================================== --- projects/bhyve_npt_pmap/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/contrib/llvm/tools/clang/lib/Sema/SemaDecl.cpp Tue Aug 20 21:43:46 2013 (r254583) @@ -10296,7 +10296,8 @@ void Sema::ActOnTagFinishDefinition(Scop Tag->setTopLevelDeclInObjCContainer(); // Notify the consumer that we've defined a tag. - Consumer.HandleTagDeclDefinition(Tag); + if (!Tag->isInvalidDecl()) + Consumer.HandleTagDeclDefinition(Tag); } void Sema::ActOnObjCContainerFinishDefinition() { Modified: projects/bhyve_npt_pmap/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h ============================================================================== --- projects/bhyve_npt_pmap/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/crypto/heimdal/lib/gssapi/gssapi/gssapi_krb5.h Tue Aug 20 21:43:46 2013 (r254583) @@ -36,7 +36,7 @@ #ifndef GSSAPI_KRB5_H_ #define GSSAPI_KRB5_H_ -#include +#include GSSAPI_CPP_START Modified: projects/bhyve_npt_pmap/crypto/openssh/sshd_config ============================================================================== --- projects/bhyve_npt_pmap/crypto/openssh/sshd_config Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/crypto/openssh/sshd_config Tue Aug 20 21:43:46 2013 (r254583) @@ -105,7 +105,7 @@ #PrintLastLog yes #TCPKeepAlive yes #UseLogin no -#UsePrivilegeSeparation sandbox +#UsePrivilegeSeparation yes #PermitUserEnvironment no #Compression delayed #ClientAliveInterval 0 Modified: projects/bhyve_npt_pmap/crypto/openssh/sshd_config.5 ============================================================================== --- projects/bhyve_npt_pmap/crypto/openssh/sshd_config.5 Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/crypto/openssh/sshd_config.5 Tue Aug 20 21:43:46 2013 (r254583) @@ -1169,7 +1169,7 @@ the privilege of the authenticated user. The goal of privilege separation is to prevent privilege escalation by containing any corruption within the unprivileged processes. The default is -.Dq sandbox . +.Dq yes . If .Cm UsePrivilegeSeparation is set to Modified: projects/bhyve_npt_pmap/etc/defaults/rc.conf ============================================================================== --- projects/bhyve_npt_pmap/etc/defaults/rc.conf Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/etc/defaults/rc.conf Tue Aug 20 21:43:46 2013 (r254583) @@ -32,8 +32,6 @@ early_late_divider="FILESYSTEMS" # Scrip always_force_depends="NO" # Set to check that indicated dependencies are # running during boot (can increase boot time). -swapfile="NO" # Set to name of swapfile if aux swapfile desired. -swapfile_mdunit="99" # Swapfile md(4) unit number created by mdconfig(8). apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO). apmd_enable="NO" # Run apmd to handle APM event from userland. apmd_flags="" # Flags to apmd (if enabled). @@ -85,15 +83,12 @@ geli_autodetach="YES" # Automatically de #geli_da1_autodetach="NO" #geli_mirror_home_flags="-k /etc/geli/home.keys" -geli_swap_flags="-e aes -l 256 -s 4096 -d" # Options for GELI-encrypted - # swap partitions. - root_rw_mount="YES" # Set to NO to inhibit remounting root read-write. fsck_y_enable="NO" # Set to YES to do fsck -y if the initial preen fails. fsck_y_flags="" # Additional flags for fsck -y background_fsck="YES" # Attempt to run fsck in the background where possible. background_fsck_delay="60" # Time to wait (seconds) before starting the fsck. -netfs_types="nfs:NFS oldnfs:OLDNFS" # Net filesystems. +netfs_types="nfs:NFS oldnfs:OLDNFS smbfs:SMB" # Net filesystems. extra_netfs_types="NO" # List of network extra filesystem types for delayed # mount at startup (or NO). Modified: projects/bhyve_npt_pmap/etc/devd/usb.conf ============================================================================== --- projects/bhyve_npt_pmap/etc/devd/usb.conf Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/etc/devd/usb.conf Tue Aug 20 21:43:46 2013 (r254583) @@ -4299,7 +4299,7 @@ nomatch 32 { match "bus" "uhub[0-9]+"; match "mode" "host"; match "vendor" "0x2001"; - match "product" "(0x3307|0x3308|0x3309|0x330a)"; + match "product" "(0x3307|0x3308|0x3309|0x330a|0x330d)"; action "kldload -n if_urtwn"; }; @@ -4976,5 +4976,5 @@ nomatch 32 { action "kldload -n umass"; }; -# 2479 USB entries processed +# 2480 USB entries processed Modified: projects/bhyve_npt_pmap/etc/mtree/BSD.include.dist ============================================================================== --- projects/bhyve_npt_pmap/etc/mtree/BSD.include.dist Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/etc/mtree/BSD.include.dist Tue Aug 20 21:43:46 2013 (r254583) @@ -176,6 +176,8 @@ .. procfs .. + smbfs + .. udf .. unionfs Modified: projects/bhyve_npt_pmap/etc/mtree/BSD.usr.dist ============================================================================== --- projects/bhyve_npt_pmap/etc/mtree/BSD.usr.dist Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/etc/mtree/BSD.usr.dist Tue Aug 20 21:43:46 2013 (r254583) @@ -309,6 +309,10 @@ srcs .. .. + smbfs + print + .. + .. sunrpc dir .. Modified: projects/bhyve_npt_pmap/etc/network.subr ============================================================================== --- projects/bhyve_npt_pmap/etc/network.subr Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/etc/network.subr Tue Aug 20 21:43:46 2013 (r254583) @@ -164,6 +164,9 @@ ifconfig_up() fi fi + ifalias $1 link alias + ifalias $1 ether alias + if [ ${_cfg} -eq 0 ]; then ${IFCONFIG_CMD} $1 up fi @@ -171,6 +174,9 @@ ifconfig_up() if wpaif $1; then /etc/rc.d/wpa_supplicant start $1 _cfg=0 # XXX: not sure this should count + elif hostapif $1; then + /etc/rc.d/hostapd start $1 + _cfg=0 fi if dhcpif $1; then @@ -198,6 +204,9 @@ ifconfig_down() if wpaif $1; then /etc/rc.d/wpa_supplicant stop $1 _cfg=0 + elif hostapif $1; then + /etc/rc.d/hostapd stop $1 + _cfg=0 fi if dhcpif $1; then @@ -276,6 +285,7 @@ ifconfig_getargs() [Nn][Oo][Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp]) ;; [Ss][Yy][Nn][Cc][Dd][Hh][Cc][Pp]) ;; [Ww][Pp][Aa]) ;; + [Hh][Oo][Ss][Tt][Aa][Pp]) ;; *) _args="$_args $_arg" ;; @@ -311,6 +321,15 @@ dhcpif() local _tmpargs _arg _tmpargs=`_ifconfig_getargs $1` + case $1 in + lo[0-9]*|\ + stf[0-9]*|\ + faith[0-9]*|\ + lp[0-9]*|\ + sl[0-9]*) + return 1 + ;; + esac if noafif $1; then return 1 fi @@ -376,6 +395,24 @@ wpaif() return 1 } +# hostapif if +# Returns 0 if the interface is a HOSTAP interface and 1 otherwise. +hostapif() +{ + local _tmpargs _arg + _tmpargs=`_ifconfig_getargs $1` + + for _arg in $_tmpargs; do + case $_arg in + [Hh][Oo][Ss][Tt][Aa][Pp]) + return 0 + ;; + esac + done + + return 1 +} + # afexists af # Returns 0 if the address family is enabled in the kernel # 1 otherwise. @@ -398,6 +435,9 @@ afexists() return 1 fi ;; + link|ether) + return 0 + ;; *) err 1 "afexists(): Unsupported address family: $_af" ;; @@ -484,7 +524,7 @@ ipv6_autoconfif() _if=$1 case $_if in - lo0|\ + lo[0-9]*|\ stf[0-9]*|\ faith[0-9]*|\ lp[0-9]*|\ @@ -666,7 +706,7 @@ ifalias() afexists $2 || return $_ret case "$2" in - inet|inet6) + inet|inet6|link|ether) ifalias_af_common $1 $2 $3 && _ret=0 ;; esac @@ -873,6 +913,11 @@ ifalias_af_common_handler() *) return ;; esac + # link(ether) does not support address removal. + case $_af:$_action in + link:-alias|ether:-alias) return ;; + esac + _tmpargs= for _c in $_args; do case $_c in @@ -931,6 +976,8 @@ ifalias_af_common() inet\ *) _iaf=inet ;; inet6\ *) _iaf=inet6 ;; ipx\ *) _iaf=ipx ;; + link\ *) _iaf=link ;; + ether\ *) _iaf=ether ;; esac case ${_af}:${_action}:${_iaf}:"${ifconfig_args}" in @@ -978,7 +1025,7 @@ ifalias_af_common() _tmpargs= for _c in `get_if_var $_if ifconfig_IF_aliases` $_aliasn; do case $_c in - inet|inet6|ipx) + inet|inet6|ipx|link|ether) case $_tmpargs in ${_af}\ *) eval ifalias_af_common_handler $_if $_af $_action $_tmpargs && _ret=0 Modified: projects/bhyve_npt_pmap/etc/newsyslog.conf ============================================================================== --- projects/bhyve_npt_pmap/etc/newsyslog.conf Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/etc/newsyslog.conf Tue Aug 20 21:43:46 2013 (r254583) @@ -32,6 +32,7 @@ /var/log/monthly.log 640 12 * $M1D0 JN /var/log/pflog 600 3 100 * JB /var/run/pflogd.pid /var/log/ppp.log root:network 640 3 100 * JC +/var/log/devd.log 644 3 100 * JC /var/log/security 600 10 100 * JC /var/log/sendmail.st 640 10 * 168 BN /var/log/utx.log 644 3 * @01T05 B Modified: projects/bhyve_npt_pmap/etc/periodic/daily/450.status-security ============================================================================== --- projects/bhyve_npt_pmap/etc/periodic/daily/450.status-security Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/etc/periodic/daily/450.status-security Tue Aug 20 21:43:46 2013 (r254583) @@ -18,19 +18,19 @@ case "$daily_status_security_enable" in case "$daily_status_security_inline" in [Yy][Ee][Ss]) - export security_output="";; + daily_status_security_output="";; + esac + + export security_output="${daily_status_security_output}" + case "${daily_status_security_output}" in + "") + rc=3;; + /*) + echo " (output logged separately)" + rc=0;; *) - export security_output="${daily_status_security_output}" - case "${daily_status_security_output}" in - "") - rc=3;; - /*) - echo " (output logged separately)" - rc=0;; - *) - echo " (output mailed separately)" - rc=0;; - esac;; + echo " (output mailed separately)" + rc=0;; esac periodic security || rc=3;; Modified: projects/bhyve_npt_pmap/etc/rc.d/Makefile ============================================================================== --- projects/bhyve_npt_pmap/etc/rc.d/Makefile Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/etc/rc.d/Makefile Tue Aug 20 21:43:46 2013 (r254583) @@ -37,7 +37,6 @@ FILES= DAEMON \ dhclient \ dmesg \ dumpon \ - encswap \ faith \ fsck \ ftp-proxy \ @@ -139,7 +138,8 @@ FILES= DAEMON \ static_arp \ static_ndp \ stf \ - swap1 \ + swap \ + swaplate \ syscons \ sysctl \ syslogd \ Modified: projects/bhyve_npt_pmap/etc/rc.d/addswap ============================================================================== --- projects/bhyve_npt_pmap/etc/rc.d/addswap Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/etc/rc.d/addswap Tue Aug 20 21:43:46 2013 (r254583) @@ -13,57 +13,12 @@ . /etc/rc.subr name="addswap" -start_cmd="addswap_start" -stop_cmd="addswap_stop" +start_cmd=":" +stop_cmd=":" +rcvar= -addswap_start() -{ - case ${swapfile} in - [Nn][Oo] | '') - ;; - *) - if [ -w "${swapfile}" ]; then - check_startmsgs && echo "Adding ${swapfile} as additional swap" - - if [ -n "${swapfile_mdunit}" ]; then - mdev="/dev/md${swapfile_mdunit#md}" - mdconfig -a -t vnode -f "${swapfile}" -u ${swapfile_mdunit} - else - mdev="/dev/`mdconfig -a -t vnode -f "${swapfile}"`" - fi - - if [ $? -eq 0 ]; then - swapon ${mdev} - else - echo "error creating swapfile device" - fi - fi - ;; - esac -} - -addswap_stop() -{ - case ${swapfile} in - [Nn][Oo] | '') - ;; - *) - if [ -n "${swapfile_mdunit}" ]; then - mdev="/dev/md${swapfile_mdunit#md}" - else - mdev="/dev/`mdconfig -lv | grep "${swapfile}" | cut -f1`" - swapfile_mdunit=${mdev#md} - fi - if [ -n "${swapfile_mdunit}" ]; then - swapctl -l | grep -q ${mdev} - if [ $? -eq 0 ]; then - echo "Dismounting swapfile ${swapfile}" - swapoff ${mdev} && mdconfig -d -u ${swapfile_mdunit} - fi - fi - ;; - esac -} +set_rcvar_obsolete swapfile +set_rcvar_obsolete geli_swap_flags load_rc_config $name run_rc_command "$1" Modified: projects/bhyve_npt_pmap/etc/rc.d/fsck ============================================================================== --- projects/bhyve_npt_pmap/etc/rc.d/fsck Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/etc/rc.d/fsck Tue Aug 20 21:43:46 2013 (r254583) @@ -4,7 +4,7 @@ # # PROVIDE: fsck -# REQUIRE: localswap +# REQUIRE: swap # KEYWORD: nojail . /etc/rc.subr Modified: projects/bhyve_npt_pmap/etc/rc.d/hostapd ============================================================================== --- projects/bhyve_npt_pmap/etc/rc.d/hostapd Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/etc/rc.d/hostapd Tue Aug 20 21:43:46 2013 (r254583) @@ -10,11 +10,18 @@ . /etc/rc.subr name="hostapd" -rcvar="hostapd_enable" command="/usr/sbin/${name}" -conf_file="/etc/${name}.conf" -pidfile="/var/run/${name}.pid" +ifn="$2" +if [ -z "$ifn" ]; then + rcvar="hostapd_enable" + conf_file="/etc/${name}.conf" + pidfile="/var/run/${name}.pid" +else + rcvar= + conf_file="/etc/${name}-${ifn}.conf" + pidfile="/var/run/${name}-${ifn}.pid" +fi command_args="-P ${pidfile} -B ${conf_file}" required_files="${conf_file}" Modified: projects/bhyve_npt_pmap/etc/rc.d/mdconfig ============================================================================== --- projects/bhyve_npt_pmap/etc/rc.d/mdconfig Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/etc/rc.d/mdconfig Tue Aug 20 21:43:46 2013 (r254583) @@ -28,7 +28,7 @@ # # PROVIDE: mdconfig -# REQUIRE: localswap root +# REQUIRE: swap root . /etc/rc.subr Copied: projects/bhyve_npt_pmap/etc/rc.d/swap (from r252646, head/etc/rc.d/swap) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bhyve_npt_pmap/etc/rc.d/swap Tue Aug 20 21:43:46 2013 (r254583, copy of r252646, head/etc/rc.d/swap) @@ -0,0 +1,17 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: swap +# REQUIRE: disks +# KEYWORD: nojail shutdown + +. /etc/rc.subr + +name="swap" +start_cmd='/sbin/swapon -aq' +stop_cmd=':' + +load_rc_config $name +run_rc_command "$1" Copied: projects/bhyve_npt_pmap/etc/rc.d/swaplate (from r252646, head/etc/rc.d/swaplate) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/bhyve_npt_pmap/etc/rc.d/swaplate Tue Aug 20 21:43:46 2013 (r254583, copy of r252646, head/etc/rc.d/swaplate) @@ -0,0 +1,17 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: swaplate +# REQUIRE: mountlate +# KEYWORD: nojail shutdown + +. /etc/rc.subr + +name="swaplate" +start_cmd='/sbin/swapon -aLq' +stop_cmd='/sbin/swapoff -aq' + +load_rc_config swap +run_rc_command "$1" Modified: projects/bhyve_npt_pmap/etc/syslog.conf ============================================================================== --- projects/bhyve_npt_pmap/etc/syslog.conf Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/etc/syslog.conf Tue Aug 20 21:43:46 2013 (r254583) @@ -13,6 +13,7 @@ mail.info /var/log/maillog lpr.info /var/log/lpd-errs ftp.info /var/log/xferlog cron.* /var/log/cron +!-devd *.=debug /var/log/debug.log *.emerg * # uncomment this to log all writes to /dev/console to /var/log/console.log @@ -27,6 +28,9 @@ cron.* /var/log/cron # news.crit /var/log/news/news.crit # news.err /var/log/news/news.err # news.notice /var/log/news/news.notice +# Uncomment this if you wish to see messages produced by devd +# !devd +# *.>=info /var/log/devd.log !ppp *.* /var/log/ppp.log !* Modified: projects/bhyve_npt_pmap/gnu/usr.bin/patch/pch.c ============================================================================== --- projects/bhyve_npt_pmap/gnu/usr.bin/patch/pch.c Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/gnu/usr.bin/patch/pch.c Tue Aug 20 21:43:46 2013 (r254583) @@ -83,12 +83,17 @@ re_patch(void) void open_patch_file(char *filename) { + int nr, nw; + if (filename == Nullch || !*filename || strEQ(filename, "-")) { pfp = fopen(TMPPATNAME, "w"); if (pfp == Nullfp) pfatal2("can't create %s", TMPPATNAME); - while (fgets(buf, buf_size, stdin) != Nullch) - fputs(buf, pfp); + while ((nr = fread(buf, 1, buf_size, stdin)) > 0) { + nw = fwrite(buf, 1, nr, pfp); + if (nr != nw) + pfatal2("write error to %s", TMPPATNAME); + } Fclose(pfp); filename = TMPPATNAME; } @@ -1176,7 +1181,7 @@ pgets(bool do_indent) indent++; } } - Strncpy(buf, line, len - skipped); + memcpy(buf, line, len - skipped); buf[len - skipped] = '\0'; } return len; Modified: projects/bhyve_npt_pmap/include/Makefile ============================================================================== --- projects/bhyve_npt_pmap/include/Makefile Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/include/Makefile Tue Aug 20 21:43:46 2013 (r254583) @@ -37,7 +37,7 @@ LHDRS= aio.h errno.h fcntl.h linker_set. syslog.h ucontext.h LDIRS= bsm cam geom net net80211 netatalk netgraph netinet netinet6 \ - netipsec ${_netipx} netnatm \ + netipsec ${_netipx} netnatm netsmb \ nfs nfsclient nfsserver \ sys vm @@ -48,7 +48,7 @@ LSUBDIRS= cam/ata cam/scsi \ dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/smbus \ dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/nullfs \ - fs/procfs fs/udf fs/unionfs \ + fs/procfs fs/smbfs fs/udf fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/mirror geom/mountver geom/multipath geom/nop \ geom/raid geom/raid3 geom/shsec geom/stripe geom/virstor \ @@ -80,6 +80,7 @@ INCS+= iconv.h LSUBSUBDIRS+= netgraph/bluetooth/include .endif +# XXX unconditionally needed by #.if ${MK_IPX} != "no" _netipx= netipx #.endif Modified: projects/bhyve_npt_pmap/include/gssapi/gssapi.h ============================================================================== --- projects/bhyve_npt_pmap/include/gssapi/gssapi.h Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/include/gssapi/gssapi.h Tue Aug 20 21:43:46 2013 (r254583) @@ -44,6 +44,33 @@ typedef __ssize_t ssize_t; #define _SSIZE_T_DECLARED #endif +/* Compatibility with Heimdal 1.5.1 */ +#ifndef GSSAPI_CPP_START +#ifdef __cplusplus +#define GSSAPI_CPP_START extern "C" { +#define GSSAPI_CPP_END } +#else +#define GSSAPI_CPP_START +#define GSSAPI_CPP_END +#endif +#endif + +/* Compatibility with Heimdal 1.5.1 */ +#ifndef BUILD_GSSAPI_LIB +#define GSSAPI_LIB_FUNCTION +#define GSSAPI_LIB_CALL +#define GSSAPI_LIB_VARIABLE +#endif + +/* Compatibility with Heimdal 1.5.1 */ +#ifndef GSSAPI_DEPRECATED_FUNCTION +#if defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1 ))) +#define GSSAPI_DEPRECATED_FUNCTION(X) __attribute__((deprecated)) +#else +#define GSSAPI_DEPRECATED_FUNCTION(X) +#endif +#endif + #if 0 /* * If the platform supports the xom.h header file, it should be Modified: projects/bhyve_npt_pmap/include/iconv.h ============================================================================== --- projects/bhyve_npt_pmap/include/iconv.h Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/include/iconv.h Tue Aug 20 21:43:46 2013 (r254583) @@ -43,7 +43,7 @@ #define iconv_open libiconv_open #define iconv_close libiconv_close -#define iconv(cd, in, insize, out, outsize) libiconv(cd, __DECONST(char **, in), insize, out, outsize) +#define iconv libiconv #define iconv_t libiconv_t struct __tag_iconv_t; @@ -51,7 +51,7 @@ typedef struct __tag_iconv_t *iconv_t; __BEGIN_DECLS iconv_t libiconv_open(const char *, const char *); -size_t libiconv(iconv_t, char ** __restrict, +size_t libiconv(iconv_t, const char ** __restrict, size_t * __restrict, char ** __restrict, size_t * __restrict); int libiconv_close(iconv_t); @@ -60,7 +60,7 @@ int libiconv_close(iconv_t); */ int __iconv_get_list(char ***, size_t *, bool); void __iconv_free_list(char **, size_t); -size_t __iconv(iconv_t, char **, size_t *, char **, +size_t __iconv(iconv_t, const char **, size_t *, char **, size_t *, __uint32_t, size_t *); #define __ICONV_F_HIDE_INVALID 0x0001 Modified: projects/bhyve_npt_pmap/include/paths.h ============================================================================== --- projects/bhyve_npt_pmap/include/paths.h Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/include/paths.h Tue Aug 20 21:43:46 2013 (r254583) @@ -57,6 +57,8 @@ #define _PATH_ETC "/etc" #define _PATH_FTPUSERS "/etc/ftpusers" #define _PATH_FWMEM "/dev/fwmem" +#define _PATH_GBDE "/sbin/gbde" +#define _PATH_GELI "/sbin/geli" #define _PATH_HALT "/sbin/halt" #ifdef COMPAT_32BIT #define _PATH_I18NMODULE "/usr/lib32/i18n" Modified: projects/bhyve_npt_pmap/include/stdlib.h ============================================================================== --- projects/bhyve_npt_pmap/include/stdlib.h Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/include/stdlib.h Tue Aug 20 21:43:46 2013 (r254583) @@ -69,7 +69,7 @@ typedef struct { #define EXIT_FAILURE 1 #define EXIT_SUCCESS 0 -#define RAND_MAX 0x7fffffff +#define RAND_MAX 0x7ffffffd __BEGIN_DECLS #ifdef _XLOCALE_H_ Modified: projects/bhyve_npt_pmap/lib/Makefile ============================================================================== --- projects/bhyve_npt_pmap/lib/Makefile Tue Aug 20 20:51:32 2013 (r254582) +++ projects/bhyve_npt_pmap/lib/Makefile Tue Aug 20 21:43:46 2013 (r254583) @@ -102,6 +102,7 @@ SUBDIR= ${SUBDIR_ORDERED} \ ${_librtld_db} \ ${_libsdp} \ ${_libsm} \ + ${_libsmb} \ *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Tue Aug 20 21:47:08 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 4FA8AE4A; Tue, 20 Aug 2013 21:47:08 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2CF742F2B; Tue, 20 Aug 2013 21:47:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7KLl875043647; Tue, 20 Aug 2013 21:47:08 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7KLl78J043645; Tue, 20 Aug 2013 21:47:07 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201308202147.r7KLl78J043645@svn.freebsd.org> From: Jung-uk Kim Date: Tue, 20 Aug 2013 21:47:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r254584 - in projects/atomic64/sys: amd64/include i386/include X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Aug 2013 21:47:08 -0000 Author: jkim Date: Tue Aug 20 21:47:07 2013 New Revision: 254584 URL: http://svnweb.freebsd.org/changeset/base/254584 Log: Revert gratuitous style changes and attempt to maintain consistent style. Requested by: bde Modified: projects/atomic64/sys/amd64/include/atomic.h projects/atomic64/sys/i386/include/atomic.h Directory Properties: projects/atomic64/sys/ (props changed) Modified: projects/atomic64/sys/amd64/include/atomic.h ============================================================================== --- projects/atomic64/sys/amd64/include/atomic.h Tue Aug 20 21:43:46 2013 (r254583) +++ projects/atomic64/sys/amd64/include/atomic.h Tue Aug 20 21:47:07 2013 (r254584) @@ -142,7 +142,7 @@ atomic_cmpset_int(volatile u_int *dst, u __asm __volatile( " " MPLOCKED " " - " cmpxchgl %3, %1 ; " + " cmpxchgl %3,%1 ; " " sete %0 ; " "# atomic_cmpset_int" : "=q" (res), /* 0 */ @@ -161,7 +161,7 @@ atomic_cmpset_long(volatile u_long *dst, __asm __volatile( " " MPLOCKED " " - " cmpxchgq %3, %1 ; " + " cmpxchgq %3,%1 ; " " sete %0 ; " "# atomic_cmpset_long" : "=q" (res), /* 0 */ @@ -183,7 +183,7 @@ atomic_fetchadd_int(volatile u_int *p, u __asm __volatile( " " MPLOCKED " " - " xaddl %0, %1 ; " + " xaddl %0,%1 ; " "# atomic_fetchadd_int" : "+r" (v), /* 0 */ "+m" (*p) /* 1 */ @@ -201,7 +201,7 @@ atomic_fetchadd_long(volatile u_long *p, __asm __volatile( " " MPLOCKED " " - " xaddq %0, %1 ; " + " xaddq %0,%1 ; " "# atomic_fetchadd_long" : "+r" (v), /* 0 */ "+m" (*p) /* 1 */ @@ -216,7 +216,7 @@ atomic_testandset_int(volatile u_int *p, __asm __volatile( " " MPLOCKED " " - " btsl %2, %1 ; " + " btsl %2,%1 ; " " setc %0 ; " "# atomic_testandset_int" : "=q" (res), /* 0 */ @@ -233,7 +233,7 @@ atomic_testandset_long(volatile u_long * __asm __volatile( " " MPLOCKED " " - " btsq %2, %1 ; " + " btsq %2,%1 ; " " setc %0 ; " "# atomic_testandset_long" : "=q" (res), /* 0 */ @@ -342,7 +342,7 @@ atomic_swap_int(volatile u_int *p, u_int { __asm __volatile( - " xchgl %1, %0 ; " + " xchgl %1,%0 ; " "# atomic_swap_int" : "+r" (v), /* 0 */ "+m" (*p)); /* 1 */ @@ -354,7 +354,7 @@ atomic_swap_long(volatile u_long *p, u_l { __asm __volatile( - " xchgq %1, %0 ; " + " xchgq %1,%0 ; " "# atomic_swap_long" : "+r" (v), /* 0 */ "+m" (*p)); /* 1 */ Modified: projects/atomic64/sys/i386/include/atomic.h ============================================================================== --- projects/atomic64/sys/i386/include/atomic.h Tue Aug 20 21:43:46 2013 (r254583) +++ projects/atomic64/sys/i386/include/atomic.h Tue Aug 20 21:47:07 2013 (r254584) @@ -152,9 +152,9 @@ atomic_cmpset_int(volatile u_int *dst, u __asm __volatile( " pushfl ; " " cli ; " - " cmpl %3, %1 ; " + " cmpl %3,%1 ; " " jne 1f ; " - " movl %2, %1 ; " + " movl %2,%1 ; " "1: " " sete %0 ; " " popfl ; " @@ -177,7 +177,7 @@ atomic_cmpset_int(volatile u_int *dst, u __asm __volatile( " " MPLOCKED " " - " cmpxchgl %3, %1 ; " + " cmpxchgl %3,%1 ; " " sete %0 ; " "# atomic_cmpset_int" : "=q" (res), /* 0 */ @@ -201,9 +201,9 @@ atomic_fetchadd_int(volatile u_int *p, u __asm __volatile( " " MPLOCKED " " - " xaddl %0, %1 ; " + " xaddl %0,%1 ; " "# atomic_fetchadd_int" - : "+r" (v), /* 0 (result) */ + : "+r" (v), /* 0 */ "+m" (*p) /* 1 */ : : "cc"); return (v); @@ -216,7 +216,7 @@ atomic_testandset_int(volatile u_int *p, __asm __volatile( " " MPLOCKED " " - " btsl %2, %1 ; " + " btsl %2,%1 ; " " setc %0 ; " "# atomic_testandset_int" : "=q" (res), /* 0 */ @@ -303,12 +303,12 @@ atomic_cmpset_64_i386(volatile uint64_t __asm __volatile( " pushfl ; " " cli ; " - " xorl %1, %%eax ; " - " xorl %2, %%edx ; " - " orl %%edx, %%eax ; " + " xorl %1,%%eax ; " + " xorl %2,%%edx ; " + " orl %%edx,%%eax ; " " jne 1f ; " - " movl %4, %1 ; " - " movl %5, %2 ; " + " movl %4,%1 ; " + " movl %5,%2 ; " "1: " " sete %3 ; " " popfl" @@ -333,8 +333,8 @@ atomic_load_acq_64_i386(volatile uint64_ __asm __volatile( " pushfl ; " " cli ; " - " movl %1, %%eax ; " - " movl %2, %%edx ; " + " movl %1,%%eax ; " + " movl %2,%%edx ; " " popfl" : "=&A" (res) /* 0 */ : "m" (*q), /* 1 */ @@ -353,8 +353,8 @@ atomic_store_rel_64_i386(volatile uint64 __asm __volatile( " pushfl ; " " cli ; " - " movl %%eax, %0 ; " - " movl %%edx, %1 ; " + " movl %%eax,%0 ; " + " movl %%edx,%1 ; " " popfl" : "=m" (*q), /* 0 */ "=m" (*(q + 1)) /* 1 */ @@ -372,10 +372,10 @@ atomic_swap_64_i386(volatile uint64_t *p __asm __volatile( " pushfl ; " " cli ; " - " movl %1, %%eax ; " - " movl %2, %%edx ; " - " movl %4, %2 ; " - " movl %3, %1 ; " + " movl %1,%%eax ; " + " movl %2,%%edx ; " + " movl %4,%2 ; " + " movl %3,%1 ; " " popfl" : "=&A" (res), /* 0 */ "+m" (*q), /* 1 */ @@ -410,8 +410,8 @@ atomic_load_acq_64_i586(volatile uint64_ uint64_t res; __asm __volatile( - " movl %%ebx, %%eax ; " - " movl %%ecx, %%edx ; " + " movl %%ebx,%%eax ; " + " movl %%ecx,%%edx ; " " " MPLOCKED " " " cmpxchg8b %1" : "=&A" (res), /* 0 */ @@ -425,8 +425,8 @@ atomic_store_rel_64_i586(volatile uint64 { __asm __volatile( - " movl %%eax, %%ebx ; " - " movl %%edx, %%ecx ; " + " movl %%eax,%%ebx ; " + " movl %%edx,%%ecx ; " "1: " " " MPLOCKED " " " cmpxchg8b %0 ; " @@ -441,8 +441,8 @@ atomic_swap_64_i586(volatile uint64_t *p { __asm __volatile( - " movl %%eax, %%ebx ; " - " movl %%edx, %%ecx ; " + " movl %%eax,%%ebx ; " + " movl %%edx,%%ecx ; " "1: " " " MPLOCKED " " " cmpxchg8b %0 ; " @@ -563,7 +563,7 @@ atomic_swap_int(volatile u_int *p, u_int { __asm __volatile( - " xchgl %1, %0 ; " + " xchgl %1,%0 ; " "# atomic_swap_int" : "+r" (v), /* 0 */ "+m" (*p)); /* 1 */ From owner-svn-src-projects@FreeBSD.ORG Tue Aug 20 22:53:06 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id CF066BD3; Tue, 20 Aug 2013 22:53:06 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BC1C8225D; Tue, 20 Aug 2013 22:53:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7KMr6uC079100; Tue, 20 Aug 2013 22:53:06 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7KMr6ih079099; Tue, 20 Aug 2013 22:53:06 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201308202253.r7KMr6ih079099@svn.freebsd.org> From: Jung-uk Kim Date: Tue, 20 Aug 2013 22:53:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r254586 - projects/atomic64/share/man/man9 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Aug 2013 22:53:07 -0000 Author: jkim Date: Tue Aug 20 22:53:06 2013 New Revision: 254586 URL: http://svnweb.freebsd.org/changeset/base/254586 Log: - Update for atomic_swap() and atomic_testandclear(). - Try to maintain consistent style. Modified: projects/atomic64/share/man/man9/atomic.9 Modified: projects/atomic64/share/man/man9/atomic.9 ============================================================================== --- projects/atomic64/share/man/man9/atomic.9 Tue Aug 20 22:31:13 2013 (r254585) +++ projects/atomic64/share/man/man9/atomic.9 Tue Aug 20 22:53:06 2013 (r254586) @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 27, 2005 +.Dd August 20, 2013 .Dt ATOMIC 9 .Os .Sh NAME @@ -62,6 +62,10 @@ .Fn atomic_subtract_[acq_|rel_] "volatile *p" " v" .Ft void .Fn atomic_store_rel_ "volatile *p" " v" +.Ft +.Fn atomic_swap_ "volatile *p" " v" +.Ft int +.Fn atomic_testandset_ "volatile *p" "u_int v" .Sh DESCRIPTION Each of the atomic operations is guaranteed to be atomic in the presence of interrupts. @@ -184,9 +188,9 @@ This section describes the semantics of .Bd -literal -compact if (*dst == old) { *dst = new; - return 1; + return (1); } else - return 0; + return (0); .Ed .El .Pp @@ -203,7 +207,7 @@ and .Bd -literal -compact tmp = *p; *p += v; -return tmp; +return (tmp); .Ed .El .Pp @@ -216,9 +220,9 @@ and .Dq Li 32 and do not have any variants with memory barriers at this time. .Bl -hang -.It Fn atomic_load addr +.It Fn atomic_load p .Bd -literal -compact -return (*addr) +return (*p); .Ed .El .Pp @@ -226,11 +230,11 @@ The .Fn atomic_load functions are only provided with acquire memory barriers. .Bl -hang -.It Fn atomic_readandclear addr +.It Fn atomic_readandclear p .Bd -literal -compact -temp = *addr; -*addr = 0; -return (temp); +tmp = *p; +*p = 0; +return (tmp); .Ed .El .Pp @@ -243,8 +247,7 @@ functions are not implemented for the ty .Dq Li 8 , and .Dq Li 16 -and do -not have any variants with memory barriers at this time. +and do not have any variants with memory barriers at this time. .Bl -hang .It Fn atomic_set p v .Bd -literal -compact @@ -264,6 +267,44 @@ The .Fn atomic_store functions are only provided with release memory barriers. .Pp +.Bl -hang +.It Fn atomic_swap p v +.Bd -literal -compact +tmp = *p; +*p = v; +return (tmp); +.Ed +.El +.Pp +The +.Fn atomic_swap +functions are not implemented for the types +.Dq Li char , +.Dq Li short , +.Dq Li ptr , +.Dq Li 8 , +and +.Dq Li 16 +and do not have any variants with memory barriers at this time. +.Bl -hang +.It Fn atomic_testandset p v +.Bd -literal -compact +bit = 1 << (v % (sizeof(*p) * NBBY)); +tmp = (*p & bit) != 0; +*p |= bit; +return (tmp); +.Ed +.El +.Pp +The +.Fn atomic_testandset +functions are only implemented for the types +.Dq Li int , +.Dq Li long +and +.Dq Li 32 +and do not have any variants with memory barriers at this time. +.Pp The type .Dq Li 64 is currently not implemented for any of the atomic operations on the @@ -275,15 +316,17 @@ architectures. .Sh RETURN VALUES The .Fn atomic_cmpset -function -returns the result of the compare operation. +function returns the result of the compare operation. The .Fn atomic_fetchadd , .Fn atomic_load , +.Fn atomic_readandclear , and -.Fn atomic_readandclear -functions -return the value at the specified address. +.Fn atomic_swap +functions return the value at the specified address. +The +.Fn atomic_testandset +function returns the result of the test operation. .Sh EXAMPLES This example uses the .Fn atomic_cmpset_acq_ptr @@ -354,3 +397,9 @@ The .Fn atomic_fetchadd operations were added in .Fx 6.0 . +The +.Fn atomic_swap +and +.Fn atomic_testandset +operations were added in +.Fx 10.0 . From owner-svn-src-projects@FreeBSD.ORG Wed Aug 21 02:14:29 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1F801DF1; Wed, 21 Aug 2013 02:14:29 +0000 (UTC) (envelope-from neel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 084DD2CB7; Wed, 21 Aug 2013 02:14:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7L2ESAF084818; Wed, 21 Aug 2013 02:14:28 GMT (envelope-from neel@svn.freebsd.org) Received: (from neel@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7L2EOfI084792; Wed, 21 Aug 2013 02:14:24 GMT (envelope-from neel@svn.freebsd.org) Message-Id: <201308210214.r7L2EOfI084792@svn.freebsd.org> From: Neel Natu Date: Wed, 21 Aug 2013 02:14:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r254588 - in projects/bhyve_npt_pmap: . cddl/contrib/opensolaris/cmd/zfs contrib/llvm/include/llvm/CodeGen contrib/llvm/lib/CodeGen contrib/llvm/lib/CodeGen/SelectionDAG contrib/tcpdump... X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Aug 2013 02:14:29 -0000 Author: neel Date: Wed Aug 21 02:14:23 2013 New Revision: 254588 URL: http://svnweb.freebsd.org/changeset/base/254588 Log: IFC @r253140 Added: projects/bhyve_npt_pmap/contrib/wpa/hostapd/hlr_auc_gw.txt - copied unchanged from r253140, head/contrib/wpa/hostapd/hlr_auc_gw.txt projects/bhyve_npt_pmap/contrib/wpa/hostapd/hostapd.eap_user_sqlite - copied unchanged from r253140, head/contrib/wpa/hostapd/hostapd.eap_user_sqlite projects/bhyve_npt_pmap/contrib/wpa/patches/openssl-0.9.8x-tls-extensions.patch - copied unchanged from r253140, head/contrib/wpa/patches/openssl-0.9.8x-tls-extensions.patch projects/bhyve_npt_pmap/contrib/wpa/src/ap/eap_user_db.c - copied unchanged from r253140, head/contrib/wpa/src/ap/eap_user_db.c projects/bhyve_npt_pmap/contrib/wpa/src/ap/gas_serv.c - copied unchanged from r253140, head/contrib/wpa/src/ap/gas_serv.c projects/bhyve_npt_pmap/contrib/wpa/src/ap/gas_serv.h - copied unchanged from r253140, head/contrib/wpa/src/ap/gas_serv.h projects/bhyve_npt_pmap/contrib/wpa/src/ap/hs20.c - copied unchanged from r253140, head/contrib/wpa/src/ap/hs20.c projects/bhyve_npt_pmap/contrib/wpa/src/ap/hs20.h - copied unchanged from r253140, head/contrib/wpa/src/ap/hs20.h projects/bhyve_npt_pmap/contrib/wpa/src/ap/ieee802_11_shared.c - copied unchanged from r253140, head/contrib/wpa/src/ap/ieee802_11_shared.c projects/bhyve_npt_pmap/contrib/wpa/src/ap/ieee802_11_vht.c - copied unchanged from r253140, head/contrib/wpa/src/ap/ieee802_11_vht.c projects/bhyve_npt_pmap/contrib/wpa/src/ap/p2p_hostapd.c - copied unchanged from r253140, head/contrib/wpa/src/ap/p2p_hostapd.c projects/bhyve_npt_pmap/contrib/wpa/src/ap/p2p_hostapd.h - copied unchanged from r253140, head/contrib/wpa/src/ap/p2p_hostapd.h projects/bhyve_npt_pmap/contrib/wpa/src/ap/vlan_util.c - copied unchanged from r253140, head/contrib/wpa/src/ap/vlan_util.c projects/bhyve_npt_pmap/contrib/wpa/src/ap/vlan_util.h - copied unchanged from r253140, head/contrib/wpa/src/ap/vlan_util.h projects/bhyve_npt_pmap/contrib/wpa/src/ap/wnm_ap.c - copied unchanged from r253140, head/contrib/wpa/src/ap/wnm_ap.c projects/bhyve_npt_pmap/contrib/wpa/src/ap/wnm_ap.h - copied unchanged from r253140, head/contrib/wpa/src/ap/wnm_ap.h projects/bhyve_npt_pmap/contrib/wpa/src/common/gas.c - copied unchanged from r253140, head/contrib/wpa/src/common/gas.c projects/bhyve_npt_pmap/contrib/wpa/src/common/gas.h - copied unchanged from r253140, head/contrib/wpa/src/common/gas.h projects/bhyve_npt_pmap/contrib/wpa/src/crypto/aes-ccm.c - copied unchanged from r253140, head/contrib/wpa/src/crypto/aes-ccm.c projects/bhyve_npt_pmap/contrib/wpa/src/crypto/aes-gcm.c - copied unchanged from r253140, head/contrib/wpa/src/crypto/aes-gcm.c projects/bhyve_npt_pmap/contrib/wpa/src/crypto/random.c - copied unchanged from r253140, head/contrib/wpa/src/crypto/random.c projects/bhyve_npt_pmap/contrib/wpa/src/crypto/random.h - copied unchanged from r253140, head/contrib/wpa/src/crypto/random.h projects/bhyve_npt_pmap/contrib/wpa/src/crypto/sha1-prf.c - copied unchanged from r253140, head/contrib/wpa/src/crypto/sha1-prf.c projects/bhyve_npt_pmap/contrib/wpa/src/crypto/sha256-prf.c - copied unchanged from r253140, head/contrib/wpa/src/crypto/sha256-prf.c projects/bhyve_npt_pmap/contrib/wpa/src/crypto/sha256-tlsprf.c - copied unchanged from r253140, head/contrib/wpa/src/crypto/sha256-tlsprf.c projects/bhyve_npt_pmap/contrib/wpa/src/crypto/sha256_i.h - copied unchanged from r253140, head/contrib/wpa/src/crypto/sha256_i.h projects/bhyve_npt_pmap/contrib/wpa/src/drivers/driver_bsd.c - copied unchanged from r253140, head/contrib/wpa/src/drivers/driver_bsd.c projects/bhyve_npt_pmap/contrib/wpa/src/drivers/driver_common.c - copied unchanged from r253140, head/contrib/wpa/src/drivers/driver_common.c projects/bhyve_npt_pmap/contrib/wpa/src/drivers/driver_privsep.c - copied unchanged from r253140, head/contrib/wpa/src/drivers/driver_privsep.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_pwd_common.c - copied unchanged from r253140, head/contrib/wpa/src/eap_common/eap_pwd_common.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_pwd_common.h - copied unchanged from r253140, head/contrib/wpa/src/eap_common/eap_pwd_common.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_pwd.c - copied unchanged from r253140, head/contrib/wpa/src/eap_peer/eap_pwd.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_server_pwd.c - copied unchanged from r253140, head/contrib/wpa/src/eap_server/eap_server_pwd.c projects/bhyve_npt_pmap/contrib/wpa/src/l2_packet/l2_packet_privsep.c - copied unchanged from r253140, head/contrib/wpa/src/l2_packet/l2_packet_privsep.c projects/bhyve_npt_pmap/contrib/wpa/src/p2p/ - copied from r253140, head/contrib/wpa/src/p2p/ projects/bhyve_npt_pmap/contrib/wpa/src/radius/radius_das.c - copied unchanged from r253140, head/contrib/wpa/src/radius/radius_das.c projects/bhyve_npt_pmap/contrib/wpa/src/radius/radius_das.h - copied unchanged from r253140, head/contrib/wpa/src/radius/radius_das.h projects/bhyve_npt_pmap/contrib/wpa/src/rsn_supp/tdls.c - copied unchanged from r253140, head/contrib/wpa/src/rsn_supp/tdls.c projects/bhyve_npt_pmap/contrib/wpa/src/utils/edit.c - copied unchanged from r253140, head/contrib/wpa/src/utils/edit.c projects/bhyve_npt_pmap/contrib/wpa/src/utils/edit.h - copied unchanged from r253140, head/contrib/wpa/src/utils/edit.h projects/bhyve_npt_pmap/contrib/wpa/src/utils/edit_readline.c - copied unchanged from r253140, head/contrib/wpa/src/utils/edit_readline.c projects/bhyve_npt_pmap/contrib/wpa/src/utils/edit_simple.c - copied unchanged from r253140, head/contrib/wpa/src/utils/edit_simple.c projects/bhyve_npt_pmap/contrib/wpa/src/utils/ext_password.c - copied unchanged from r253140, head/contrib/wpa/src/utils/ext_password.c projects/bhyve_npt_pmap/contrib/wpa/src/utils/ext_password.h - copied unchanged from r253140, head/contrib/wpa/src/utils/ext_password.h projects/bhyve_npt_pmap/contrib/wpa/src/utils/ext_password_i.h - copied unchanged from r253140, head/contrib/wpa/src/utils/ext_password_i.h projects/bhyve_npt_pmap/contrib/wpa/src/utils/ext_password_test.c - copied unchanged from r253140, head/contrib/wpa/src/utils/ext_password_test.c projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_attr_parse.h - copied unchanged from r253140, head/contrib/wpa/src/wps/wps_attr_parse.h projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_validate.c - copied unchanged from r253140, head/contrib/wpa/src/wps/wps_validate.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/README-HS20 - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/README-HS20 projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/README-P2P - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/README-P2P projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/autoscan.c - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/autoscan.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/autoscan.h - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/autoscan.h projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/autoscan_exponential.c - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/autoscan_exponential.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/autoscan_periodic.c - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/autoscan_periodic.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/bgscan_learn.c - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/bgscan_learn.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_p2p.c - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_p2p.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_p2p.h - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_p2p.h projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service.in projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service.in projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/examples/dbus-listen-preq.py - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/examples/dbus-listen-preq.py projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/examples/p2p/ - copied from r253140, head/contrib/wpa/wpa_supplicant/examples/p2p/ projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/examples/p2p-action-udhcp.sh - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/examples/p2p-action-udhcp.sh projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/examples/p2p-action.sh - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/examples/p2p-action.sh projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/examples/udhcpd-p2p.conf - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/examples/udhcpd-p2p.conf projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/examples/wps-ap-cli - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/examples/wps-ap-cli projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/examples/wps-nfc.py - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/examples/wps-nfc.py projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/gas_query.c - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/gas_query.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/gas_query.h - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/gas_query.h projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/hs20_supplicant.c - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/hs20_supplicant.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/hs20_supplicant.h - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/hs20_supplicant.h projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/interworking.c - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/interworking.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/interworking.h - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/interworking.h projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/nfc_pw_token.c - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/nfc_pw_token.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/offchannel.c - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/offchannel.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/offchannel.h - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/offchannel.h projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/p2p_supplicant.c - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/p2p_supplicant.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/p2p_supplicant.h - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/p2p_supplicant.h projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/utils/ - copied from r253140, head/contrib/wpa/wpa_supplicant/utils/ projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/wifi_display.c - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/wifi_display.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/wifi_display.h - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/wifi_display.h projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/wnm_sta.c - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/wnm_sta.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/wnm_sta.h - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/wnm_sta.h projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/wpa_supplicant_conf.mk - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/wpa_supplicant_conf.mk projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/wpa_supplicant_conf.sh - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/wpa_supplicant_conf.sh projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/wpa_supplicant_template.conf - copied unchanged from r253140, head/contrib/wpa/wpa_supplicant/wpa_supplicant_template.conf projects/bhyve_npt_pmap/share/doc/legal/realtek/ - copied from r253140, head/share/doc/legal/realtek/ projects/bhyve_npt_pmap/share/man/man4/hptnr.4 - copied unchanged from r253140, head/share/man/man4/hptnr.4 projects/bhyve_npt_pmap/share/man/man9/SDT.9 - copied unchanged from r253140, head/share/man/man9/SDT.9 projects/bhyve_npt_pmap/sys/arm/ti/am335x/am335x_usbss.c - copied unchanged from r253140, head/sys/arm/ti/am335x/am335x_usbss.c projects/bhyve_npt_pmap/sys/contrib/dev/urtwn/ - copied from r253140, head/sys/contrib/dev/urtwn/ projects/bhyve_npt_pmap/sys/contrib/v4l/ - copied from r253140, head/sys/contrib/v4l/ projects/bhyve_npt_pmap/sys/dev/cxgbe/firmware/t4fw-1.8.11.0.bin.uu - copied unchanged from r253140, head/sys/dev/cxgbe/firmware/t4fw-1.8.11.0.bin.uu projects/bhyve_npt_pmap/sys/dev/cxgbe/firmware/t5fw-1.8.22.0.bin.uu - copied unchanged from r253140, head/sys/dev/cxgbe/firmware/t5fw-1.8.22.0.bin.uu projects/bhyve_npt_pmap/sys/dev/cxgbe/firmware/t5fw_cfg.txt - copied unchanged from r253140, head/sys/dev/cxgbe/firmware/t5fw_cfg.txt projects/bhyve_npt_pmap/sys/dev/cxgbe/firmware/t5fw_cfg_fpga.txt - copied unchanged from r253140, head/sys/dev/cxgbe/firmware/t5fw_cfg_fpga.txt projects/bhyve_npt_pmap/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt - copied unchanged from r253140, head/sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt projects/bhyve_npt_pmap/sys/dev/hpt27xx/hpt27xx_os_bsd.c - copied unchanged from r253140, head/sys/dev/hpt27xx/hpt27xx_os_bsd.c projects/bhyve_npt_pmap/sys/dev/hpt27xx/hpt27xx_osm_bsd.c - copied unchanged from r253140, head/sys/dev/hpt27xx/hpt27xx_osm_bsd.c projects/bhyve_npt_pmap/sys/dev/hptnr/ - copied from r253140, head/sys/dev/hptnr/ projects/bhyve_npt_pmap/sys/dev/mbox/ - copied from r253140, head/sys/dev/mbox/ projects/bhyve_npt_pmap/sys/fs/ext2fs/ext2_hash.c - copied unchanged from r253140, head/sys/fs/ext2fs/ext2_hash.c projects/bhyve_npt_pmap/sys/fs/ext2fs/ext2_htree.c - copied unchanged from r253140, head/sys/fs/ext2fs/ext2_htree.c projects/bhyve_npt_pmap/sys/fs/ext2fs/htree.h - copied unchanged from r253140, head/sys/fs/ext2fs/htree.h projects/bhyve_npt_pmap/sys/mips/atheros/ar934xreg.h - copied unchanged from r253140, head/sys/mips/atheros/ar934xreg.h projects/bhyve_npt_pmap/sys/mips/conf/ENH200 - copied unchanged from r253140, head/sys/mips/conf/ENH200 projects/bhyve_npt_pmap/sys/mips/conf/ENH200.hints - copied unchanged from r253140, head/sys/mips/conf/ENH200.hints projects/bhyve_npt_pmap/sys/modules/cxgbe/t5_firmware/ - copied from r253140, head/sys/modules/cxgbe/t5_firmware/ projects/bhyve_npt_pmap/sys/modules/hptnr/ - copied from r253140, head/sys/modules/hptnr/ projects/bhyve_npt_pmap/sys/modules/usb/urtwnfw/ - copied from r253140, head/sys/modules/usb/urtwnfw/ projects/bhyve_npt_pmap/usr.sbin/bsdconfig/examples/browse_packages.sh - copied unchanged from r253140, head/usr.sbin/bsdconfig/examples/browse_packages.sh projects/bhyve_npt_pmap/usr.sbin/bsdconfig/networking/share/services.subr - copied unchanged from r253140, head/usr.sbin/bsdconfig/networking/share/services.subr projects/bhyve_npt_pmap/usr.sbin/wpa/wpa_priv/ - copied from r253140, head/usr.sbin/wpa/wpa_priv/ Deleted: projects/bhyve_npt_pmap/contrib/wpa/hostapd/.gitignore projects/bhyve_npt_pmap/contrib/wpa/hostapd/Makefile projects/bhyve_npt_pmap/contrib/wpa/src/Makefile projects/bhyve_npt_pmap/contrib/wpa/src/ap/Makefile projects/bhyve_npt_pmap/contrib/wpa/src/common/Makefile projects/bhyve_npt_pmap/contrib/wpa/src/crypto/.gitignore projects/bhyve_npt_pmap/contrib/wpa/src/crypto/Makefile projects/bhyve_npt_pmap/contrib/wpa/src/crypto/md5-non-fips.c projects/bhyve_npt_pmap/contrib/wpa/src/drivers/.gitignore projects/bhyve_npt_pmap/contrib/wpa/src/drivers/Makefile projects/bhyve_npt_pmap/contrib/wpa/src/drivers/driver_ndiswrapper.c projects/bhyve_npt_pmap/contrib/wpa/src/drivers/drivers.mak projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/Makefile projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/Makefile projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/Makefile projects/bhyve_npt_pmap/contrib/wpa/src/eapol_auth/Makefile projects/bhyve_npt_pmap/contrib/wpa/src/eapol_supp/Makefile projects/bhyve_npt_pmap/contrib/wpa/src/l2_packet/Makefile projects/bhyve_npt_pmap/contrib/wpa/src/lib.rules projects/bhyve_npt_pmap/contrib/wpa/src/radius/.gitignore projects/bhyve_npt_pmap/contrib/wpa/src/radius/Makefile projects/bhyve_npt_pmap/contrib/wpa/src/rsn_supp/Makefile projects/bhyve_npt_pmap/contrib/wpa/src/tls/.gitignore projects/bhyve_npt_pmap/contrib/wpa/src/tls/Makefile projects/bhyve_npt_pmap/contrib/wpa/src/utils/.gitignore projects/bhyve_npt_pmap/contrib/wpa/src/utils/Makefile projects/bhyve_npt_pmap/contrib/wpa/src/wps/Makefile projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_nfc.c projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_nfc_pn531.c projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_ufd.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/.gitignore projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/Makefile projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/.gitignore projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/doc/ projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/mlme.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/mlme.h projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/wpa_supplicant.nsi projects/bhyve_npt_pmap/sys/compat/linux/linux_videodev.h projects/bhyve_npt_pmap/sys/compat/linux/linux_videodev2.h projects/bhyve_npt_pmap/sys/dev/cxgbe/firmware/t4fw-1.8.4.0.bin.uu projects/bhyve_npt_pmap/sys/dev/hpt27xx/os_bsd.c projects/bhyve_npt_pmap/sys/dev/hpt27xx/osm_bsd.c projects/bhyve_npt_pmap/usr.sbin/wpa/hostapd/driver_freebsd.c projects/bhyve_npt_pmap/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c Modified: projects/bhyve_npt_pmap/Makefile projects/bhyve_npt_pmap/Makefile.inc1 projects/bhyve_npt_pmap/UPDATING projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c projects/bhyve_npt_pmap/contrib/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h projects/bhyve_npt_pmap/contrib/llvm/include/llvm/CodeGen/MachineBasicBlock.h projects/bhyve_npt_pmap/contrib/llvm/lib/CodeGen/MachineBasicBlock.cpp projects/bhyve_npt_pmap/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp projects/bhyve_npt_pmap/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp projects/bhyve_npt_pmap/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp projects/bhyve_npt_pmap/contrib/tcpdump/tcpdump.c projects/bhyve_npt_pmap/contrib/tzdata/africa projects/bhyve_npt_pmap/contrib/tzdata/asia projects/bhyve_npt_pmap/contrib/tzdata/australasia projects/bhyve_npt_pmap/contrib/tzdata/europe projects/bhyve_npt_pmap/contrib/tzdata/southamerica projects/bhyve_npt_pmap/contrib/tzdata/zone.tab projects/bhyve_npt_pmap/contrib/wpa/COPYING projects/bhyve_npt_pmap/contrib/wpa/README projects/bhyve_npt_pmap/contrib/wpa/hostapd/ChangeLog projects/bhyve_npt_pmap/contrib/wpa/hostapd/README projects/bhyve_npt_pmap/contrib/wpa/hostapd/README-WPS projects/bhyve_npt_pmap/contrib/wpa/hostapd/config_file.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/hostapd/config_file.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/hostapd/ctrl_iface.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/hostapd/ctrl_iface.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/hostapd/defconfig projects/bhyve_npt_pmap/contrib/wpa/hostapd/dump_state.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/hostapd/dump_state.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/hostapd/eap_register.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/hostapd/eap_register.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/hostapd/hlr_auc_gw.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/hostapd/hostapd.conf (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/hostapd/hostapd.eap_user projects/bhyve_npt_pmap/contrib/wpa/hostapd/hostapd_cli.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/hostapd/main.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/hostapd/nt_password_hash.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/accounting.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/accounting.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/ap_config.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/ap_config.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/ap_drv_ops.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/ap_drv_ops.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/ap_list.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/ap_list.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/ap_mlme.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/ap_mlme.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/authsrv.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/authsrv.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/beacon.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/beacon.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/ctrl_iface_ap.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/ctrl_iface_ap.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/drv_callbacks.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/hostapd.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/hostapd.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/hw_features.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/hw_features.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/iapp.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/iapp.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/ieee802_11.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/ieee802_11.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/ieee802_11_auth.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/ieee802_11_auth.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/ieee802_11_ht.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/ieee802_1x.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/ieee802_1x.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/peerkey_auth.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/pmksa_cache_auth.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/pmksa_cache_auth.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/preauth_auth.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/preauth_auth.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/sta_info.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/sta_info.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/tkip_countermeasures.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/tkip_countermeasures.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/utils.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/vlan_init.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/wmm.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/wpa_auth.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/wpa_auth.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/wpa_auth_ft.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/wpa_auth_glue.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/wpa_auth_glue.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/wpa_auth_i.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/wpa_auth_ie.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/wpa_auth_ie.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/wps_hostapd.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/wps_hostapd.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/common/defs.h projects/bhyve_npt_pmap/contrib/wpa/src/common/eapol_common.h projects/bhyve_npt_pmap/contrib/wpa/src/common/ieee802_11_common.c projects/bhyve_npt_pmap/contrib/wpa/src/common/ieee802_11_common.h projects/bhyve_npt_pmap/contrib/wpa/src/common/ieee802_11_defs.h projects/bhyve_npt_pmap/contrib/wpa/src/common/privsep_commands.h projects/bhyve_npt_pmap/contrib/wpa/src/common/version.h projects/bhyve_npt_pmap/contrib/wpa/src/common/wpa_common.c projects/bhyve_npt_pmap/contrib/wpa/src/common/wpa_common.h projects/bhyve_npt_pmap/contrib/wpa/src/common/wpa_ctrl.c projects/bhyve_npt_pmap/contrib/wpa/src/common/wpa_ctrl.h projects/bhyve_npt_pmap/contrib/wpa/src/crypto/aes-cbc.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/aes-ctr.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/aes-eax.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/aes-encblock.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/aes-internal-dec.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/aes-internal-enc.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/aes-internal.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/aes-omac1.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/aes-unwrap.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/aes-wrap.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/aes.h projects/bhyve_npt_pmap/contrib/wpa/src/crypto/aes_i.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/aes_wrap.h projects/bhyve_npt_pmap/contrib/wpa/src/crypto/crypto.h projects/bhyve_npt_pmap/contrib/wpa/src/crypto/crypto_cryptoapi.c projects/bhyve_npt_pmap/contrib/wpa/src/crypto/crypto_gnutls.c projects/bhyve_npt_pmap/contrib/wpa/src/crypto/crypto_internal-cipher.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/crypto_internal-modexp.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/crypto_internal-rsa.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/crypto_internal.c projects/bhyve_npt_pmap/contrib/wpa/src/crypto/crypto_libtomcrypt.c projects/bhyve_npt_pmap/contrib/wpa/src/crypto/crypto_none.c projects/bhyve_npt_pmap/contrib/wpa/src/crypto/crypto_nss.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/crypto_openssl.c projects/bhyve_npt_pmap/contrib/wpa/src/crypto/des-internal.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/des_i.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/dh_group5.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/dh_group5.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/dh_groups.c projects/bhyve_npt_pmap/contrib/wpa/src/crypto/dh_groups.h projects/bhyve_npt_pmap/contrib/wpa/src/crypto/fips_prf_cryptoapi.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/fips_prf_gnutls.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/fips_prf_internal.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/fips_prf_nss.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/fips_prf_openssl.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/md4-internal.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/md5-internal.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/md5.c projects/bhyve_npt_pmap/contrib/wpa/src/crypto/md5.h projects/bhyve_npt_pmap/contrib/wpa/src/crypto/md5_i.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/milenage.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/milenage.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/ms_funcs.c projects/bhyve_npt_pmap/contrib/wpa/src/crypto/ms_funcs.h projects/bhyve_npt_pmap/contrib/wpa/src/crypto/rc4.c projects/bhyve_npt_pmap/contrib/wpa/src/crypto/sha1-internal.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/sha1-pbkdf2.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/sha1-tlsprf.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/sha1-tprf.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/sha1.c projects/bhyve_npt_pmap/contrib/wpa/src/crypto/sha1.h projects/bhyve_npt_pmap/contrib/wpa/src/crypto/sha1_i.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/sha256-internal.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/sha256.c projects/bhyve_npt_pmap/contrib/wpa/src/crypto/sha256.h projects/bhyve_npt_pmap/contrib/wpa/src/crypto/tls.h projects/bhyve_npt_pmap/contrib/wpa/src/crypto/tls_gnutls.c projects/bhyve_npt_pmap/contrib/wpa/src/crypto/tls_internal.c projects/bhyve_npt_pmap/contrib/wpa/src/crypto/tls_none.c projects/bhyve_npt_pmap/contrib/wpa/src/crypto/tls_nss.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/crypto/tls_openssl.c projects/bhyve_npt_pmap/contrib/wpa/src/crypto/tls_schannel.c projects/bhyve_npt_pmap/contrib/wpa/src/drivers/driver.h projects/bhyve_npt_pmap/contrib/wpa/src/drivers/driver_ndis.c projects/bhyve_npt_pmap/contrib/wpa/src/drivers/driver_ndis.h projects/bhyve_npt_pmap/contrib/wpa/src/drivers/driver_ndis_.c projects/bhyve_npt_pmap/contrib/wpa/src/drivers/driver_wired.c projects/bhyve_npt_pmap/contrib/wpa/src/drivers/drivers.c projects/bhyve_npt_pmap/contrib/wpa/src/drivers/ndis_events.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/chap.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/chap.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_common.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_common.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_defs.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_fast_common.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_fast_common.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_gpsk_common.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_gpsk_common.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_ikev2_common.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_ikev2_common.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_pax_common.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_pax_common.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_peap_common.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_peap_common.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_psk_common.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_psk_common.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_sake_common.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_sake_common.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_sim_common.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_sim_common.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_tlv_common.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_ttls.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_wsc_common.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/eap_wsc_common.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/ikev2_common.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_common/ikev2_common.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_aka.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_config.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_fast.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_fast_pac.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_fast_pac.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_gpsk.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_gtc.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_i.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_ikev2.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_leap.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_md5.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_methods.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_methods.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_mschapv2.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_otp.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_pax.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_peap.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_psk.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_sake.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_sim.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_tls.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_tls_common.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_tls_common.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_tnc.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_ttls.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_vendor_test.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/eap_wsc.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/ikev2.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/ikev2.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/mschapv2.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/mschapv2.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/tncc.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_peer/tncc.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_i.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_methods.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_server.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_server_aka.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_server_fast.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_server_gpsk.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_server_gtc.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_server_identity.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_server_ikev2.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_server_md5.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_server_methods.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_server_mschapv2.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_server_pax.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_server_peap.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_server_psk.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_server_sake.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_server_sim.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_server_tls.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_server_tls_common.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_server_tnc.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_server_ttls.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_server_vendor_test.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_server_wsc.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_sim_db.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_sim_db.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/eap_tls_common.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/ikev2.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/ikev2.h projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/tncs.c projects/bhyve_npt_pmap/contrib/wpa/src/eap_server/tncs.h projects/bhyve_npt_pmap/contrib/wpa/src/eapol_auth/eapol_auth_dump.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eapol_auth/eapol_auth_sm.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eapol_auth/eapol_auth_sm.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eapol_auth/eapol_auth_sm_i.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/eapol_supp/eapol_supp_sm.c projects/bhyve_npt_pmap/contrib/wpa/src/eapol_supp/eapol_supp_sm.h projects/bhyve_npt_pmap/contrib/wpa/src/l2_packet/l2_packet.h projects/bhyve_npt_pmap/contrib/wpa/src/l2_packet/l2_packet_freebsd.c projects/bhyve_npt_pmap/contrib/wpa/src/l2_packet/l2_packet_ndis.c projects/bhyve_npt_pmap/contrib/wpa/src/l2_packet/l2_packet_none.c projects/bhyve_npt_pmap/contrib/wpa/src/radius/radius.c projects/bhyve_npt_pmap/contrib/wpa/src/radius/radius.h projects/bhyve_npt_pmap/contrib/wpa/src/radius/radius_client.c projects/bhyve_npt_pmap/contrib/wpa/src/radius/radius_client.h projects/bhyve_npt_pmap/contrib/wpa/src/radius/radius_server.c projects/bhyve_npt_pmap/contrib/wpa/src/radius/radius_server.h projects/bhyve_npt_pmap/contrib/wpa/src/rsn_supp/peerkey.c projects/bhyve_npt_pmap/contrib/wpa/src/rsn_supp/peerkey.h projects/bhyve_npt_pmap/contrib/wpa/src/rsn_supp/pmksa_cache.c projects/bhyve_npt_pmap/contrib/wpa/src/rsn_supp/pmksa_cache.h projects/bhyve_npt_pmap/contrib/wpa/src/rsn_supp/preauth.c projects/bhyve_npt_pmap/contrib/wpa/src/rsn_supp/preauth.h projects/bhyve_npt_pmap/contrib/wpa/src/rsn_supp/wpa.c projects/bhyve_npt_pmap/contrib/wpa/src/rsn_supp/wpa.h projects/bhyve_npt_pmap/contrib/wpa/src/rsn_supp/wpa_ft.c projects/bhyve_npt_pmap/contrib/wpa/src/rsn_supp/wpa_i.h projects/bhyve_npt_pmap/contrib/wpa/src/rsn_supp/wpa_ie.c projects/bhyve_npt_pmap/contrib/wpa/src/rsn_supp/wpa_ie.h projects/bhyve_npt_pmap/contrib/wpa/src/tls/asn1.c projects/bhyve_npt_pmap/contrib/wpa/src/tls/asn1.h projects/bhyve_npt_pmap/contrib/wpa/src/tls/bignum.c projects/bhyve_npt_pmap/contrib/wpa/src/tls/bignum.h projects/bhyve_npt_pmap/contrib/wpa/src/tls/libtommath.c projects/bhyve_npt_pmap/contrib/wpa/src/tls/pkcs1.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/tls/pkcs1.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/tls/pkcs5.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/tls/pkcs5.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/tls/pkcs8.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/tls/pkcs8.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/tls/rsa.c projects/bhyve_npt_pmap/contrib/wpa/src/tls/rsa.h projects/bhyve_npt_pmap/contrib/wpa/src/tls/tlsv1_client.c projects/bhyve_npt_pmap/contrib/wpa/src/tls/tlsv1_client.h projects/bhyve_npt_pmap/contrib/wpa/src/tls/tlsv1_client_i.h projects/bhyve_npt_pmap/contrib/wpa/src/tls/tlsv1_client_read.c projects/bhyve_npt_pmap/contrib/wpa/src/tls/tlsv1_client_write.c projects/bhyve_npt_pmap/contrib/wpa/src/tls/tlsv1_common.c projects/bhyve_npt_pmap/contrib/wpa/src/tls/tlsv1_common.h projects/bhyve_npt_pmap/contrib/wpa/src/tls/tlsv1_cred.c projects/bhyve_npt_pmap/contrib/wpa/src/tls/tlsv1_cred.h projects/bhyve_npt_pmap/contrib/wpa/src/tls/tlsv1_record.c projects/bhyve_npt_pmap/contrib/wpa/src/tls/tlsv1_record.h projects/bhyve_npt_pmap/contrib/wpa/src/tls/tlsv1_server.c projects/bhyve_npt_pmap/contrib/wpa/src/tls/tlsv1_server.h projects/bhyve_npt_pmap/contrib/wpa/src/tls/tlsv1_server_i.h projects/bhyve_npt_pmap/contrib/wpa/src/tls/tlsv1_server_read.c projects/bhyve_npt_pmap/contrib/wpa/src/tls/tlsv1_server_write.c projects/bhyve_npt_pmap/contrib/wpa/src/tls/x509v3.c projects/bhyve_npt_pmap/contrib/wpa/src/tls/x509v3.h projects/bhyve_npt_pmap/contrib/wpa/src/utils/base64.c projects/bhyve_npt_pmap/contrib/wpa/src/utils/base64.h projects/bhyve_npt_pmap/contrib/wpa/src/utils/build_config.h projects/bhyve_npt_pmap/contrib/wpa/src/utils/common.c projects/bhyve_npt_pmap/contrib/wpa/src/utils/common.h projects/bhyve_npt_pmap/contrib/wpa/src/utils/eloop.c projects/bhyve_npt_pmap/contrib/wpa/src/utils/eloop.h projects/bhyve_npt_pmap/contrib/wpa/src/utils/eloop_none.c projects/bhyve_npt_pmap/contrib/wpa/src/utils/eloop_win.c projects/bhyve_npt_pmap/contrib/wpa/src/utils/includes.h projects/bhyve_npt_pmap/contrib/wpa/src/utils/ip_addr.c projects/bhyve_npt_pmap/contrib/wpa/src/utils/ip_addr.h projects/bhyve_npt_pmap/contrib/wpa/src/utils/list.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/utils/os.h projects/bhyve_npt_pmap/contrib/wpa/src/utils/os_internal.c projects/bhyve_npt_pmap/contrib/wpa/src/utils/os_none.c projects/bhyve_npt_pmap/contrib/wpa/src/utils/os_unix.c projects/bhyve_npt_pmap/contrib/wpa/src/utils/os_win32.c projects/bhyve_npt_pmap/contrib/wpa/src/utils/pcsc_funcs.c projects/bhyve_npt_pmap/contrib/wpa/src/utils/pcsc_funcs.h projects/bhyve_npt_pmap/contrib/wpa/src/utils/radiotap.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/utils/radiotap_iter.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/utils/state_machine.h projects/bhyve_npt_pmap/contrib/wpa/src/utils/trace.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/utils/trace.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/utils/uuid.c projects/bhyve_npt_pmap/contrib/wpa/src/utils/uuid.h projects/bhyve_npt_pmap/contrib/wpa/src/utils/wpa_debug.c projects/bhyve_npt_pmap/contrib/wpa/src/utils/wpa_debug.h projects/bhyve_npt_pmap/contrib/wpa/src/utils/wpabuf.c projects/bhyve_npt_pmap/contrib/wpa/src/utils/wpabuf.h projects/bhyve_npt_pmap/contrib/wpa/src/wps/http_client.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/wps/http_client.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/wps/http_server.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/wps/http_server.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/wps/httpread.c projects/bhyve_npt_pmap/contrib/wpa/src/wps/httpread.h projects/bhyve_npt_pmap/contrib/wpa/src/wps/ndef.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/wps/upnp_xml.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/wps/upnp_xml.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps.c projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps.h projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_attr_build.c projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_attr_parse.c projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_attr_process.c projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_common.c projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_defs.h projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_dev_attr.c projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_dev_attr.h projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_enrollee.c projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_er.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_er.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_er_ssdp.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_i.h projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_registrar.c projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_upnp.c projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_upnp.h projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_upnp_ap.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_upnp_event.c projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_upnp_i.h projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_upnp_ssdp.c projects/bhyve_npt_pmap/contrib/wpa/src/wps/wps_upnp_web.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/ChangeLog projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/README projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/README-WPS projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/ap.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/ap.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/bgscan.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/bgscan.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/bgscan_simple.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/blacklist.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/blacklist.h projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/bss.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/bss.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/config.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/config.h projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/config_file.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/config_none.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/config_ssid.h projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/ctrl_iface.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/ctrl_iface.h projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/ctrl_iface_named_pipe.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/ctrl_iface_udp.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/ctrl_iface_unix.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/Makefile (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/dbus_common.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/dbus_common.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/dbus_common_i.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/dbus_dict_helpers.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/dbus_dict_helpers.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/dbus_new.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/dbus_new.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/dbus_new_handlers_wps.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/dbus_new_helpers.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/dbus_new_helpers.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/dbus_new_introspect.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/dbus_old.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/dbus_old.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/dbus_old_handlers.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/dbus_old_handlers.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/dbus_old_handlers_wps.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/defconfig projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/driver_i.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/eap_register.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/eapol_test.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/events.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-signals.py (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/ibss_rsn.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/ibss_rsn.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/main.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/main_none.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/notify.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/notify.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/preauth_test.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/scan.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/scan.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/sme.c (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/sme.h (contents, props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/tests/test_eap_sim_common.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/tests/test_wpa.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/wpa_cli.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/wpa_passphrase.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/wpa_priv.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/wpa_supplicant.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/wpa_supplicant.conf projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/wpa_supplicant_i.h projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/wpas_glue.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/wpas_glue.h projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/wps_supplicant.c projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/wps_supplicant.h projects/bhyve_npt_pmap/etc/rc.d/zfs projects/bhyve_npt_pmap/etc/rc.resume projects/bhyve_npt_pmap/include/stdlib.h projects/bhyve_npt_pmap/lib/libc/net/getaddrinfo.3 projects/bhyve_npt_pmap/lib/libc/net/getnameinfo.3 projects/bhyve_npt_pmap/lib/libc/net/sctp_sys_calls.c projects/bhyve_npt_pmap/lib/libc/stdio/mktemp.3 projects/bhyve_npt_pmap/lib/libc/stdlib/rand.c projects/bhyve_npt_pmap/release/release.conf.sample projects/bhyve_npt_pmap/release/release.sh projects/bhyve_npt_pmap/sbin/devd/devd.cc projects/bhyve_npt_pmap/sbin/dhclient/dhclient.c projects/bhyve_npt_pmap/sbin/mount_nfs/mount_nfs.8 projects/bhyve_npt_pmap/sbin/nvmecontrol/devlist.c projects/bhyve_npt_pmap/sbin/nvmecontrol/firmware.c projects/bhyve_npt_pmap/sbin/nvmecontrol/identify.c projects/bhyve_npt_pmap/sbin/nvmecontrol/logpage.c projects/bhyve_npt_pmap/sbin/nvmecontrol/nvmecontrol.c projects/bhyve_npt_pmap/sbin/nvmecontrol/nvmecontrol.h projects/bhyve_npt_pmap/sbin/nvmecontrol/perftest.c projects/bhyve_npt_pmap/sbin/nvmecontrol/reset.c projects/bhyve_npt_pmap/share/doc/legal/Makefile projects/bhyve_npt_pmap/share/man/man4/Makefile projects/bhyve_npt_pmap/share/man/man4/bridge.4 projects/bhyve_npt_pmap/share/man/man4/hptiop.4 projects/bhyve_npt_pmap/share/man/man4/nvd.4 projects/bhyve_npt_pmap/share/man/man4/nvme.4 projects/bhyve_npt_pmap/share/man/man4/oce.4 projects/bhyve_npt_pmap/share/man/man4/virtio.4 projects/bhyve_npt_pmap/share/man/man4/virtio_balloon.4 projects/bhyve_npt_pmap/share/man/man4/virtio_blk.4 projects/bhyve_npt_pmap/share/man/man4/virtio_scsi.4 projects/bhyve_npt_pmap/share/man/man4/vtnet.4 projects/bhyve_npt_pmap/share/man/man5/rc.conf.5 projects/bhyve_npt_pmap/share/man/man9/Makefile projects/bhyve_npt_pmap/share/misc/committers-src.dot projects/bhyve_npt_pmap/sys/amd64/amd64/pmap.c projects/bhyve_npt_pmap/sys/amd64/conf/GENERIC projects/bhyve_npt_pmap/sys/amd64/conf/NOTES projects/bhyve_npt_pmap/sys/amd64/vmm/intel/vmx.c projects/bhyve_npt_pmap/sys/arm/arm/busdma_machdep-v6.c projects/bhyve_npt_pmap/sys/arm/arm/elf_trampoline.c projects/bhyve_npt_pmap/sys/arm/arm/generic_timer.c projects/bhyve_npt_pmap/sys/arm/arm/pmap-v6.c projects/bhyve_npt_pmap/sys/arm/arm/vfp.c projects/bhyve_npt_pmap/sys/arm/broadcom/bcm2835/bcm2835_fb.c projects/bhyve_npt_pmap/sys/arm/broadcom/bcm2835/bcm2835_mbox.c projects/bhyve_npt_pmap/sys/arm/broadcom/bcm2835/bcm2835_mbox.h projects/bhyve_npt_pmap/sys/arm/broadcom/bcm2835/files.bcm2835 projects/bhyve_npt_pmap/sys/arm/conf/BEAGLEBONE projects/bhyve_npt_pmap/sys/arm/ti/am335x/am335x_pmic.c projects/bhyve_npt_pmap/sys/arm/ti/am335x/am335x_pwm.c projects/bhyve_npt_pmap/sys/arm/ti/am335x/files.am335x projects/bhyve_npt_pmap/sys/arm/ti/ti_mmchs.c projects/bhyve_npt_pmap/sys/arm/ti/ti_mmchs.h projects/bhyve_npt_pmap/sys/boot/fdt/dts/am335x-evm.dts projects/bhyve_npt_pmap/sys/boot/fdt/dts/am335x.dtsi projects/bhyve_npt_pmap/sys/boot/fdt/dts/beaglebone-black.dts projects/bhyve_npt_pmap/sys/boot/fdt/dts/beaglebone.dts projects/bhyve_npt_pmap/sys/boot/forth/loader.conf projects/bhyve_npt_pmap/sys/cam/ata/ata_da.c projects/bhyve_npt_pmap/sys/cam/cam_ccb.h projects/bhyve_npt_pmap/sys/cam/scsi/scsi_da.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c projects/bhyve_npt_pmap/sys/cddl/dev/dtrace/dtrace_ioctl.c projects/bhyve_npt_pmap/sys/cddl/dev/dtrace/dtrace_load.c projects/bhyve_npt_pmap/sys/cddl/dev/dtrace/dtrace_unload.c projects/bhyve_npt_pmap/sys/compat/linux/linux_ioctl.c projects/bhyve_npt_pmap/sys/conf/Makefile.amd64 projects/bhyve_npt_pmap/sys/conf/WITHOUT_SOURCELESS_HOST projects/bhyve_npt_pmap/sys/conf/WITHOUT_SOURCELESS_UCODE projects/bhyve_npt_pmap/sys/conf/files projects/bhyve_npt_pmap/sys/conf/files.amd64 projects/bhyve_npt_pmap/sys/conf/files.i386 projects/bhyve_npt_pmap/sys/conf/kmod.mk projects/bhyve_npt_pmap/sys/crypto/sha2/sha2.c projects/bhyve_npt_pmap/sys/crypto/sha2/sha2.h projects/bhyve_npt_pmap/sys/dev/ahci/ahci.c projects/bhyve_npt_pmap/sys/dev/arcmsr/arcmsr.c projects/bhyve_npt_pmap/sys/dev/arcmsr/arcmsr.h projects/bhyve_npt_pmap/sys/dev/cxgbe/adapter.h projects/bhyve_npt_pmap/sys/dev/cxgbe/common/common.h projects/bhyve_npt_pmap/sys/dev/cxgbe/common/t4_hw.c projects/bhyve_npt_pmap/sys/dev/cxgbe/common/t4_hw.h projects/bhyve_npt_pmap/sys/dev/cxgbe/common/t4_msg.h projects/bhyve_npt_pmap/sys/dev/cxgbe/common/t4_regs_values.h projects/bhyve_npt_pmap/sys/dev/cxgbe/firmware/t4fw_cfg.txt projects/bhyve_npt_pmap/sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt projects/bhyve_npt_pmap/sys/dev/cxgbe/firmware/t4fw_interface.h projects/bhyve_npt_pmap/sys/dev/cxgbe/offload.h projects/bhyve_npt_pmap/sys/dev/cxgbe/t4_main.c projects/bhyve_npt_pmap/sys/dev/cxgbe/t4_sge.c projects/bhyve_npt_pmap/sys/dev/cxgbe/tom/t4_connect.c projects/bhyve_npt_pmap/sys/dev/cxgbe/tom/t4_listen.c projects/bhyve_npt_pmap/sys/dev/cxgbe/tom/t4_tom.c projects/bhyve_npt_pmap/sys/dev/cxgbe/tom/t4_tom.h projects/bhyve_npt_pmap/sys/dev/drm2/ttm/ttm_bo_vm.c projects/bhyve_npt_pmap/sys/dev/hme/if_hme.c projects/bhyve_npt_pmap/sys/dev/hpt27xx/hpt27xx_config.c projects/bhyve_npt_pmap/sys/dev/hptiop/hptiop.c projects/bhyve_npt_pmap/sys/dev/iwn/if_iwn.c projects/bhyve_npt_pmap/sys/dev/iwn/if_iwnvar.h projects/bhyve_npt_pmap/sys/dev/ixgb/if_ixgb.c projects/bhyve_npt_pmap/sys/dev/ixgb/ixgb_ids.h projects/bhyve_npt_pmap/sys/dev/mem/memdev.c projects/bhyve_npt_pmap/sys/dev/mmc/mmcsd.c projects/bhyve_npt_pmap/sys/dev/nvd/nvd.c projects/bhyve_npt_pmap/sys/dev/nvme/nvme.c projects/bhyve_npt_pmap/sys/dev/nvme/nvme.h projects/bhyve_npt_pmap/sys/dev/nvme/nvme_ctrlr.c projects/bhyve_npt_pmap/sys/dev/nvme/nvme_ctrlr_cmd.c projects/bhyve_npt_pmap/sys/dev/nvme/nvme_ns.c projects/bhyve_npt_pmap/sys/dev/nvme/nvme_private.h projects/bhyve_npt_pmap/sys/dev/nvme/nvme_qpair.c projects/bhyve_npt_pmap/sys/dev/nvme/nvme_sysctl.c projects/bhyve_npt_pmap/sys/dev/nvme/nvme_test.c projects/bhyve_npt_pmap/sys/dev/oce/oce_hw.c projects/bhyve_npt_pmap/sys/dev/oce/oce_hw.h projects/bhyve_npt_pmap/sys/dev/oce/oce_if.c projects/bhyve_npt_pmap/sys/dev/oce/oce_if.h projects/bhyve_npt_pmap/sys/dev/oce/oce_mbox.c projects/bhyve_npt_pmap/sys/dev/oce/oce_queue.c projects/bhyve_npt_pmap/sys/dev/oce/oce_sysctl.c projects/bhyve_npt_pmap/sys/dev/oce/oce_util.c projects/bhyve_npt_pmap/sys/dev/pci/pci.c projects/bhyve_npt_pmap/sys/dev/pci/pci_pci.c projects/bhyve_npt_pmap/sys/dev/pci/pcib_private.h projects/bhyve_npt_pmap/sys/dev/pci/pcivar.h projects/bhyve_npt_pmap/sys/dev/ral/rt2560.c projects/bhyve_npt_pmap/sys/dev/ral/rt2661.c projects/bhyve_npt_pmap/sys/dev/ral/rt2860.c projects/bhyve_npt_pmap/sys/dev/random/probe.c projects/bhyve_npt_pmap/sys/dev/random/randomdev.c projects/bhyve_npt_pmap/sys/dev/random/randomdev.h projects/bhyve_npt_pmap/sys/dev/random/randomdev_soft.c projects/bhyve_npt_pmap/sys/dev/sound/pci/hda/hdaa_patches.c projects/bhyve_npt_pmap/sys/dev/sound/pci/hda/hdac.h projects/bhyve_npt_pmap/sys/dev/usb/controller/musb_otg.c projects/bhyve_npt_pmap/sys/dev/usb/controller/musb_otg.h projects/bhyve_npt_pmap/sys/dev/usb/controller/musb_otg_atmelarm.c projects/bhyve_npt_pmap/sys/dev/usb/controller/xhci.h projects/bhyve_npt_pmap/sys/dev/usb/controller/xhci_pci.c projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_rum.c projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_uath.c projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_upgt.c projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_ural.c projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_urtw.c projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_urtwn.c projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_zyd.c projects/bhyve_npt_pmap/sys/dev/virtio/balloon/virtio_balloon.c projects/bhyve_npt_pmap/sys/dev/virtio/block/virtio_blk.c projects/bhyve_npt_pmap/sys/dev/virtio/block/virtio_blk.h projects/bhyve_npt_pmap/sys/dev/virtio/network/if_vtnet.c projects/bhyve_npt_pmap/sys/dev/virtio/network/if_vtnetvar.h projects/bhyve_npt_pmap/sys/dev/virtio/pci/virtio_pci.c projects/bhyve_npt_pmap/sys/dev/virtio/scsi/virtio_scsi.c projects/bhyve_npt_pmap/sys/dev/virtio/scsi/virtio_scsivar.h projects/bhyve_npt_pmap/sys/dev/virtio/virtio.c projects/bhyve_npt_pmap/sys/dev/virtio/virtio.h projects/bhyve_npt_pmap/sys/dev/virtio/virtio_bus_if.m projects/bhyve_npt_pmap/sys/dev/virtio/virtio_if.m projects/bhyve_npt_pmap/sys/dev/virtio/virtqueue.c projects/bhyve_npt_pmap/sys/dev/virtio/virtqueue.h projects/bhyve_npt_pmap/sys/fs/ext2fs/ext2_dir.h projects/bhyve_npt_pmap/sys/fs/ext2fs/ext2_extern.h projects/bhyve_npt_pmap/sys/fs/ext2fs/ext2_inode_cnv.c projects/bhyve_npt_pmap/sys/fs/ext2fs/ext2_lookup.c projects/bhyve_npt_pmap/sys/fs/ext2fs/ext2_vfsops.c projects/bhyve_npt_pmap/sys/fs/ext2fs/ext2_vnops.c projects/bhyve_npt_pmap/sys/fs/ext2fs/ext2fs.h projects/bhyve_npt_pmap/sys/fs/nfs/nfs.h projects/bhyve_npt_pmap/sys/fs/nfs/nfs_commonkrpc.c projects/bhyve_npt_pmap/sys/fs/nfsclient/nfs_clvfsops.c projects/bhyve_npt_pmap/sys/fs/nullfs/null_vnops.c projects/bhyve_npt_pmap/sys/geom/geom_disk.c projects/bhyve_npt_pmap/sys/geom/geom_disk.h projects/bhyve_npt_pmap/sys/geom/journal/g_journal.c projects/bhyve_npt_pmap/sys/i386/conf/GENERIC projects/bhyve_npt_pmap/sys/i386/conf/NOTES projects/bhyve_npt_pmap/sys/i386/conf/PAE projects/bhyve_npt_pmap/sys/i386/conf/XEN projects/bhyve_npt_pmap/sys/kern/kern_intr.c projects/bhyve_npt_pmap/sys/kern/kern_priv.c projects/bhyve_npt_pmap/sys/kern/kern_rmlock.c projects/bhyve_npt_pmap/sys/kern/kern_synch.c projects/bhyve_npt_pmap/sys/kern/subr_witness.c projects/bhyve_npt_pmap/sys/kern/vfs_bio.c projects/bhyve_npt_pmap/sys/kern/vfs_cache.c projects/bhyve_npt_pmap/sys/kern/vfs_vnops.c projects/bhyve_npt_pmap/sys/kgssapi/gss_impl.c projects/bhyve_npt_pmap/sys/mips/atheros/ar71xx_setup.h projects/bhyve_npt_pmap/sys/mips/conf/AP93.hints projects/bhyve_npt_pmap/sys/mips/include/atomic.h projects/bhyve_npt_pmap/sys/mips/include/elf.h projects/bhyve_npt_pmap/sys/modules/Makefile projects/bhyve_npt_pmap/sys/modules/cxgbe/Makefile projects/bhyve_npt_pmap/sys/modules/cxgbe/t4_firmware/Makefile projects/bhyve_npt_pmap/sys/modules/ext2fs/Makefile projects/bhyve_npt_pmap/sys/modules/hpt27xx/Makefile projects/bhyve_npt_pmap/sys/net/if_arp.h projects/bhyve_npt_pmap/sys/net/if_var.h projects/bhyve_npt_pmap/sys/net/vnet.h projects/bhyve_npt_pmap/sys/net80211/ieee80211_amrr.c projects/bhyve_npt_pmap/sys/net80211/ieee80211_mesh.c projects/bhyve_npt_pmap/sys/net80211/ieee80211_output.c projects/bhyve_npt_pmap/sys/net80211/ieee80211_phy.c projects/bhyve_npt_pmap/sys/net80211/ieee80211_phy.h projects/bhyve_npt_pmap/sys/netinet/icmp6.h projects/bhyve_npt_pmap/sys/netinet/icmp_var.h projects/bhyve_npt_pmap/sys/netinet/if_ether.c projects/bhyve_npt_pmap/sys/netinet/in.c projects/bhyve_npt_pmap/sys/netinet/in_pcb.c projects/bhyve_npt_pmap/sys/netinet/in_pcb.h projects/bhyve_npt_pmap/sys/netinet/ip_carp.c projects/bhyve_npt_pmap/sys/netinet/ip_carp.h projects/bhyve_npt_pmap/sys/netinet/ip_icmp.c projects/bhyve_npt_pmap/sys/netinet/ip_input.c projects/bhyve_npt_pmap/sys/netinet/ip_mroute.c projects/bhyve_npt_pmap/sys/netinet/ip_mroute.h projects/bhyve_npt_pmap/sys/netinet/ip_output.c projects/bhyve_npt_pmap/sys/netinet/ip_var.h projects/bhyve_npt_pmap/sys/netinet/pim_var.h projects/bhyve_npt_pmap/sys/netinet/sctp_constants.h projects/bhyve_npt_pmap/sys/netinet/sctp_input.c projects/bhyve_npt_pmap/sys/netinet/sctp_pcb.c projects/bhyve_npt_pmap/sys/netinet/sctp_sysctl.c projects/bhyve_npt_pmap/sys/netinet/sctp_sysctl.h projects/bhyve_npt_pmap/sys/netinet/tcp_input.c projects/bhyve_npt_pmap/sys/netinet/tcp_var.h projects/bhyve_npt_pmap/sys/netinet/udp_usrreq.c projects/bhyve_npt_pmap/sys/netinet/udp_var.h projects/bhyve_npt_pmap/sys/netinet6/icmp6.c projects/bhyve_npt_pmap/sys/netinet6/in6.c projects/bhyve_npt_pmap/sys/netinet6/in6_pcb.c projects/bhyve_npt_pmap/sys/netinet6/in6_proto.c projects/bhyve_npt_pmap/sys/netinet6/in6_var.h projects/bhyve_npt_pmap/sys/netinet6/ip6_input.c projects/bhyve_npt_pmap/sys/netinet6/ip6_mroute.h projects/bhyve_npt_pmap/sys/netinet6/ip6_output.c projects/bhyve_npt_pmap/sys/netinet6/ip6_var.h projects/bhyve_npt_pmap/sys/netinet6/pim6_var.h projects/bhyve_npt_pmap/sys/netinet6/raw_ip6.c projects/bhyve_npt_pmap/sys/netinet6/raw_ip6.h projects/bhyve_npt_pmap/sys/netipsec/ah_var.h projects/bhyve_npt_pmap/sys/netipsec/esp_var.h projects/bhyve_npt_pmap/sys/netipsec/ipcomp_var.h projects/bhyve_npt_pmap/sys/netipsec/ipip_var.h projects/bhyve_npt_pmap/sys/netipsec/ipsec.c projects/bhyve_npt_pmap/sys/netipsec/ipsec.h projects/bhyve_npt_pmap/sys/netipsec/ipsec6.h projects/bhyve_npt_pmap/sys/netipsec/keysock.c projects/bhyve_npt_pmap/sys/netipsec/keysock.h projects/bhyve_npt_pmap/sys/netipsec/xform_ah.c projects/bhyve_npt_pmap/sys/netipsec/xform_esp.c projects/bhyve_npt_pmap/sys/netipsec/xform_ipcomp.c projects/bhyve_npt_pmap/sys/netipsec/xform_ipip.c projects/bhyve_npt_pmap/sys/nfsclient/nfs_subs.c projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/main.c projects/bhyve_npt_pmap/sys/ofed/include/linux/sysfs.h projects/bhyve_npt_pmap/sys/rpc/rpcsec_gss.h projects/bhyve_npt_pmap/sys/rpc/rpcsec_gss/rpcsec_gss.c projects/bhyve_npt_pmap/sys/security/audit/audit.c projects/bhyve_npt_pmap/sys/sys/counter.h projects/bhyve_npt_pmap/sys/sys/elf_common.h projects/bhyve_npt_pmap/sys/sys/param.h projects/bhyve_npt_pmap/sys/sys/priv.h projects/bhyve_npt_pmap/sys/sys/sdt.h projects/bhyve_npt_pmap/sys/sys/systm.h projects/bhyve_npt_pmap/sys/sys/vnode.h projects/bhyve_npt_pmap/sys/ufs/ffs/ffs_snapshot.c projects/bhyve_npt_pmap/sys/ufs/ffs/ffs_suspend.c projects/bhyve_npt_pmap/sys/ufs/ffs/ffs_vfsops.c projects/bhyve_npt_pmap/sys/vm/swap_pager.c projects/bhyve_npt_pmap/sys/vm/vm_page.c projects/bhyve_npt_pmap/sys/vm/vm_phys.c projects/bhyve_npt_pmap/tools/tools/crypto/ipsecstats.c projects/bhyve_npt_pmap/tools/tools/zfsboottest/zfsboottest.c projects/bhyve_npt_pmap/tools/tools/zfsboottest/zfsboottest.sh projects/bhyve_npt_pmap/usr.bin/mail/popen.c projects/bhyve_npt_pmap/usr.bin/make/job.c projects/bhyve_npt_pmap/usr.bin/netstat/inet.c projects/bhyve_npt_pmap/usr.bin/netstat/inet6.c projects/bhyve_npt_pmap/usr.bin/netstat/ipsec.c projects/bhyve_npt_pmap/usr.bin/netstat/main.c projects/bhyve_npt_pmap/usr.bin/netstat/mroute.c projects/bhyve_npt_pmap/usr.bin/netstat/netstat.h projects/bhyve_npt_pmap/usr.bin/netstat/pfkey.c projects/bhyve_npt_pmap/usr.sbin/Makefile projects/bhyve_npt_pmap/usr.sbin/authpf/Makefile projects/bhyve_npt_pmap/usr.sbin/bhyve/bhyverun.c projects/bhyve_npt_pmap/usr.sbin/bhyve/pci_emul.c projects/bhyve_npt_pmap/usr.sbin/bhyve/pci_emul.h projects/bhyve_npt_pmap/usr.sbin/bhyve/pci_virtio_net.c projects/bhyve_npt_pmap/usr.sbin/bsdconfig/USAGE projects/bhyve_npt_pmap/usr.sbin/bsdconfig/bsdconfig projects/bhyve_npt_pmap/usr.sbin/bsdconfig/bsdconfig.8 projects/bhyve_npt_pmap/usr.sbin/bsdconfig/console/USAGE projects/bhyve_npt_pmap/usr.sbin/bsdconfig/console/console projects/bhyve_npt_pmap/usr.sbin/bsdconfig/console/font projects/bhyve_npt_pmap/usr.sbin/bsdconfig/console/keymap projects/bhyve_npt_pmap/usr.sbin/bsdconfig/console/repeat projects/bhyve_npt_pmap/usr.sbin/bsdconfig/console/saver projects/bhyve_npt_pmap/usr.sbin/bsdconfig/console/screenmap projects/bhyve_npt_pmap/usr.sbin/bsdconfig/console/ttys projects/bhyve_npt_pmap/usr.sbin/bsdconfig/diskmgmt/USAGE projects/bhyve_npt_pmap/usr.sbin/bsdconfig/diskmgmt/diskmgmt projects/bhyve_npt_pmap/usr.sbin/bsdconfig/docsinstall/USAGE projects/bhyve_npt_pmap/usr.sbin/bsdconfig/docsinstall/docsinstall projects/bhyve_npt_pmap/usr.sbin/bsdconfig/dot/USAGE projects/bhyve_npt_pmap/usr.sbin/bsdconfig/dot/dot projects/bhyve_npt_pmap/usr.sbin/bsdconfig/examples/Makefile projects/bhyve_npt_pmap/usr.sbin/bsdconfig/include/messages.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/mouse/USAGE projects/bhyve_npt_pmap/usr.sbin/bsdconfig/mouse/disable projects/bhyve_npt_pmap/usr.sbin/bsdconfig/mouse/enable projects/bhyve_npt_pmap/usr.sbin/bsdconfig/mouse/flags projects/bhyve_npt_pmap/usr.sbin/bsdconfig/mouse/mouse projects/bhyve_npt_pmap/usr.sbin/bsdconfig/mouse/port projects/bhyve_npt_pmap/usr.sbin/bsdconfig/mouse/type projects/bhyve_npt_pmap/usr.sbin/bsdconfig/networking/USAGE projects/bhyve_npt_pmap/usr.sbin/bsdconfig/networking/defaultrouter projects/bhyve_npt_pmap/usr.sbin/bsdconfig/networking/devices projects/bhyve_npt_pmap/usr.sbin/bsdconfig/networking/hostname projects/bhyve_npt_pmap/usr.sbin/bsdconfig/networking/include/messages.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/networking/nameservers projects/bhyve_npt_pmap/usr.sbin/bsdconfig/networking/networking projects/bhyve_npt_pmap/usr.sbin/bsdconfig/networking/share/Makefile projects/bhyve_npt_pmap/usr.sbin/bsdconfig/networking/share/common.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/networking/share/device.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/networking/share/hostname.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/networking/share/ipaddr.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/networking/share/media.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/networking/share/netmask.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/networking/share/resolv.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/networking/share/routing.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/packages/USAGE projects/bhyve_npt_pmap/usr.sbin/bsdconfig/packages/packages projects/bhyve_npt_pmap/usr.sbin/bsdconfig/password/USAGE projects/bhyve_npt_pmap/usr.sbin/bsdconfig/password/password projects/bhyve_npt_pmap/usr.sbin/bsdconfig/password/share/password.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/security/USAGE projects/bhyve_npt_pmap/usr.sbin/bsdconfig/security/kern_securelevel projects/bhyve_npt_pmap/usr.sbin/bsdconfig/security/security projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/common.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/device.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/dialog.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/any.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/cdrom.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/common.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/directory.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/dos.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/floppy.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/ftp.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/http.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/httpproxy.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/network.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/nfs.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/options.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/tcpip.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/ufs.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/usb.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/mustberoot.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/packages/categories.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/packages/index.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/packages/packages.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/script.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/strings.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/struct.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/sysrc.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/variable.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/startup/USAGE projects/bhyve_npt_pmap/usr.sbin/bsdconfig/startup/misc projects/bhyve_npt_pmap/usr.sbin/bsdconfig/startup/rcadd projects/bhyve_npt_pmap/usr.sbin/bsdconfig/startup/rcconf projects/bhyve_npt_pmap/usr.sbin/bsdconfig/startup/rcdelete projects/bhyve_npt_pmap/usr.sbin/bsdconfig/startup/rcvar projects/bhyve_npt_pmap/usr.sbin/bsdconfig/startup/share/rcconf.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/startup/share/rcvar.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/startup/startup projects/bhyve_npt_pmap/usr.sbin/bsdconfig/timezone/USAGE projects/bhyve_npt_pmap/usr.sbin/bsdconfig/timezone/share/continents.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/timezone/share/countries.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/timezone/share/iso3166.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/timezone/share/menus.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/timezone/share/zones.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/timezone/timezone projects/bhyve_npt_pmap/usr.sbin/bsdconfig/ttys/USAGE projects/bhyve_npt_pmap/usr.sbin/bsdconfig/ttys/ttys projects/bhyve_npt_pmap/usr.sbin/bsdconfig/usermgmt/USAGE projects/bhyve_npt_pmap/usr.sbin/bsdconfig/usermgmt/groupinput projects/bhyve_npt_pmap/usr.sbin/bsdconfig/usermgmt/share/group_input.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/usermgmt/share/user_input.subr projects/bhyve_npt_pmap/usr.sbin/bsdconfig/usermgmt/userinput projects/bhyve_npt_pmap/usr.sbin/gssd/gssd.8 projects/bhyve_npt_pmap/usr.sbin/gssd/gssd.c projects/bhyve_npt_pmap/usr.sbin/powerd/powerd.8 projects/bhyve_npt_pmap/usr.sbin/powerd/powerd.c projects/bhyve_npt_pmap/usr.sbin/ppp/defs.c projects/bhyve_npt_pmap/usr.sbin/ppp/defs.h projects/bhyve_npt_pmap/usr.sbin/pw/pw_user.c projects/bhyve_npt_pmap/usr.sbin/rtadvd/config.c projects/bhyve_npt_pmap/usr.sbin/rtadvd/rtadvd.c projects/bhyve_npt_pmap/usr.sbin/sysrc/sysrc projects/bhyve_npt_pmap/usr.sbin/sysrc/sysrc.8 projects/bhyve_npt_pmap/usr.sbin/wpa/Makefile.crypto projects/bhyve_npt_pmap/usr.sbin/wpa/Makefile.inc projects/bhyve_npt_pmap/usr.sbin/wpa/hostapd/Makefile projects/bhyve_npt_pmap/usr.sbin/wpa/hostapd_cli/Makefile projects/bhyve_npt_pmap/usr.sbin/wpa/wpa_cli/Makefile projects/bhyve_npt_pmap/usr.sbin/wpa/wpa_passphrase/Makefile projects/bhyve_npt_pmap/usr.sbin/wpa/wpa_supplicant/Makefile Directory Properties: projects/bhyve_npt_pmap/ (props changed) projects/bhyve_npt_pmap/cddl/ (props changed) projects/bhyve_npt_pmap/cddl/contrib/opensolaris/ (props changed) projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/zfs/ (props changed) projects/bhyve_npt_pmap/contrib/llvm/ (props changed) projects/bhyve_npt_pmap/contrib/tcpdump/ (props changed) projects/bhyve_npt_pmap/contrib/tzdata/ (props changed) projects/bhyve_npt_pmap/contrib/wpa/ (props changed) projects/bhyve_npt_pmap/contrib/wpa/hostapd/eap_testing.txt (props changed) projects/bhyve_npt_pmap/contrib/wpa/hostapd/hostapd.8 (props changed) projects/bhyve_npt_pmap/contrib/wpa/hostapd/hostapd_cli.1 (props changed) projects/bhyve_npt_pmap/contrib/wpa/hostapd/logwatch/hostapd.conf (props changed) projects/bhyve_npt_pmap/contrib/wpa/hostapd/wired.conf (props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/vlan_init.h (props changed) projects/bhyve_npt_pmap/contrib/wpa/src/ap/wmm.h (props changed) projects/bhyve_npt_pmap/contrib/wpa/src/utils/radiotap.c (props changed) projects/bhyve_npt_pmap/contrib/wpa/src/wps/http.h (props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/dbus/dbus-wpa_supplicant.conf (props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-getall.py (props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new-wps.py (props changed) projects/bhyve_npt_pmap/contrib/wpa/wpa_supplicant/examples/wpas-dbus-new.py (props changed) projects/bhyve_npt_pmap/lib/libc/ (props changed) projects/bhyve_npt_pmap/sbin/ (props changed) projects/bhyve_npt_pmap/share/man/man4/ (props changed) projects/bhyve_npt_pmap/sys/ (props changed) projects/bhyve_npt_pmap/sys/boot/ (props changed) projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/ (props changed) projects/bhyve_npt_pmap/sys/conf/ (props changed) projects/bhyve_npt_pmap/usr.sbin/bhyve/ (props changed) projects/bhyve_npt_pmap/usr.sbin/rtadvd/ (props changed) Modified: projects/bhyve_npt_pmap/Makefile ============================================================================== --- projects/bhyve_npt_pmap/Makefile Wed Aug 21 00:04:31 2013 (r254587) +++ projects/bhyve_npt_pmap/Makefile Wed Aug 21 02:14:23 2013 (r254588) @@ -32,6 +32,12 @@ # targets - Print a list of supported TARGET/TARGET_ARCH pairs # for world and kernel targets. # toolchains - Build a toolchain for all world and kernel targets. +# +# "quick" way to test all kernel builds: +# _jflag=`sysctl -n hw.ncpu` +# _jflag=$(($_jflag * 2)) +# [ $_jflag -gt 12 ] && _jflag=12 +# make universe -DMAKE_JUST_KERNELS JFLAG=-j${_jflag} # # This makefile is simple by design. The FreeBSD make automatically reads # the /usr/share/mk/sys.mk unless the -m argument is specified on the Modified: projects/bhyve_npt_pmap/Makefile.inc1 ============================================================================== --- projects/bhyve_npt_pmap/Makefile.inc1 Wed Aug 21 00:04:31 2013 (r254587) +++ projects/bhyve_npt_pmap/Makefile.inc1 Wed Aug 21 02:14:23 2013 (r254588) @@ -1237,7 +1237,7 @@ _kerberos5_bootstrap_tools= \ # Please document (add comment) why something is in 'bootstrap-tools'. # Try to bound the building of the bootstrap-tool to just the # FreeBSD versions that need the tool built at this stage of the build. -bootstrap-tools: +bootstrap-tools: .MAKE .for _tool in \ ${_clang_tblgen} \ ${_kerberos5_bootstrap_tools} \ @@ -1290,7 +1290,7 @@ _gcc_tools= gnu/usr.bin/cc/cc_tools _rescue= rescue/rescue .endif -build-tools: +build-tools: .MAKE .for _tool in \ bin/csh \ bin/sh \ @@ -1352,7 +1352,7 @@ _cc= gnu/usr.bin/cc .endif .endif -cross-tools: +cross-tools: .MAKE .for _tool in \ ${_clang_libs} \ ${_clang} \ @@ -1383,12 +1383,12 @@ hierarchy hier: # interdependencies (__L) are built automatically by the # ${.CURDIR}/tools/make_libdeps.sh script. # -libraries: - cd ${.CURDIR}; \ - ${MAKE} -f Makefile.inc1 _prereq_libs; \ - ${MAKE} -f Makefile.inc1 _startup_libs; \ - ${MAKE} -f Makefile.inc1 _prebuild_libs; \ - ${MAKE} -f Makefile.inc1 _generic_libs; +libraries: .MAKE + cd ${.CURDIR} && \ + ${MAKE} -f Makefile.inc1 _prereq_libs && \ + ${MAKE} -f Makefile.inc1 _startup_libs && \ + ${MAKE} -f Makefile.inc1 _prebuild_libs && \ + ${MAKE} -f Makefile.inc1 _generic_libs # # static libgcc.a prerequisite for shared libc @@ -1542,7 +1542,7 @@ lib/libradius__L: lib/libmd__L .endif .for _lib in ${_prereq_libs} -${_lib}__PL: .PHONY +${_lib}__PL: .PHONY .MAKE .if exists(${.CURDIR}/${_lib}) ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_lib} && \ @@ -1554,7 +1554,7 @@ ${_lib}__PL: .PHONY .endfor .for _lib in ${_startup_libs} ${_prebuild_libs:Nlib/libpam} ${_generic_libs} -${_lib}__L: .PHONY +${_lib}__L: .PHONY .MAKE .if exists(${.CURDIR}/${_lib}) ${_+_}@${ECHODIR} "===> ${_lib} (obj,depend,all,install)"; \ cd ${.CURDIR}/${_lib} && \ @@ -1568,7 +1568,7 @@ ${_lib}__L: .PHONY # 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 +lib/libpam__L: .PHONY .MAKE ${_+_}@${ECHODIR} "===> lib/libpam (obj,depend,all,install)"; \ cd ${.CURDIR}/lib/libpam && \ ${MAKE} DIRPRFX=lib/libpam/ obj && \ @@ -1583,7 +1583,7 @@ _generic_libs: ${_generic_libs:S/$/__L/} .for __target in all clean cleandepend cleandir depend includes obj .for entry in ${SUBDIR} -${entry}.${__target}__D: .PHONY +${entry}.${__target}__D: .PHONY .MAKE ${_+_}@set -e; if test -d ${.CURDIR}/${entry}.${MACHINE_ARCH}; then \ ${ECHODIR} "===> ${DIRPRFX}${entry}.${MACHINE_ARCH} (${__target})"; \ edir=${entry}.${MACHINE_ARCH}; \ Modified: projects/bhyve_npt_pmap/UPDATING ============================================================================== --- projects/bhyve_npt_pmap/UPDATING Wed Aug 21 00:04:31 2013 (r254587) +++ projects/bhyve_npt_pmap/UPDATING Wed Aug 21 02:14:23 2013 (r254588) @@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20130709: + Most of network statistics structures were changed to be able + keep 64-bits counters. Thus all tools, that work with networking + statistics, must be rebuilded (netstat(1), bsnmpd(1), etc.) + 20130629: Fix targets that run multiple make's to use && rather than ; so that subsequent steps depend on success of previous. Modified: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c ============================================================================== --- projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Wed Aug 21 00:04:31 2013 (r254587) +++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c Wed Aug 21 02:14:23 2013 (r254588) @@ -5601,8 +5601,8 @@ share_mount_one(zfs_handle_t *zhp, int o (void) fprintf(stderr, gettext("cannot share '%s': " "legacy share\n"), zfs_get_name(zhp)); - (void) fprintf(stderr, gettext("use share(1M) to " - "share this filesystem, or set " + (void) fprintf(stderr, gettext("to " + "share this filesystem set " "sharenfs property on\n")); return (1); } @@ -5618,7 +5618,7 @@ share_mount_one(zfs_handle_t *zhp, int o (void) fprintf(stderr, gettext("cannot %s '%s': " "legacy mountpoint\n"), cmdname, zfs_get_name(zhp)); - (void) fprintf(stderr, gettext("use %s(1M) to " + (void) fprintf(stderr, gettext("use %s(8) to " "%s this filesystem\n"), cmdname, cmdname); return (1); } @@ -6056,8 +6056,10 @@ unshare_unmount_path(int op, char *path, strcmp(smbshare_prop, "off") == 0) { (void) fprintf(stderr, gettext("cannot unshare " "'%s': legacy share\n"), path); +#ifdef illumos (void) fprintf(stderr, gettext("use " "unshare(1M) to unshare this filesystem\n")); +#endif } else if (!zfs_is_shared(zhp)) { (void) fprintf(stderr, gettext("cannot unshare '%s': " "not currently shared\n"), path); @@ -6076,7 +6078,7 @@ unshare_unmount_path(int op, char *path, (void) fprintf(stderr, gettext("cannot unmount " "'%s': legacy mountpoint\n"), zfs_get_name(zhp)); - (void) fprintf(stderr, gettext("use umount(1M) " + (void) fprintf(stderr, gettext("use umount(8) " "to unmount this filesystem\n")); } else { ret = zfs_unmountall(zhp, flags); @@ -6298,9 +6300,11 @@ unshare_unmount(int op, int argc, char * (void) fprintf(stderr, gettext("cannot " "unshare '%s': legacy share\n"), zfs_get_name(zhp)); +#ifdef illumos (void) fprintf(stderr, gettext("use " "unshare(1M) to unshare this " "filesystem\n")); +#endif ret = 1; } else if (!zfs_is_shared(zhp)) { (void) fprintf(stderr, gettext("cannot " @@ -6318,7 +6322,7 @@ unshare_unmount(int op, int argc, char * "unmount '%s': legacy " "mountpoint\n"), zfs_get_name(zhp)); (void) fprintf(stderr, gettext("use " - "umount(1M) to unmount this " + "umount(8) to unmount this " "filesystem\n")); ret = 1; } else if (!zfs_is_mounted(zhp, NULL)) { @@ -6504,12 +6508,12 @@ manual_mount(int argc, char **argv) } } else { (void) fprintf(stderr, gettext("filesystem '%s' cannot be " - "mounted using 'mount -F zfs'\n"), dataset); + "mounted using 'mount -t zfs'\n"), dataset); (void) fprintf(stderr, gettext("Use 'zfs set mountpoint=%s' " "instead.\n"), path); - (void) fprintf(stderr, gettext("If you must use 'mount -F zfs' " - "or /etc/vfstab, use 'zfs set mountpoint=legacy'.\n")); - (void) fprintf(stderr, gettext("See zfs(1M) for more " + (void) fprintf(stderr, gettext("If you must use 'mount -t zfs' " + "or /etc/fstab, use 'zfs set mountpoint=legacy'.\n")); + (void) fprintf(stderr, gettext("See zfs(8) for more " "information.\n")); ret = 1; } Modified: projects/bhyve_npt_pmap/contrib/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h ============================================================================== --- projects/bhyve_npt_pmap/contrib/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h Wed Aug 21 00:04:31 2013 (r254587) +++ projects/bhyve_npt_pmap/contrib/llvm/include/llvm/CodeGen/FunctionLoweringInfo.h Wed Aug 21 02:14:23 2013 (r254588) @@ -115,6 +115,11 @@ public: /// there's no other convenient place for it to live right now. std::vector > PHINodesToUpdate; + /// If the current MBB is a landing pad, the exception pointer and exception + /// selector registers are copied into these virtual registers by + /// SelectionDAGISel::PrepareEHLandingPad(). + unsigned ExceptionPointerVirtReg, ExceptionSelectorVirtReg; + explicit FunctionLoweringInfo(const TargetLowering &TLI); /// set - Initialize this FunctionLoweringInfo with the given Function Modified: projects/bhyve_npt_pmap/contrib/llvm/include/llvm/CodeGen/MachineBasicBlock.h ============================================================================== --- projects/bhyve_npt_pmap/contrib/llvm/include/llvm/CodeGen/MachineBasicBlock.h Wed Aug 21 00:04:31 2013 (r254587) +++ projects/bhyve_npt_pmap/contrib/llvm/include/llvm/CodeGen/MachineBasicBlock.h Wed Aug 21 02:14:23 2013 (r254588) @@ -296,6 +296,11 @@ public: /// is an error to add the same register to the same set more than once. void addLiveIn(unsigned Reg) { LiveIns.push_back(Reg); } + /// Add PhysReg as live in to this block, and ensure that there is a copy of + /// PhysReg to a virtual register of class RC. Return the virtual register + /// that is a copy of the live in PhysReg. + unsigned addLiveIn(unsigned PhysReg, const TargetRegisterClass *RC); + /// removeLiveIn - Remove the specified register from the live in set. /// void removeLiveIn(unsigned Reg); Modified: projects/bhyve_npt_pmap/contrib/llvm/lib/CodeGen/MachineBasicBlock.cpp ============================================================================== --- projects/bhyve_npt_pmap/contrib/llvm/lib/CodeGen/MachineBasicBlock.cpp Wed Aug 21 00:04:31 2013 (r254587) +++ projects/bhyve_npt_pmap/contrib/llvm/lib/CodeGen/MachineBasicBlock.cpp Wed Aug 21 02:14:23 2013 (r254588) @@ -19,6 +19,7 @@ #include "llvm/CodeGen/LiveVariables.h" #include "llvm/CodeGen/MachineDominators.h" #include "llvm/CodeGen/MachineFunction.h" +#include "llvm/CodeGen/MachineInstrBuilder.h" #include "llvm/CodeGen/MachineLoopInfo.h" #include "llvm/CodeGen/MachineRegisterInfo.h" #include "llvm/CodeGen/SlotIndexes.h" @@ -341,6 +342,38 @@ bool MachineBasicBlock::isLiveIn(unsigne return I != livein_end(); } +unsigned +MachineBasicBlock::addLiveIn(unsigned PhysReg, const TargetRegisterClass *RC) { + assert(getParent() && "MBB must be inserted in function"); + assert(TargetRegisterInfo::isPhysicalRegister(PhysReg) && "Expected physreg"); + assert(RC && "Register class is required"); + assert((isLandingPad() || this == &getParent()->front()) && + "Only the entry block and landing pads can have physreg live ins"); + + bool LiveIn = isLiveIn(PhysReg); + iterator I = SkipPHIsAndLabels(begin()), E = end(); + MachineRegisterInfo &MRI = getParent()->getRegInfo(); + const TargetInstrInfo &TII = *getParent()->getTarget().getInstrInfo(); + + // Look for an existing copy. + if (LiveIn) + for (;I != E && I->isCopy(); ++I) + if (I->getOperand(1).getReg() == PhysReg) { + unsigned VirtReg = I->getOperand(0).getReg(); + if (!MRI.constrainRegClass(VirtReg, RC)) + llvm_unreachable("Incompatible live-in register class."); + return VirtReg; + } + + // No luck, create a virtual register. + unsigned VirtReg = MRI.createVirtualRegister(RC); + BuildMI(*this, I, DebugLoc(), TII.get(TargetOpcode::COPY), VirtReg) + .addReg(PhysReg, RegState::Kill); + if (!LiveIn) + addLiveIn(PhysReg); + return VirtReg; +} + void MachineBasicBlock::moveBefore(MachineBasicBlock *NewAfter) { getParent()->splice(NewAfter, this); } Modified: projects/bhyve_npt_pmap/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp ============================================================================== --- projects/bhyve_npt_pmap/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp Wed Aug 21 00:04:31 2013 (r254587) +++ projects/bhyve_npt_pmap/contrib/llvm/lib/CodeGen/SelectionDAG/FastISel.cpp Wed Aug 21 02:14:23 2013 (r254588) @@ -75,15 +75,12 @@ STATISTIC(NumFastIselDead, "Number of de void FastISel::startNewBlock() { LocalValueMap.clear(); + // Instructions are appended to FuncInfo.MBB. If the basic block already + // contains labels or copies, use the last instruction as the last local + // value. EmitStartPt = 0; - - // Advance the emit start point past any EH_LABEL instructions. - MachineBasicBlock::iterator - I = FuncInfo.MBB->begin(), E = FuncInfo.MBB->end(); - while (I != E && I->getOpcode() == TargetOpcode::EH_LABEL) { - EmitStartPt = I; - ++I; - } + if (!FuncInfo.MBB->empty()) + EmitStartPt = &FuncInfo.MBB->back(); LastLocalValue = EmitStartPt; } Modified: projects/bhyve_npt_pmap/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp ============================================================================== --- projects/bhyve_npt_pmap/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Wed Aug 21 00:04:31 2013 (r254587) +++ projects/bhyve_npt_pmap/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGBuilder.cpp Wed Aug 21 02:14:23 2013 (r254588) @@ -1910,33 +1910,25 @@ void SelectionDAGBuilder::visitLandingPa SmallVector ValueVTs; ComputeValueVTs(TLI, LP.getType(), ValueVTs); + assert(ValueVTs.size() == 2 && "Only two-valued landingpads are supported"); - // Insert the EXCEPTIONADDR instruction. - assert(FuncInfo.MBB->isLandingPad() && - "Call to eh.exception not in landing pad!"); - SDVTList VTs = DAG.getVTList(TLI.getPointerTy(), MVT::Other); + // Get the two live-in registers as SDValues. The physregs have already been + // copied into virtual registers. SDValue Ops[2]; - Ops[0] = DAG.getRoot(); - SDValue Op1 = DAG.getNode(ISD::EXCEPTIONADDR, getCurDebugLoc(), VTs, Ops, 1); - SDValue Chain = Op1.getValue(1); - - // Insert the EHSELECTION instruction. - VTs = DAG.getVTList(TLI.getPointerTy(), MVT::Other); - Ops[0] = Op1; - Ops[1] = Chain; - SDValue Op2 = DAG.getNode(ISD::EHSELECTION, getCurDebugLoc(), VTs, Ops, 2); - Chain = Op2.getValue(1); - Op2 = DAG.getSExtOrTrunc(Op2, getCurDebugLoc(), MVT::i32); + Ops[0] = DAG.getZExtOrTrunc( + DAG.getCopyFromReg(DAG.getEntryNode(), getCurDebugLoc(), + FuncInfo.ExceptionPointerVirtReg, TLI.getPointerTy()), + getCurDebugLoc(), ValueVTs[0]); + Ops[1] = DAG.getZExtOrTrunc( + DAG.getCopyFromReg(DAG.getEntryNode(), getCurDebugLoc(), + FuncInfo.ExceptionSelectorVirtReg, TLI.getPointerTy()), + getCurDebugLoc(), ValueVTs[1]); - Ops[0] = Op1; - Ops[1] = Op2; + // Merge into one. SDValue Res = DAG.getNode(ISD::MERGE_VALUES, getCurDebugLoc(), DAG.getVTList(&ValueVTs[0], ValueVTs.size()), &Ops[0], 2); - - std::pair RetPair = std::make_pair(Res, Chain); - setValue(&LP, RetPair.first); - DAG.setRoot(RetPair.second); + setValue(&LP, Res); } /// handleSmallSwitchCaseRange - Emit a series of specific tests (suitable for Modified: projects/bhyve_npt_pmap/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp ============================================================================== --- projects/bhyve_npt_pmap/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Wed Aug 21 00:04:31 2013 (r254587) +++ projects/bhyve_npt_pmap/contrib/llvm/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Wed Aug 21 02:14:23 2013 (r254588) @@ -827,12 +827,13 @@ void SelectionDAGISel::PrepareEHLandingP .addSym(Label); // Mark exception register as live in. - unsigned Reg = TLI.getExceptionPointerRegister(); - if (Reg) MBB->addLiveIn(Reg); + const TargetRegisterClass *PtrRC = TLI.getRegClassFor(TLI.getPointerTy()); + if (unsigned Reg = TLI.getExceptionPointerRegister()) + FuncInfo->ExceptionPointerVirtReg = MBB->addLiveIn(Reg, PtrRC); // Mark exception selector register as live in. - Reg = TLI.getExceptionSelectorRegister(); - if (Reg) MBB->addLiveIn(Reg); + if (unsigned Reg = TLI.getExceptionSelectorRegister()) + FuncInfo->ExceptionSelectorVirtReg = MBB->addLiveIn(Reg, PtrRC); } /// isFoldedOrDeadInstruction - Return true if the specified instruction is @@ -970,6 +971,8 @@ void SelectionDAGISel::SelectAllBasicBlo FuncInfo->InsertPt = FuncInfo->MBB->getFirstNonPHI(); // Setup an EH landing-pad block. + FuncInfo->ExceptionPointerVirtReg = 0; + FuncInfo->ExceptionSelectorVirtReg = 0; if (FuncInfo->MBB->isLandingPad()) PrepareEHLandingPad(); Modified: projects/bhyve_npt_pmap/contrib/tcpdump/tcpdump.c ============================================================================== --- projects/bhyve_npt_pmap/contrib/tcpdump/tcpdump.c Wed Aug 21 00:04:31 2013 (r254587) +++ projects/bhyve_npt_pmap/contrib/tcpdump/tcpdump.c Wed Aug 21 02:14:23 2013 (r254588) @@ -68,6 +68,13 @@ extern int SIZE_BUF; #include #include #include +#ifdef __FreeBSD__ +#include +#include +#include +#include +#include +#endif /* __FreeBSD__ */ #ifndef WIN32 #include #include @@ -384,6 +391,9 @@ struct dump_info { char *CurrentFileName; pcap_t *pd; pcap_dumper_t *p; +#ifdef __FreeBSD__ + int dirfd; +#endif }; #ifdef HAVE_PCAP_SET_TSTAMP_TYPE @@ -702,6 +712,10 @@ main(int argc, char **argv) #endif int status; FILE *VFile; +#ifdef __FreeBSD__ + int cansandbox; +#endif + #ifdef WIN32 if(wsockinit() != 0) return 1; #endif /* WIN32 */ @@ -1189,6 +1203,12 @@ main(int argc, char **argv) pd = pcap_open_offline(RFileName, ebuf); if (pd == NULL) error("%s", ebuf); +#ifdef __FreeBSD__ + if (cap_rights_limit(fileno(pcap_file(pd)), CAP_READ) < 0 && + errno != ENOSYS) { + error("unable to limit pcap descriptor"); + } +#endif dlt = pcap_datalink(pd); dlt_name = pcap_datalink_val_to_name(dlt); if (dlt_name == NULL) { @@ -1437,6 +1457,20 @@ main(int argc, char **argv) if (pcap_setfilter(pd, &fcode) < 0) error("%s", pcap_geterr(pd)); +#ifdef __FreeBSD__ + if (RFileName == NULL && VFileName == NULL) { + static const unsigned long cmds[] = { BIOCGSTATS }; + + if (cap_rights_limit(pcap_fileno(pd), + CAP_IOCTL | CAP_READ) < 0 && errno != ENOSYS) { + error("unable to limit pcap descriptor"); + } + if (cap_ioctls_limit(pcap_fileno(pd), cmds, + sizeof(cmds) / sizeof(cmds[0])) < 0 && errno != ENOSYS) { + error("unable to limit ioctls on pcap descriptor"); + } + } +#endif if (WFileName) { pcap_dumper_t *p; /* Do not exceed the default PATH_MAX for files. */ @@ -1458,9 +1492,30 @@ main(int argc, char **argv) #endif if (p == NULL) error("%s", pcap_geterr(pd)); +#ifdef __FreeBSD__ + if (cap_rights_limit(fileno(pcap_dump_file(p)), + CAP_SEEK | CAP_WRITE) < 0 && errno != ENOSYS) { + error("unable to limit dump descriptor"); + } +#endif if (Cflag != 0 || Gflag != 0) { - callback = dump_packet_and_trunc; +#ifdef __FreeBSD__ + dumpinfo.WFileName = strdup(basename(WFileName)); + dumpinfo.dirfd = open(dirname(WFileName), + O_DIRECTORY | O_RDONLY); + if (dumpinfo.dirfd < 0) { + error("unable to open directory %s", + dirname(WFileName)); + } + if (cap_rights_limit(dumpinfo.dirfd, CAP_CREATE | + CAP_FCNTL | CAP_FTRUNCATE | CAP_LOOKUP | CAP_SEEK | + CAP_WRITE) < 0 && errno != ENOSYS) { + error("unable to limit directory rights"); + } +#else /* !__FreeBSD__ */ dumpinfo.WFileName = WFileName; +#endif + callback = dump_packet_and_trunc; dumpinfo.pd = pd; dumpinfo.p = p; pcap_userdata = (u_char *)&dumpinfo; @@ -1530,6 +1585,15 @@ main(int argc, char **argv) (void)fflush(stderr); } #endif /* WIN32 */ + +#ifdef __FreeBSD__ + cansandbox = (nflag && VFileName == NULL && zflag == NULL); + if (cansandbox && cap_enter() < 0 && errno != ENOSYS) + error("unable to enter the capability mode"); + if (cap_sandboxed()) + fprintf(stderr, "capability mode sandbox enabled\n"); +#endif + do { status = pcap_loop(pd, cnt, callback, pcap_userdata); if (WFileName == NULL) { @@ -1569,6 +1633,12 @@ main(int argc, char **argv) pd = pcap_open_offline(RFileName, ebuf); if (pd == NULL) error("%s", ebuf); +#ifdef __FreeBSD__ + if (cap_rights_limit(fileno(pcap_file(pd)), + CAP_READ) < 0 && errno != ENOSYS) { + error("unable to limit pcap descriptor"); + } +#endif new_dlt = pcap_datalink(pd); if (WFileName && new_dlt != dlt) error("%s: new dlt does not match original", RFileName); @@ -1765,6 +1835,11 @@ dump_packet_and_trunc(u_char *user, cons /* If the time is greater than the specified window, rotate */ if (t - Gflag_time >= Gflag) { +#ifdef __FreeBSD__ + FILE *fp; + int fd; +#endif + /* Update the Gflag_time */ Gflag_time = t; /* Update Gflag_count */ @@ -1811,13 +1886,35 @@ dump_packet_and_trunc(u_char *user, cons capng_update(CAPNG_ADD, CAPNG_EFFECTIVE, CAP_DAC_OVERRIDE); capng_apply(CAPNG_EFFECTIVE); #endif /* HAVE_CAP_NG_H */ +#ifdef __FreeBSD__ + fd = openat(dump_info->dirfd, + dump_info->CurrentFileName, + O_CREAT | O_WRONLY | O_TRUNC, 0644); + if (fd < 0) { + error("unable to open file %s", + dump_info->CurrentFileName); + } + fp = fdopen(fd, "w"); + if (fp == NULL) { + error("unable to fdopen file %s", + dump_info->CurrentFileName); + } + dump_info->p = pcap_dump_fopen(dump_info->pd, fp); +#else /* !__FreeBSD__ */ dump_info->p = pcap_dump_open(dump_info->pd, dump_info->CurrentFileName); +#endif #ifdef HAVE_CAP_NG_H capng_update(CAPNG_DROP, CAPNG_EFFECTIVE, CAP_DAC_OVERRIDE); capng_apply(CAPNG_EFFECTIVE); #endif /* HAVE_CAP_NG_H */ if (dump_info->p == NULL) error("%s", pcap_geterr(pd)); +#ifdef __FreeBSD__ + if (cap_rights_limit(fileno(pcap_dump_file(dump_info->p)), + CAP_SEEK | CAP_WRITE) < 0 && errno != ENOSYS) { + error("unable to limit dump descriptor"); + } +#endif } } @@ -1827,6 +1924,11 @@ dump_packet_and_trunc(u_char *user, cons * file could put it over Cflag. */ if (Cflag != 0 && pcap_dump_ftell(dump_info->p) > Cflag) { +#ifdef __FreeBSD__ + FILE *fp; + int fd; +#endif + /* * Close the current file and open a new one. */ @@ -1849,9 +1951,30 @@ dump_packet_and_trunc(u_char *user, cons if (dump_info->CurrentFileName == NULL) error("dump_packet_and_trunc: malloc"); MakeFilename(dump_info->CurrentFileName, dump_info->WFileName, Cflag_count, WflagChars); +#ifdef __FreeBSD__ + fd = openat(dump_info->dirfd, dump_info->CurrentFileName, + O_CREAT | O_WRONLY | O_TRUNC, 0644); + if (fd < 0) { + error("unable to open file %s", + dump_info->CurrentFileName); + } + fp = fdopen(fd, "w"); + if (fp == NULL) { + error("unable to fdopen file %s", + dump_info->CurrentFileName); + } + dump_info->p = pcap_dump_fopen(dump_info->pd, fp); +#else /* !__FreeBSD__ */ dump_info->p = pcap_dump_open(dump_info->pd, dump_info->CurrentFileName); +#endif if (dump_info->p == NULL) error("%s", pcap_geterr(pd)); +#ifdef __FreeBSD__ + if (cap_rights_limit(fileno(pcap_dump_file(dump_info->p)), + CAP_SEEK | CAP_WRITE) < 0 && errno != ENOSYS) { + error("unable to limit dump descriptor"); + } +#endif } pcap_dump((u_char *)dump_info->p, h, sp); Modified: projects/bhyve_npt_pmap/contrib/tzdata/africa ============================================================================== --- projects/bhyve_npt_pmap/contrib/tzdata/africa Wed Aug 21 00:04:31 2013 (r254587) +++ projects/bhyve_npt_pmap/contrib/tzdata/africa Wed Aug 21 02:14:23 2013 (r254588) @@ -852,12 +852,18 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # announced that year's Ramadan daylight-saving transitions would be # 2012-07-20 and 2012-08-20; see # . -# + +# From Andrew Paprocki (2013-07-02): +# Morocco announced that the year's Ramadan daylight-savings +# transitions would be 2013-07-07 and 2013-08-10; see: +# http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10 + +# From Paul Eggert (2013-07-03): # To estimate what the Moroccan government will do in future years, -# transition dates for 2013 through 2021 were determined by running +# transition dates for 2014 through 2021 were determined by running # the following program under GNU Emacs 24.3: # -# (let ((islamic-year 1434)) +# (let ((islamic-year 1435)) # (while (< islamic-year 1444) # (let ((a # (calendar-gregorian-from-absolute @@ -910,8 +916,8 @@ Rule Morocco 2012 2019 - Apr lastSun 2: Rule Morocco 2012 max - Sep lastSun 3:00 0 - Rule Morocco 2012 only - Jul 20 3:00 0 - Rule Morocco 2012 only - Aug 20 2:00 1:00 S -Rule Morocco 2013 only - Jul 9 3:00 0 - -Rule Morocco 2013 only - Aug 8 2:00 1:00 S +Rule Morocco 2013 only - Jul 7 3:00 0 - +Rule Morocco 2013 only - Aug 10 2:00 1:00 S Rule Morocco 2014 only - Jun 29 3:00 0 - Rule Morocco 2014 only - Jul 29 2:00 1:00 S Rule Morocco 2015 only - Jun 18 3:00 0 - Modified: projects/bhyve_npt_pmap/contrib/tzdata/asia ============================================================================== --- projects/bhyve_npt_pmap/contrib/tzdata/asia Wed Aug 21 00:04:31 2013 (r254587) +++ projects/bhyve_npt_pmap/contrib/tzdata/asia Wed Aug 21 02:14:23 2013 (r254588) @@ -1212,39 +1212,21 @@ Rule Zion 2011 only - Oct 2 2:00 0 S Rule Zion 2012 only - Mar Fri>=26 2:00 1:00 D Rule Zion 2012 only - Sep 23 2:00 0 S -# From Ephraim Silverberg (2012-10-18): -# Yesterday, the Interior Ministry Committee, after more than a year -# past, approved sending the proposed June 2011 changes to the Time -# Decree Law back to the Knesset for second and third (final) votes -# before the upcoming elections on Jan. 22, 2013. Hence, although the -# changes are not yet law, they are expected to be so before February 2013. -# -# As of 2013, DST starts at 02:00 on the Friday before the last Sunday in March. -# DST ends at 02:00 on the first Sunday after October 1, unless it occurs on the -# second day of the Jewish Rosh Hashana holiday, in which case DST ends a day -# later (i.e. at 02:00 the first Monday after October 2). -# [Rosh Hashana holidays are factored in until 2100.] - -# From Ephraim Silverberg (2012-11-05): -# The Knesset passed today (in second and final readings) the amendment to the -# Time Decree Law making the changes ... law. +# From Ephraim Silverberg (2013-06-27): +# On June 23, 2013, the Israeli government approved changes to the +# Time Decree Law. The next day, the changes passed the First Reading +# in the Knesset. The law is expected to pass the Second and Third +# (final) Readings by the beginning of September 2013. +# +# As of 2013, DST starts at 02:00 on the Friday before the last Sunday +# in March. DST ends at 02:00 on the last Sunday of October. # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S Rule Zion 2013 max - Mar Fri>=23 2:00 1:00 D -Rule Zion 2013 2026 - Oct Sun>=2 2:00 0 S -Rule Zion 2027 only - Oct Mon>=3 2:00 0 S -Rule Zion 2028 max - Oct Sun>=2 2:00 0 S -# The following rules are commented out for now, as they break older -# versions of zic that support only signed 32-bit timestamps, i.e., -# through 2038-01-19 03:14:07 UTC. -#Rule Zion 2028 2053 - Oct Sun>=2 2:00 0 S -#Rule Zion 2054 only - Oct Mon>=3 2:00 0 S -#Rule Zion 2055 2080 - Oct Sun>=2 2:00 0 S -#Rule Zion 2081 only - Oct Mon>=3 2:00 0 S -#Rule Zion 2082 max - Oct Sun>=2 2:00 0 S +Rule Zion 2013 max - Oct lastSun 2:00 0 S # Zone NAME GMTOFF RULES FORMAT [UNTIL] -Zone Asia/Jerusalem 2:20:56 - LMT 1880 +Zone Asia/Jerusalem 2:20:54 - LMT 1880 2:20:40 - JMT 1918 # Jerusalem Mean Time? 2:00 Zion I%sT @@ -2547,8 +2529,8 @@ Rule Syria 2006 only - Sep 22 0:00 0 - Rule Syria 2007 only - Mar lastFri 0:00 1:00 S # From Jesper Norgard (2007-10-27): # The sister center ICARDA of my work CIMMYT is confirming that Syria DST will -# not take place 1.st November at 0:00 o'clock but 1.st November at 24:00 or -# rather Midnight between Thursday and Friday. This does make more sence than +# not take place 1st November at 0:00 o'clock but 1st November at 24:00 or +# rather Midnight between Thursday and Friday. This does make more sense than # having it between Wednesday and Thursday (two workdays in Syria) since the # weekend in Syria is not Saturday and Sunday, but Friday and Saturday. So now # it is implemented at midnight of the last workday before weekend... Modified: projects/bhyve_npt_pmap/contrib/tzdata/australasia ============================================================================== --- projects/bhyve_npt_pmap/contrib/tzdata/australasia Wed Aug 21 00:04:31 2013 (r254587) +++ projects/bhyve_npt_pmap/contrib/tzdata/australasia Wed Aug 21 02:14:23 2013 (r254588) @@ -230,10 +230,16 @@ Zone Australia/Lord_Howe 10:36:20 - LMT # - Macquarie Island will stay on UTC+11 for winter and therefore not # switch back from daylight savings time when other parts of Australia do # on 4 April. +# +# From Arthur David Olson (2013-05-23): +# The 1919 transition is overspecified below so pre-2013 zics +# will produce a binary file with an EST-type as the first 32-bit type; +# this is required for correct handling of times before 1916 by +# pre-2013 versions of localtime. Zone Antarctica/Macquarie 0 - zzz 1899 Nov 10:00 - EST 1916 Oct 1 2:00 10:00 1:00 EST 1917 Feb - 10:00 Aus EST 1919 Apr + 10:00 Aus EST 1919 Apr 1 0:00s 0 - zzz 1948 Mar 25 10:00 Aus EST 1967 10:00 AT EST 2010 Apr 4 3:00 @@ -1475,12 +1481,12 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 # From Paul Eggert (2000-01-08): # IATA SSIM (1999-09) says DST ends 0100 local time. Go with McDow. -# From the BBC World Service (1998-10-31 11:32 UTC): +# From the BBC World Service in +# http://news.bbc.co.uk/2/hi/asia-pacific/205226.stm (1998-10-31 16:03 UTC): # The Fijiian government says the main reasons for the time change is to -# improve productivity and reduce road accidents. But correspondents say it -# also hopes the move will boost Fiji's ability to compete with other pacific -# islands in the effort to attract tourists to witness the dawning of the new -# millenium. +# improve productivity and reduce road accidents.... [T]he move is also +# intended to boost Fiji's ability to attract tourists to witness the dawning +# of the new millennium. # http://www.fiji.gov.fj/press/2000_09/2000_09_13-05.shtml (2000-09-13) # reports that Fiji has discontinued DST. @@ -1625,7 +1631,7 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901 # Shanks & Pottenger say the transition was on 1968-10-01; go with Mundell. # From Eric Ulevik (1999-05-03): -# Tonga's director of tourism, who is also secretary of the National Millenium +# Tonga's director of tourism, who is also secretary of the National Millennium # Committee, has a plan to get Tonga back in front. # He has proposed a one-off move to tropical daylight saving for Tonga from # October to March, which has won approval in principle from the Tongan Modified: projects/bhyve_npt_pmap/contrib/tzdata/europe ============================================================================== --- projects/bhyve_npt_pmap/contrib/tzdata/europe Wed Aug 21 00:04:31 2013 (r254587) +++ projects/bhyve_npt_pmap/contrib/tzdata/europe Wed Aug 21 02:14:23 2013 (r254588) @@ -523,7 +523,7 @@ Rule C-Eur 1944 only - Oct 2 2:00s 0 - # It seems that Paris, Monaco, Rule France, Rule Belgium all agree on # 2:00 standard time, e.g. 3:00 local time. However there are no # countries that use C-Eur rules in September 1945, so the only items -# affected are apparently these ficticious zones that translates acronyms +# affected are apparently these fictitious zones that translate acronyms # CET and MET: # # Zone CET 1:00 C-Eur CE%sT @@ -2779,9 +2779,9 @@ Link Europe/Istanbul Asia/Istanbul # Ist # Ukraine # -# From Igor Karpov, who works for the Ukranian Ministry of Justice, +# From Igor Karpov, who works for the Ukrainian Ministry of Justice, # via Garrett Wollman (2003-01-27): -# BTW, I've found the official document on this matter. It's goverment +# BTW, I've found the official document on this matter. It's government # regulations number 509, May 13, 1996. In my poor translation it says: # "Time in Ukraine is set to second timezone (Kiev time). Each last Sunday # of March at 3am the time is changing to 4am and each last Sunday of @@ -2815,7 +2815,7 @@ Link Europe/Istanbul Asia/Istanbul # Ist # time this year after all. # # From Udo Schwedt (2011-10-18): -# As far as I understand, the recent change to the Ukranian time zone +# As far as I understand, the recent change to the Ukrainian time zone # (Europe/Kiev) to introduce permanent daylight saving time (similar # to Russia) was reverted today: # Modified: projects/bhyve_npt_pmap/contrib/tzdata/southamerica ============================================================================== --- projects/bhyve_npt_pmap/contrib/tzdata/southamerica Wed Aug 21 00:04:31 2013 (r254587) +++ projects/bhyve_npt_pmap/contrib/tzdata/southamerica Wed Aug 21 02:14:23 2013 (r254588) @@ -971,7 +971,7 @@ Rule Brazil 2007 only - Feb 25 0:00 0 - # adopted by the same states as before. Rule Brazil 2007 only - Oct Sun>=8 0:00 1:00 S # From Frederico A. C. Neves (2008-09-10): -# Acording to this decree +# According to this decree # # http://www.planalto.gov.br/ccivil_03/_Ato2007-2010/2008/Decreto/D6558.htm # @@ -1203,7 +1203,7 @@ Zone America/Rio_Branco -4:31:12 - LMT 1 # http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651 # # -# This is not yet reflected in the offical "cambio de hora" site, but +# This is not yet reflected in the official "cambio de hora" site, but # probably will be soon: # # http://www.horaoficial.cl/cambio.htm Modified: projects/bhyve_npt_pmap/contrib/tzdata/zone.tab ============================================================================== --- projects/bhyve_npt_pmap/contrib/tzdata/zone.tab Wed Aug 21 00:04:31 2013 (r254587) +++ projects/bhyve_npt_pmap/contrib/tzdata/zone.tab Wed Aug 21 02:14:23 2013 (r254588) @@ -1,18 +1,21 @@ -# 
+# TZ zone descriptions
+#
 # This file is in the public domain, so clarified as of
 # 2009-05-17 by Arthur David Olson.
 #
-# TZ zone descriptions
-#
-# From Paul Eggert (1996-08-05):
+# From Paul Eggert (2013-05-27):
 #
 # This file contains a table with the following columns:
 # 1.  ISO 3166 2-character country code.  See /usr/share/misc/iso3166.
+#     This identifies a country that overlaps the zone.  The country may
+#     overlap other zones and the zone may overlap other countries.
 # 2.  Latitude and longitude of the zone's principal location
 #     in ISO 6709 sign-degrees-minutes-seconds format,
 #     either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS,
 #     first latitude (+ is north), then longitude (+ is east).
+#     This location need not lie within the column-1 country.
 # 3.  Zone name used in value of TZ environment variable.
+#     Please see the 'Theory' file for how zone names are chosen.
 # 4.  Comments; present if and only if the country has multiple rows.
 #
 # Columns are separated by a single tab.
@@ -22,6 +25,10 @@
 #
 # Lines beginning with `#' are comments.
 #
+# This table is intended as an aid for users, to help them select time
+# zone data appropriate for their practical needs.  It is not intended
+# to take or endorse any position on legal or territorial claims.
+#
 #country-
 #code	coordinates	TZ			comments
 AD	+4230+00131	Europe/Andorra
@@ -216,7 +223,7 @@ ID	-0002+10920	Asia/Pontianak	west & cen
 ID	-0507+11924	Asia/Makassar	east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor
 ID	-0232+14042	Asia/Jayapura	west New Guinea (Irian Jaya) & Malukus (Moluccas)
 IE	+5320-00615	Europe/Dublin
-IL	+3146+03514	Asia/Jerusalem
+IL	+314650+0351326	Asia/Jerusalem
 IM	+5409-00428	Europe/Isle_of_Man
 IN	+2232+08822	Asia/Kolkata
 IO	-0720+07225	Indian/Chagos

Modified: projects/bhyve_npt_pmap/contrib/wpa/COPYING
==============================================================================
--- projects/bhyve_npt_pmap/contrib/wpa/COPYING	Wed Aug 21 00:04:31 2013	(r254587)
+++ projects/bhyve_npt_pmap/contrib/wpa/COPYING	Wed Aug 21 02:14:23 2013	(r254588)
@@ -1,340 +1,22 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+wpa_supplicant and hostapd
+--------------------------
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+Copyright (c) 2002-2012, Jouni Malinen  and contributors
+All Rights Reserved.
 
-			    Preamble
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
+See the README file for the current license terms.
 
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)

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

From owner-svn-src-projects@FreeBSD.ORG  Wed Aug 21 06:32:36 2013
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 9223C20E;
 Wed, 21 Aug 2013 06:32:36 +0000 (UTC)
 (envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7CD662A64;
 Wed, 21 Aug 2013 06:32:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7L6Waro021332;
 Wed, 21 Aug 2013 06:32:36 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7L6WXHA021242;
 Wed, 21 Aug 2013 06:32:33 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201308210632.r7L6WXHA021242@svn.freebsd.org>
From: Neel Natu 
Date: Wed, 21 Aug 2013 06:32:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r254594 - in projects/bhyve_npt_pmap: . bin/sh
 cddl/contrib/opensolaris/cmd/zpool contrib/binutils/binutils
 contrib/binutils/include/elf contrib/libc++/include contrib/libc++/src
 contri...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
 tree" 
List-Unsubscribe: , 
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
 
X-List-Received-Date: Wed, 21 Aug 2013 06:32:36 -0000

Author: neel
Date: Wed Aug 21 06:32:32 2013
New Revision: 254594
URL: http://svnweb.freebsd.org/changeset/base/254594

Log:
  IFC @r253582

Added:
  projects/bhyve_npt_pmap/sbin/mount/mount.conf.8
     - copied unchanged from r253582, head/sbin/mount/mount.conf.8
  projects/bhyve_npt_pmap/share/man/man9/vmem.9
     - copied unchanged from r253582, head/share/man/man9/vmem.9
  projects/bhyve_npt_pmap/share/monetdef/ca_ES.UTF-8.src
     - copied unchanged from r253582, head/share/monetdef/ca_ES.UTF-8.src
  projects/bhyve_npt_pmap/share/monetdef/de_AT.UTF-8.src
     - copied unchanged from r253582, head/share/monetdef/de_AT.UTF-8.src
  projects/bhyve_npt_pmap/share/monetdef/de_DE.UTF-8.src
     - copied unchanged from r253582, head/share/monetdef/de_DE.UTF-8.src
  projects/bhyve_npt_pmap/share/monetdef/el_GR.UTF-8.src
     - copied unchanged from r253582, head/share/monetdef/el_GR.UTF-8.src
  projects/bhyve_npt_pmap/share/monetdef/es_ES.UTF-8.src
     - copied unchanged from r253582, head/share/monetdef/es_ES.UTF-8.src
  projects/bhyve_npt_pmap/share/monetdef/fi_FI.UTF-8.src
     - copied unchanged from r253582, head/share/monetdef/fi_FI.UTF-8.src
  projects/bhyve_npt_pmap/share/monetdef/fr_BE.UTF-8.src
     - copied unchanged from r253582, head/share/monetdef/fr_BE.UTF-8.src
  projects/bhyve_npt_pmap/share/monetdef/fr_FR.UTF-8.src
     - copied unchanged from r253582, head/share/monetdef/fr_FR.UTF-8.src
  projects/bhyve_npt_pmap/share/monetdef/it_IT.UTF-8.src
     - copied unchanged from r253582, head/share/monetdef/it_IT.UTF-8.src
  projects/bhyve_npt_pmap/share/monetdef/nl_BE.UTF-8.src
     - copied unchanged from r253582, head/share/monetdef/nl_BE.UTF-8.src
  projects/bhyve_npt_pmap/share/monetdef/nl_NL.UTF-8.src
     - copied unchanged from r253582, head/share/monetdef/nl_NL.UTF-8.src
  projects/bhyve_npt_pmap/sys/arm/broadcom/bcm2835/std.bcm2835
     - copied unchanged from r253582, head/sys/arm/broadcom/bcm2835/std.bcm2835
  projects/bhyve_npt_pmap/sys/arm/broadcom/bcm2835/std.rpi
     - copied unchanged from r253582, head/sys/arm/broadcom/bcm2835/std.rpi
  projects/bhyve_npt_pmap/sys/crypto/siphash/
     - copied from r253582, head/sys/crypto/siphash/
  projects/bhyve_npt_pmap/sys/dev/etherswitch/arswitch/arswitch_vlans.c
     - copied unchanged from r253582, head/sys/dev/etherswitch/arswitch/arswitch_vlans.c
  projects/bhyve_npt_pmap/sys/dev/etherswitch/arswitch/arswitch_vlans.h
     - copied unchanged from r253582, head/sys/dev/etherswitch/arswitch/arswitch_vlans.h
  projects/bhyve_npt_pmap/sys/dev/nvme/nvme_util.c
     - copied unchanged from r253582, head/sys/dev/nvme/nvme_util.c
  projects/bhyve_npt_pmap/sys/dev/usb/gadget/
     - copied from r253582, head/sys/dev/usb/gadget/
  projects/bhyve_npt_pmap/sys/mips/atheros/ar934x_chip.c
     - copied unchanged from r253582, head/sys/mips/atheros/ar934x_chip.c
  projects/bhyve_npt_pmap/sys/mips/atheros/ar934x_chip.h
     - copied unchanged from r253582, head/sys/mips/atheros/ar934x_chip.h
  projects/bhyve_npt_pmap/sys/mips/conf/AR934X_BASE
     - copied unchanged from r253582, head/sys/mips/conf/AR934X_BASE
  projects/bhyve_npt_pmap/sys/mips/conf/AR934X_BASE.hints
     - copied unchanged from r253582, head/sys/mips/conf/AR934X_BASE.hints
  projects/bhyve_npt_pmap/sys/mips/conf/DB120
     - copied unchanged from r253582, head/sys/mips/conf/DB120
  projects/bhyve_npt_pmap/sys/mips/conf/DB120.hints
     - copied unchanged from r253582, head/sys/mips/conf/DB120.hints
  projects/bhyve_npt_pmap/sys/modules/usb/g_audio/
     - copied from r253582, head/sys/modules/usb/g_audio/
  projects/bhyve_npt_pmap/sys/modules/usb/g_keyboard/
     - copied from r253582, head/sys/modules/usb/g_keyboard/
  projects/bhyve_npt_pmap/sys/modules/usb/g_modem/
     - copied from r253582, head/sys/modules/usb/g_modem/
  projects/bhyve_npt_pmap/sys/modules/usb/g_mouse/
     - copied from r253582, head/sys/modules/usb/g_mouse/
  projects/bhyve_npt_pmap/tools/build/options/WITHOUT_ARM_EABI
     - copied unchanged from r253582, head/tools/build/options/WITHOUT_ARM_EABI
  projects/bhyve_npt_pmap/tools/build/options/WITH_PKGTOOLS
     - copied unchanged from r253582, head/tools/build/options/WITH_PKGTOOLS
  projects/bhyve_npt_pmap/tools/regression/bin/sh/execution/int-cmd1.0
     - copied unchanged from r253582, head/tools/regression/bin/sh/execution/int-cmd1.0
  projects/bhyve_npt_pmap/usr.sbin/bhyve/rtc.h
     - copied unchanged from r253582, head/usr.sbin/bhyve/rtc.h
  projects/bhyve_npt_pmap/usr.sbin/bhyve/virtio.c
     - copied unchanged from r253582, head/usr.sbin/bhyve/virtio.c
Deleted:
  projects/bhyve_npt_pmap/contrib/openbsm/m4/lt~obsolete.m4
  projects/bhyve_npt_pmap/tools/build/options/WITHOUT_PKGTOOLS
  projects/bhyve_npt_pmap/tools/build/options/WITH_ARM_EABI
  projects/bhyve_npt_pmap/usr.bin/systat/mbufs.c
Modified:
  projects/bhyve_npt_pmap/Makefile.inc1
  projects/bhyve_npt_pmap/ObsoleteFiles.inc
  projects/bhyve_npt_pmap/UPDATING
  projects/bhyve_npt_pmap/bin/sh/main.c
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  projects/bhyve_npt_pmap/contrib/binutils/binutils/readelf.c
  projects/bhyve_npt_pmap/contrib/binutils/include/elf/common.h
  projects/bhyve_npt_pmap/contrib/libc++/include/__bit_reference
  projects/bhyve_npt_pmap/contrib/libc++/include/__config
  projects/bhyve_npt_pmap/contrib/libc++/include/__functional_base
  projects/bhyve_npt_pmap/contrib/libc++/include/__hash_table
  projects/bhyve_npt_pmap/contrib/libc++/include/__locale
  projects/bhyve_npt_pmap/contrib/libc++/include/__split_buffer
  projects/bhyve_npt_pmap/contrib/libc++/include/__std_stream
  projects/bhyve_npt_pmap/contrib/libc++/include/__tree
  projects/bhyve_npt_pmap/contrib/libc++/include/algorithm
  projects/bhyve_npt_pmap/contrib/libc++/include/atomic
  projects/bhyve_npt_pmap/contrib/libc++/include/deque
  projects/bhyve_npt_pmap/contrib/libc++/include/forward_list
  projects/bhyve_npt_pmap/contrib/libc++/include/functional
  projects/bhyve_npt_pmap/contrib/libc++/include/future
  projects/bhyve_npt_pmap/contrib/libc++/include/istream
  projects/bhyve_npt_pmap/contrib/libc++/include/iterator
  projects/bhyve_npt_pmap/contrib/libc++/include/list
  projects/bhyve_npt_pmap/contrib/libc++/include/locale
  projects/bhyve_npt_pmap/contrib/libc++/include/map
  projects/bhyve_npt_pmap/contrib/libc++/include/memory
  projects/bhyve_npt_pmap/contrib/libc++/include/random
  projects/bhyve_npt_pmap/contrib/libc++/include/regex
  projects/bhyve_npt_pmap/contrib/libc++/include/string
  projects/bhyve_npt_pmap/contrib/libc++/include/type_traits
  projects/bhyve_npt_pmap/contrib/libc++/include/unordered_map
  projects/bhyve_npt_pmap/contrib/libc++/include/utility
  projects/bhyve_npt_pmap/contrib/libc++/include/vector
  projects/bhyve_npt_pmap/contrib/libc++/src/debug.cpp
  projects/bhyve_npt_pmap/contrib/libc++/src/hash.cpp
  projects/bhyve_npt_pmap/contrib/libc++/src/iostream.cpp
  projects/bhyve_npt_pmap/contrib/libc++/src/locale.cpp
  projects/bhyve_npt_pmap/contrib/libc++/src/stdexcept.cpp
  projects/bhyve_npt_pmap/contrib/libc++/src/string.cpp
  projects/bhyve_npt_pmap/contrib/libc++/src/thread.cpp
  projects/bhyve_npt_pmap/contrib/libcxxrt/atomic.h
  projects/bhyve_npt_pmap/contrib/libcxxrt/auxhelper.cc
  projects/bhyve_npt_pmap/contrib/libcxxrt/cxxabi.h
  projects/bhyve_npt_pmap/contrib/libcxxrt/dwarf_eh.h
  projects/bhyve_npt_pmap/contrib/libcxxrt/exception.cc
  projects/bhyve_npt_pmap/contrib/libcxxrt/guard.cc
  projects/bhyve_npt_pmap/contrib/libcxxrt/memory.cc
  projects/bhyve_npt_pmap/contrib/libstdc++/include/c_std/std_cmath.h
  projects/bhyve_npt_pmap/etc/network.subr
  projects/bhyve_npt_pmap/etc/rc.d/pfsync
  projects/bhyve_npt_pmap/lib/libc/arm/gen/sigsetjmp.S
  projects/bhyve_npt_pmap/lib/libc/gen/sysctl.3
  projects/bhyve_npt_pmap/lib/libc/gen/wordexp.c
  projects/bhyve_npt_pmap/lib/libc/sparc64/gen/makecontext.c
  projects/bhyve_npt_pmap/lib/libc/sparc64/gen/signalcontext.c
  projects/bhyve_npt_pmap/lib/libc/stdio/fwrite.c
  projects/bhyve_npt_pmap/lib/libc/stdlib/getenv.c
  projects/bhyve_npt_pmap/lib/libc/sys/ptrace.2
  projects/bhyve_npt_pmap/lib/libfetch/http.c
  projects/bhyve_npt_pmap/lib/libgeom/geom_xml2tree.c
  projects/bhyve_npt_pmap/lib/libgeom/libgeom.h
  projects/bhyve_npt_pmap/lib/libkvm/Makefile
  projects/bhyve_npt_pmap/lib/libkvm/kvm.h
  projects/bhyve_npt_pmap/lib/libthread_db/arch/sparc64/libpthread_md.c
  projects/bhyve_npt_pmap/lib/libusb/Makefile
  projects/bhyve_npt_pmap/lib/libusb/libusb20.c
  projects/bhyve_npt_pmap/lib/libusb/libusb20_ugen20.c
  projects/bhyve_npt_pmap/lib/libusb/libusb_global_linux.h
  projects/bhyve_npt_pmap/lib/msun/src/math.h
  projects/bhyve_npt_pmap/release/Makefile
  projects/bhyve_npt_pmap/sbin/devfs/devfs.8
  projects/bhyve_npt_pmap/sbin/etherswitchcfg/etherswitchcfg.c
  projects/bhyve_npt_pmap/sbin/mount/Makefile   (contents, props changed)
  projects/bhyve_npt_pmap/sbin/mount/mount.8
  projects/bhyve_npt_pmap/sbin/mount/mount.c
  projects/bhyve_npt_pmap/sbin/nvmecontrol/Makefile
  projects/bhyve_npt_pmap/sbin/nvmecontrol/devlist.c
  projects/bhyve_npt_pmap/sbin/nvmecontrol/firmware.c
  projects/bhyve_npt_pmap/sbin/nvmecontrol/identify.c
  projects/bhyve_npt_pmap/sbin/nvmecontrol/nvmecontrol.c
  projects/bhyve_npt_pmap/sbin/recoverdisk/recoverdisk.1
  projects/bhyve_npt_pmap/sbin/route/Makefile
  projects/bhyve_npt_pmap/sbin/route/route.c
  projects/bhyve_npt_pmap/share/examples/kld/syscall/test/call.c
  projects/bhyve_npt_pmap/share/man/man4/ath_hal.4
  projects/bhyve_npt_pmap/share/man/man4/mfi.4
  projects/bhyve_npt_pmap/share/man/man4/nvd.4
  projects/bhyve_npt_pmap/share/man/man4/nvme.4
  projects/bhyve_npt_pmap/share/man/man5/fstab.5
  projects/bhyve_npt_pmap/share/man/man5/rc.conf.5
  projects/bhyve_npt_pmap/share/man/man5/src.conf.5
  projects/bhyve_npt_pmap/share/man/man9/Makefile
  projects/bhyve_npt_pmap/share/man/man9/bus_dma.9
  projects/bhyve_npt_pmap/share/misc/committers-ports.dot
  projects/bhyve_npt_pmap/share/mk/bsd.own.mk
  projects/bhyve_npt_pmap/share/monetdef/Makefile
  projects/bhyve_npt_pmap/sys/amd64/amd64/machdep.c
  projects/bhyve_npt_pmap/sys/amd64/amd64/pmap.c
  projects/bhyve_npt_pmap/sys/arm/arm/db_trace.c
  projects/bhyve_npt_pmap/sys/arm/arm/trap.c
  projects/bhyve_npt_pmap/sys/arm/arm/vfp.c
  projects/bhyve_npt_pmap/sys/arm/arm/vm_machdep.c
  projects/bhyve_npt_pmap/sys/arm/conf/RPI-B
  projects/bhyve_npt_pmap/sys/arm/include/atomic.h
  projects/bhyve_npt_pmap/sys/boot/ficl/loader.c
  projects/bhyve_npt_pmap/sys/cam/cam_ccb.h
  projects/bhyve_npt_pmap/sys/cam/cam_periph.c
  projects/bhyve_npt_pmap/sys/cam/cam_xpt.c
  projects/bhyve_npt_pmap/sys/cam/scsi/scsi_all.c
  projects/bhyve_npt_pmap/sys/cam/scsi/scsi_all.h
  projects/bhyve_npt_pmap/sys/cam/scsi/scsi_ch.c
  projects/bhyve_npt_pmap/sys/cam/scsi/scsi_da.c
  projects/bhyve_npt_pmap/sys/cam/scsi/scsi_xpt.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32.h
  projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_misc.c
  projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_proto.h
  projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_signal.h
  projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_syscall.h
  projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_syscalls.c
  projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_sysent.c
  projects/bhyve_npt_pmap/sys/compat/freebsd32/freebsd32_systrace_args.c
  projects/bhyve_npt_pmap/sys/compat/freebsd32/syscalls.master
  projects/bhyve_npt_pmap/sys/compat/linux/linux_ioctl.c
  projects/bhyve_npt_pmap/sys/compat/linux/linux_ioctl.h
  projects/bhyve_npt_pmap/sys/conf/Makefile.arm
  projects/bhyve_npt_pmap/sys/conf/files
  projects/bhyve_npt_pmap/sys/conf/files.amd64
  projects/bhyve_npt_pmap/sys/conf/files.i386
  projects/bhyve_npt_pmap/sys/contrib/v4l/videodev2.h
  projects/bhyve_npt_pmap/sys/dev/acpica/acpi_resource.c
  projects/bhyve_npt_pmap/sys/dev/ae/if_ae.c
  projects/bhyve_npt_pmap/sys/dev/ae/if_aereg.h
  projects/bhyve_npt_pmap/sys/dev/ahci/ahci.c
  projects/bhyve_npt_pmap/sys/dev/ata/ata-pci.h
  projects/bhyve_npt_pmap/sys/dev/ata/chipsets/ata-intel.c
  projects/bhyve_npt_pmap/sys/dev/bge/if_bge.c
  projects/bhyve_npt_pmap/sys/dev/bge/if_bgereg.h
  projects/bhyve_npt_pmap/sys/dev/cxgbe/firmware/t5fw_cfg.txt
  projects/bhyve_npt_pmap/sys/dev/cxgbe/t4_main.c
  projects/bhyve_npt_pmap/sys/dev/drm2/i915/i915_gem.c
  projects/bhyve_npt_pmap/sys/dev/e1000/if_em.c
  projects/bhyve_npt_pmap/sys/dev/e1000/if_igb.c
  projects/bhyve_npt_pmap/sys/dev/e1000/if_lem.c
  projects/bhyve_npt_pmap/sys/dev/etherswitch/arswitch/arswitch.c
  projects/bhyve_npt_pmap/sys/dev/etherswitch/arswitch/arswitch_7240.c
  projects/bhyve_npt_pmap/sys/dev/etherswitch/arswitch/arswitch_8216.c
  projects/bhyve_npt_pmap/sys/dev/etherswitch/arswitch/arswitch_8226.c
  projects/bhyve_npt_pmap/sys/dev/etherswitch/arswitch/arswitch_8316.c
  projects/bhyve_npt_pmap/sys/dev/etherswitch/arswitch/arswitch_phy.c
  projects/bhyve_npt_pmap/sys/dev/etherswitch/arswitch/arswitch_reg.c
  projects/bhyve_npt_pmap/sys/dev/etherswitch/arswitch/arswitch_reg.h
  projects/bhyve_npt_pmap/sys/dev/etherswitch/arswitch/arswitchreg.h
  projects/bhyve_npt_pmap/sys/dev/etherswitch/arswitch/arswitchvar.h
  projects/bhyve_npt_pmap/sys/dev/etherswitch/etherswitch.h
  projects/bhyve_npt_pmap/sys/dev/etherswitch/ip17x/ip175c.c
  projects/bhyve_npt_pmap/sys/dev/etherswitch/ip17x/ip175d.c
  projects/bhyve_npt_pmap/sys/dev/etherswitch/ip17x/ip17x_vlans.c
  projects/bhyve_npt_pmap/sys/dev/etherswitch/rtl8366/rtl8366rb.c
  projects/bhyve_npt_pmap/sys/dev/hptnr/hptnr_osm_bsd.c
  projects/bhyve_npt_pmap/sys/dev/ichsmb/ichsmb_pci.c
  projects/bhyve_npt_pmap/sys/dev/ichwd/ichwd.c
  projects/bhyve_npt_pmap/sys/dev/ichwd/ichwd.h
  projects/bhyve_npt_pmap/sys/dev/isp/isp.c
  projects/bhyve_npt_pmap/sys/dev/isp/ispreg.h
  projects/bhyve_npt_pmap/sys/dev/ixgbe/ixgbe.c
  projects/bhyve_npt_pmap/sys/dev/ixgbe/ixv.c
  projects/bhyve_npt_pmap/sys/dev/mii/brgphy.c
  projects/bhyve_npt_pmap/sys/dev/mii/miidevs
  projects/bhyve_npt_pmap/sys/dev/mps/mps.c
  projects/bhyve_npt_pmap/sys/dev/mps/mps_config.c
  projects/bhyve_npt_pmap/sys/dev/mps/mps_mapping.c
  projects/bhyve_npt_pmap/sys/dev/mps/mps_pci.c
  projects/bhyve_npt_pmap/sys/dev/mps/mps_sas.c
  projects/bhyve_npt_pmap/sys/dev/mps/mps_sas.h
  projects/bhyve_npt_pmap/sys/dev/mps/mps_sas_lsi.c
  projects/bhyve_npt_pmap/sys/dev/mps/mps_table.c
  projects/bhyve_npt_pmap/sys/dev/mps/mps_user.c
  projects/bhyve_npt_pmap/sys/dev/mps/mpsvar.h
  projects/bhyve_npt_pmap/sys/dev/nvd/nvd.c
  projects/bhyve_npt_pmap/sys/dev/nvme/nvme.c
  projects/bhyve_npt_pmap/sys/dev/nvme/nvme.h
  projects/bhyve_npt_pmap/sys/dev/nvme/nvme_ctrlr.c
  projects/bhyve_npt_pmap/sys/dev/nvme/nvme_ns.c
  projects/bhyve_npt_pmap/sys/dev/nvme/nvme_ns_cmd.c
  projects/bhyve_npt_pmap/sys/dev/pci/pci.c
  projects/bhyve_npt_pmap/sys/dev/pci/pci_pci.c
  projects/bhyve_npt_pmap/sys/dev/pci/pci_private.h
  projects/bhyve_npt_pmap/sys/dev/pci/pcib_private.h
  projects/bhyve_npt_pmap/sys/dev/syscons/syscons.c
  projects/bhyve_npt_pmap/sys/dev/uart/uart_core.c
  projects/bhyve_npt_pmap/sys/dev/usb/controller/xhci.c
  projects/bhyve_npt_pmap/sys/dev/usb/controller/xhci_pci.c
  projects/bhyve_npt_pmap/sys/dev/usb/input/ukbd.c
  projects/bhyve_npt_pmap/sys/dev/usb/usb_pf.c
  projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_rum.c
  projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_uath.c
  projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_upgt.c
  projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_ural.c
  projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_urtw.c
  projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_urtwn.c
  projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_zyd.c
  projects/bhyve_npt_pmap/sys/fs/ext2fs/ext2_vnops.c
  projects/bhyve_npt_pmap/sys/fs/fuse/fuse_kernel.h
  projects/bhyve_npt_pmap/sys/fs/nfs/nfs_commonsubs.c
  projects/bhyve_npt_pmap/sys/fs/tmpfs/tmpfs_vfsops.c
  projects/bhyve_npt_pmap/sys/geom/journal/g_journal.c
  projects/bhyve_npt_pmap/sys/i386/i386/pmap.c
  projects/bhyve_npt_pmap/sys/i386/i386/support.s
  projects/bhyve_npt_pmap/sys/i386/i386/symbols.raw
  projects/bhyve_npt_pmap/sys/i386/i386/uio_machdep.c
  projects/bhyve_npt_pmap/sys/i386/i386/vm_machdep.c
  projects/bhyve_npt_pmap/sys/ia64/ia64/mca.c
  projects/bhyve_npt_pmap/sys/ia64/ia64/pmap.c
  projects/bhyve_npt_pmap/sys/ia64/pci/pci_cfgreg.c
  projects/bhyve_npt_pmap/sys/kern/kern_exit.c
  projects/bhyve_npt_pmap/sys/kern/kern_mbuf.c
  projects/bhyve_npt_pmap/sys/kern/kern_sig.c
  projects/bhyve_npt_pmap/sys/kern/kern_time.c
  projects/bhyve_npt_pmap/sys/kern/subr_bus.c
  projects/bhyve_npt_pmap/sys/kern/subr_counter.c
  projects/bhyve_npt_pmap/sys/kern/sysv_shm.c
  projects/bhyve_npt_pmap/sys/kern/uipc_mbuf.c
  projects/bhyve_npt_pmap/sys/kern/uipc_mqueue.c
  projects/bhyve_npt_pmap/sys/kern/uipc_syscalls.c
  projects/bhyve_npt_pmap/sys/kern/vfs_aio.c
  projects/bhyve_npt_pmap/sys/kern/vfs_bio.c
  projects/bhyve_npt_pmap/sys/kern/vfs_mount.c
  projects/bhyve_npt_pmap/sys/kern/vfs_subr.c
  projects/bhyve_npt_pmap/sys/mips/atheros/ar71xx_chip.c
  projects/bhyve_npt_pmap/sys/mips/atheros/ar71xx_cpudef.h
  projects/bhyve_npt_pmap/sys/mips/atheros/ar71xx_gpio.c
  projects/bhyve_npt_pmap/sys/mips/atheros/ar71xx_setup.c
  projects/bhyve_npt_pmap/sys/mips/atheros/ar724x_chip.c
  projects/bhyve_npt_pmap/sys/mips/atheros/ar91xx_chip.c
  projects/bhyve_npt_pmap/sys/mips/atheros/ar933x_chip.c
  projects/bhyve_npt_pmap/sys/mips/atheros/files.ar71xx
  projects/bhyve_npt_pmap/sys/mips/atheros/uart_bus_ar71xx.c
  projects/bhyve_npt_pmap/sys/mips/atheros/uart_bus_ar933x.c
  projects/bhyve_npt_pmap/sys/mips/atheros/uart_cpu_ar71xx.c
  projects/bhyve_npt_pmap/sys/mips/atheros/uart_cpu_ar933x.c
  projects/bhyve_npt_pmap/sys/mips/cavium/std.octeon1
  projects/bhyve_npt_pmap/sys/mips/mips/uio_machdep.c
  projects/bhyve_npt_pmap/sys/mips/mips/vm_machdep.c
  projects/bhyve_npt_pmap/sys/modules/Makefile
  projects/bhyve_npt_pmap/sys/modules/em/Makefile
  projects/bhyve_npt_pmap/sys/modules/igb/Makefile
  projects/bhyve_npt_pmap/sys/modules/nvme/Makefile
  projects/bhyve_npt_pmap/sys/modules/usb/Makefile
  projects/bhyve_npt_pmap/sys/net/ieee8023ad_lacp.c
  projects/bhyve_npt_pmap/sys/net/if.c
  projects/bhyve_npt_pmap/sys/net/if_gif.c
  projects/bhyve_npt_pmap/sys/net/if_lagg.c
  projects/bhyve_npt_pmap/sys/net/if_lagg.h
  projects/bhyve_npt_pmap/sys/net/rtsock.c
  projects/bhyve_npt_pmap/sys/netgraph/bluetooth/socket/ng_btsocket.c
  projects/bhyve_npt_pmap/sys/netgraph/ng_base.c
  projects/bhyve_npt_pmap/sys/netgraph/ng_pppoe.c
  projects/bhyve_npt_pmap/sys/netgraph/ng_pppoe.h
  projects/bhyve_npt_pmap/sys/netinet/in_pcb.c
  projects/bhyve_npt_pmap/sys/netinet/sctp_asconf.c
  projects/bhyve_npt_pmap/sys/netinet/sctp_input.c
  projects/bhyve_npt_pmap/sys/netinet/sctp_output.c
  projects/bhyve_npt_pmap/sys/netinet/tcp_input.c
  projects/bhyve_npt_pmap/sys/netinet/tcp_syncache.c
  projects/bhyve_npt_pmap/sys/netinet/tcp_syncache.h
  projects/bhyve_npt_pmap/sys/netinet/udp_usrreq.c
  projects/bhyve_npt_pmap/sys/netinet6/in6_pcb.c
  projects/bhyve_npt_pmap/sys/netinet6/ip6_forward.c
  projects/bhyve_npt_pmap/sys/netinet6/raw_ip6.c
  projects/bhyve_npt_pmap/sys/netinet6/udp6_usrreq.c
  projects/bhyve_npt_pmap/sys/netipsec/ipsec.h
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/main.c
  projects/bhyve_npt_pmap/sys/ofed/include/linux/sysfs.h
  projects/bhyve_npt_pmap/sys/powerpc/aim/mmu_oea64.c
  projects/bhyve_npt_pmap/sys/powerpc/aim/vm_machdep.c
  projects/bhyve_npt_pmap/sys/powerpc/booke/vm_machdep.c
  projects/bhyve_npt_pmap/sys/powerpc/powerpc/uio_machdep.c
  projects/bhyve_npt_pmap/sys/sparc64/include/ucontext.h
  projects/bhyve_npt_pmap/sys/sparc64/sparc64/machdep.c
  projects/bhyve_npt_pmap/sys/sparc64/sparc64/uio_machdep.c
  projects/bhyve_npt_pmap/sys/sparc64/sparc64/vm_machdep.c
  projects/bhyve_npt_pmap/sys/sys/eventhandler.h
  projects/bhyve_npt_pmap/sys/sys/mbuf.h
  projects/bhyve_npt_pmap/sys/sys/param.h
  projects/bhyve_npt_pmap/sys/sys/sf_buf.h
  projects/bhyve_npt_pmap/sys/sys/syscallsubr.h
  projects/bhyve_npt_pmap/sys/ufs/ffs/ffs_alloc.c
  projects/bhyve_npt_pmap/sys/ufs/ffs/ffs_snapshot.c
  projects/bhyve_npt_pmap/sys/ufs/ufs/inode.h
  projects/bhyve_npt_pmap/sys/vm/swap_pager.c
  projects/bhyve_npt_pmap/sys/vm/uma_core.c
  projects/bhyve_npt_pmap/sys/vm/vm_fault.c
  projects/bhyve_npt_pmap/sys/vm/vm_map.c
  projects/bhyve_npt_pmap/sys/vm/vm_map.h
  projects/bhyve_npt_pmap/sys/vm/vm_mmap.c
  projects/bhyve_npt_pmap/sys/vm/vm_object.c
  projects/bhyve_npt_pmap/sys/vm/vm_object.h
  projects/bhyve_npt_pmap/sys/vm/vm_page.c
  projects/bhyve_npt_pmap/tools/build/mk/OptionalObsoleteFiles.inc
  projects/bhyve_npt_pmap/tools/build/options/makeman
  projects/bhyve_npt_pmap/tools/regression/aio/aiop/aiop.c
  projects/bhyve_npt_pmap/tools/regression/aio/aiotest/aiotest.c
  projects/bhyve_npt_pmap/tools/regression/lib/libc/gen/test-fpclassify.c
  projects/bhyve_npt_pmap/tools/regression/lib/libc/gen/test-ftw.c
  projects/bhyve_npt_pmap/tools/regression/lib/libc/gen/test-wordexp.c
  projects/bhyve_npt_pmap/tools/regression/priv/Makefile
  projects/bhyve_npt_pmap/tools/regression/pthread/cv_cancel1/cv_cancel1.c
  projects/bhyve_npt_pmap/tools/regression/sbin/dhclient/Makefile
  projects/bhyve_npt_pmap/usr.bin/dtc/fdt.cc
  projects/bhyve_npt_pmap/usr.bin/fetch/fetch.1
  projects/bhyve_npt_pmap/usr.bin/kdump/kdump.c
  projects/bhyve_npt_pmap/usr.bin/netstat/ipsec.c
  projects/bhyve_npt_pmap/usr.bin/netstat/main.c
  projects/bhyve_npt_pmap/usr.bin/netstat/mbuf.c
  projects/bhyve_npt_pmap/usr.bin/netstat/netstat.1
  projects/bhyve_npt_pmap/usr.bin/netstat/netstat.h
  projects/bhyve_npt_pmap/usr.bin/netstat/route.c
  projects/bhyve_npt_pmap/usr.bin/systat/Makefile
  projects/bhyve_npt_pmap/usr.bin/systat/cmdtab.c
  projects/bhyve_npt_pmap/usr.bin/systat/extern.h
  projects/bhyve_npt_pmap/usr.bin/systat/systat.1
  projects/bhyve_npt_pmap/usr.bin/uniq/uniq.c
  projects/bhyve_npt_pmap/usr.sbin/bhyve/Makefile
  projects/bhyve_npt_pmap/usr.sbin/bhyve/bhyverun.c
  projects/bhyve_npt_pmap/usr.sbin/bhyve/pci_virtio_block.c
  projects/bhyve_npt_pmap/usr.sbin/bhyve/pci_virtio_net.c
  projects/bhyve_npt_pmap/usr.sbin/bhyve/rtc.c
  projects/bhyve_npt_pmap/usr.sbin/bhyve/virtio.h
  projects/bhyve_npt_pmap/usr.sbin/bsdconfig/include/messages.subr
  projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/common.subr
  projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/cdrom.subr
  projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/common.subr
  projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/directory.subr
  projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/dos.subr
  projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/floppy.subr
  projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/ftp.subr
  projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/http.subr
  projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/httpproxy.subr
  projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/nfs.subr
  projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/ufs.subr
  projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/media/usb.subr
  projects/bhyve_npt_pmap/usr.sbin/bsdconfig/share/packages/packages.subr
  projects/bhyve_npt_pmap/usr.sbin/bsdinstall/scripts/mirrorselect
  projects/bhyve_npt_pmap/usr.sbin/nvram/nvram.c
  projects/bhyve_npt_pmap/usr.sbin/pciconf/cap.c
  projects/bhyve_npt_pmap/usr.sbin/portsnap/portsnap/portsnap.sh
  projects/bhyve_npt_pmap/usr.sbin/rtsold/rtsol.c
  projects/bhyve_npt_pmap/usr.sbin/ypserv/yp_access.c
  projects/bhyve_npt_pmap/usr.sbin/ypserv/yp_dnslookup.c
  projects/bhyve_npt_pmap/usr.sbin/ypserv/yp_main.c
Directory Properties:
  projects/bhyve_npt_pmap/   (props changed)
  projects/bhyve_npt_pmap/cddl/   (props changed)
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/   (props changed)
  projects/bhyve_npt_pmap/contrib/binutils/   (props changed)
  projects/bhyve_npt_pmap/contrib/ipfilter/   (props changed)
  projects/bhyve_npt_pmap/contrib/libc++/   (props changed)
  projects/bhyve_npt_pmap/contrib/libcxxrt/   (props changed)
  projects/bhyve_npt_pmap/contrib/libstdc++/   (props changed)
  projects/bhyve_npt_pmap/contrib/openbsm/   (props changed)
  projects/bhyve_npt_pmap/lib/libc/   (props changed)
  projects/bhyve_npt_pmap/sbin/   (props changed)
  projects/bhyve_npt_pmap/share/man/man4/   (props changed)
  projects/bhyve_npt_pmap/sys/   (props changed)
  projects/bhyve_npt_pmap/sys/boot/   (props changed)
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/   (props changed)
  projects/bhyve_npt_pmap/sys/conf/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/ipfilter/   (props changed)
  projects/bhyve_npt_pmap/usr.sbin/bhyve/   (props changed)
  projects/bhyve_npt_pmap/usr.sbin/rtsold/   (props changed)

Modified: projects/bhyve_npt_pmap/Makefile.inc1
==============================================================================
--- projects/bhyve_npt_pmap/Makefile.inc1	Wed Aug 21 04:49:58 2013	(r254593)
+++ projects/bhyve_npt_pmap/Makefile.inc1	Wed Aug 21 06:32:32 2013	(r254594)
@@ -833,6 +833,18 @@ distributeworld installworld: installche
 	awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \
 	${DESTDIR}/${DISTDIR}/${dist}.meta
 .endfor
+.if ${MK_DEBUG_FILES} != "no"
+. for dist in base ${EXTRA_DISTRIBUTIONS}
+	@# For each file that exists in this dist, print the corresponding
+	@# line from the METALOG.  This relies on the fact that
+	@# a line containing only the filename will sort immediatly before
+	@# the relevant mtree line.
+	cd ${DESTDIR}/${DISTDIR}; \
+	find ./${dist}/usr/lib/debug | sort -u ${METALOG} - | \
+	awk 'BEGIN { print "#${MTREE_MAGIC}" } !/ type=/ { file = $$1 } / type=/ { if ($$1 == file) { sub(/^\.\/${dist}\//, "./"); print } }' > \
+	${DESTDIR}/${DISTDIR}/${dist}.debug.meta
+. endfor
+.endif
 .endif
 .endif
 
@@ -841,13 +853,29 @@ packageworld:
 .if defined(NO_ROOT)
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
 	    tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \
+	    --exclude usr/lib/debug \
 	    @${DESTDIR}/${DISTDIR}/${dist}.meta
 .else
 	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
-	    tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz .
+	    tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.txz \
+	    --exclude usr/lib/debug .
 .endif
 .endfor
 
+.if ${MK_DEBUG_FILES} != "no"
+. for dist in base ${EXTRA_DISTRIBUTIONS}
+.  if defined(NO_ROOT)
+	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
+	    tar cvJf ${DESTDIR}/${DISTDIR}/${dist}.debug.txz \
+	    @${DESTDIR}/${DISTDIR}/${dist}.debug.meta
+.  else
+	${_+_}cd ${DESTDIR}/${DISTDIR}/${dist}; \
+	    tar cvJfL ${DESTDIR}/${DISTDIR}/${dist}.debug.txz \
+	    usr/lib/debug
+.  endif
+. endfor
+.endif
+
 #
 # reinstall
 #

Modified: projects/bhyve_npt_pmap/ObsoleteFiles.inc
==============================================================================
--- projects/bhyve_npt_pmap/ObsoleteFiles.inc	Wed Aug 21 04:49:58 2013	(r254593)
+++ projects/bhyve_npt_pmap/ObsoleteFiles.inc	Wed Aug 21 06:32:32 2013	(r254594)
@@ -38,6 +38,9 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20130710: libkvm version bump 
+OLD_LIBS+=lib/libkvm.so.5
+OLD_LIBS+=usr/lib32/libkvm.so.5
 # 20130623: dialog update from 1.1 to 1.2
 OLD_LIBS+=usr/lib/libdialog.so.7
 OLD_LIBS+=usr/lib32/libdialog.so.7

Modified: projects/bhyve_npt_pmap/UPDATING
==============================================================================
--- projects/bhyve_npt_pmap/UPDATING	Wed Aug 21 04:49:58 2013	(r254593)
+++ projects/bhyve_npt_pmap/UPDATING	Wed Aug 21 06:32:32 2013	(r254594)
@@ -31,10 +31,24 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20130716:
+	The default ARM ABI has changed to the ARM EABI. The old ABI is
+	incompatible with the ARM EABI and all programs and modules will
+	need to be rebuilt to work with a new kernel.
+
+	To keep using the old ABI ensure the WITHOUT_ARM_EABI knob is set.
+
+	NOTE: Support for the old ABI will be removed in the future and
+	users are advised to upgrade.
+
+20130709:
+	pkg_install has been disconnected from the build if you really need it
+	you should add WITH_PKGTOOLS in your src.conf(5).
+
 20130709:
 	Most of network statistics structures were changed to be able
 	keep 64-bits counters. Thus all tools, that work with networking
-	statistics, must be rebuilded (netstat(1), bsnmpd(1), etc.)
+	statistics, must be rebuilt (netstat(1), bsnmpd(1), etc.)
 
 20130629:
 	Fix targets that run multiple make's to use && rather than ;

Modified: projects/bhyve_npt_pmap/bin/sh/main.c
==============================================================================
--- projects/bhyve_npt_pmap/bin/sh/main.c	Wed Aug 21 04:49:58 2013	(r254593)
+++ projects/bhyve_npt_pmap/bin/sh/main.c	Wed Aug 21 06:32:32 2013	(r254594)
@@ -170,8 +170,8 @@ state3:
 	if (minusc) {
 		evalstring(minusc, sflag ? 0 : EV_EXIT);
 	}
+state4:
 	if (sflag || minusc == NULL) {
-state4:	/* XXX ??? - why isn't this before the "if" statement */
 		cmdloop(1);
 	}
 	exitshell(exitstatus);

Modified: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Wed Aug 21 04:49:58 2013	(r254593)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Wed Aug 21 06:32:32 2013	(r254594)
@@ -3997,7 +3997,7 @@ print_dedup_stats(nvlist_t *config)
 
 	/*
 	 * If the pool was faulted then we may not have been able to
-	 * obtain the config. Otherwise, if have anything in the dedup
+	 * obtain the config. Otherwise, if we have anything in the dedup
 	 * table continue processing the stats.
 	 */
 	if (nvlist_lookup_uint64_array(config, ZPOOL_CONFIG_DDT_OBJ_STATS,

Modified: projects/bhyve_npt_pmap/contrib/binutils/binutils/readelf.c
==============================================================================
--- projects/bhyve_npt_pmap/contrib/binutils/binutils/readelf.c	Wed Aug 21 04:49:58 2013	(r254593)
+++ projects/bhyve_npt_pmap/contrib/binutils/binutils/readelf.c	Wed Aug 21 06:32:32 2013	(r254594)
@@ -9103,8 +9103,6 @@ get_note_type (unsigned e_type)
 	return _("NT_FPREGS (floating point registers)");
       case NT_PSINFO:
 	return _("NT_PSINFO (psinfo structure)");
-      case NT_THRMISC:
-	return _("NT_THRMISC (thrmisc structure)");
       case NT_LWPSTATUS:
 	return _("NT_LWPSTATUS (lwpstatus_t structure)");
       case NT_LWPSINFO:
@@ -9130,6 +9128,52 @@ get_note_type (unsigned e_type)
 }
 
 static const char *
+get_freebsd_note_type (unsigned e_type)
+{
+  static char buff[64];
+
+  if (elf_header.e_type == ET_CORE)
+    switch (e_type)
+      {
+      case NT_THRMISC:
+	return _("NT_THRMISC (thrmisc structure)");
+      case NT_PROCSTAT_PROC:
+	return _("NT_PROCSTAT_PROC (proc data)");
+      case NT_PROCSTAT_FILES:
+	return _("NT_PROCSTAT_FILES (files data)");
+      case NT_PROCSTAT_VMMAP:
+	return _("NT_PROCSTAT_VMMAP (vmmap data)");
+      case NT_PROCSTAT_GROUPS:
+	return _("NT_PROCSTAT_GROUPS (groups data)");
+      case NT_PROCSTAT_UMASK:
+	return _("NT_PROCSTAT_UMASK (umask data)");
+      case NT_PROCSTAT_RLIMIT:
+	return _("NT_PROCSTAT_RLIMIT (rlimit data)");
+      case NT_PROCSTAT_OSREL:
+	return _("NT_PROCSTAT_OSREL (osreldate data)");
+      case NT_PROCSTAT_PSSTRINGS:
+	return _("NT_PROCSTAT_PSSTRINGS (ps_strings data)");
+      case NT_PROCSTAT_AUXV:
+	return _("NT_PROCSTAT_AUXV (auxv data)");
+      default:
+	return get_note_type(e_type);
+      }
+  else
+    switch (e_type)
+      {
+      case NT_FREEBSD_ABI_TAG:
+	return _("NT_FREEBSD_ABI_TAG");
+      case NT_FREEBSD_NOINIT_TAG:
+	return _("NT_FREEBSD_NOINIT_TAG");
+      default:
+	break;
+      }
+
+  snprintf (buff, sizeof(buff), _("Unknown note type: (0x%08x)"), e_type);
+  return buff;
+}
+
+static const char *
 get_netbsd_elfcore_note_type (unsigned e_type)
 {
   static char buff[64];
@@ -9206,6 +9250,10 @@ process_note (Elf_Internal_Note *pnote)
        note type strings.  */
     nt = get_note_type (pnote->type);
 
+  else if (const_strneq (pnote->namedata, "FreeBSD"))
+    /* FreeBSD-specific core file notes.  */
+    nt = get_freebsd_note_type (pnote->type);
+
   else if (const_strneq (pnote->namedata, "NetBSD-CORE"))
     /* NetBSD-specific core file notes.  */
     nt = get_netbsd_elfcore_note_type (pnote->type);
@@ -9215,7 +9263,7 @@ process_note (Elf_Internal_Note *pnote)
        note type strings.  */
       nt = get_note_type (pnote->type);
 
-  printf ("  %s\t\t0x%08lx\t%s\n",
+  printf ("  %-13s 0x%08lx\t%s\n",
 	  pnote->namesz ? pnote->namedata : "(NONE)",
 	  pnote->descsz, nt);
   return 1;

Modified: projects/bhyve_npt_pmap/contrib/binutils/include/elf/common.h
==============================================================================
--- projects/bhyve_npt_pmap/contrib/binutils/include/elf/common.h	Wed Aug 21 04:49:58 2013	(r254593)
+++ projects/bhyve_npt_pmap/contrib/binutils/include/elf/common.h	Wed Aug 21 06:32:32 2013	(r254594)
@@ -388,7 +388,6 @@
 #define NT_PRPSINFO	3		/* Contains copy of prpsinfo struct */
 #define NT_TASKSTRUCT	4		/* Contains copy of task struct */
 #define NT_AUXV		6		/* Contains copy of Elfxx_auxv_t */
-#define NT_THRMISC	7		/* Contains copy of thrmisc struct */
 #define NT_PRXFPREG	0x46e62b7f	/* Contains a user_xfpregs_struct; */
 					/*   note name must be "LINUX".  */
 
@@ -401,6 +400,19 @@
 #define NT_LWPSINFO	17		/* Has a struct lwpsinfo_t */
 #define NT_WIN32PSTATUS	18		/* Has a struct win32_pstatus */
 
+/* Note segments for core files on FreeBSD systems.  Note name
+   must start with "FreeBSD".  */
+#define NT_THRMISC		7	/* Contains copy of thrmisc struct */
+#define NT_PROCSTAT_PROC	8
+#define NT_PROCSTAT_FILES	9
+#define NT_PROCSTAT_VMMAP	10
+#define NT_PROCSTAT_GROUPS	11
+#define NT_PROCSTAT_UMASK	12
+#define NT_PROCSTAT_RLIMIT	13
+#define NT_PROCSTAT_OSREL	14
+#define NT_PROCSTAT_PSSTRINGS	15
+#define NT_PROCSTAT_AUXV	16
+
 
 /* Note segments for core files on NetBSD systems.  Note name
    must start with "NetBSD-CORE".  */

Modified: projects/bhyve_npt_pmap/contrib/libc++/include/__bit_reference
==============================================================================
--- projects/bhyve_npt_pmap/contrib/libc++/include/__bit_reference	Wed Aug 21 04:49:58 2013	(r254593)
+++ projects/bhyve_npt_pmap/contrib/libc++/include/__bit_reference	Wed Aug 21 06:32:32 2013	(r254594)
@@ -333,7 +333,7 @@ __fill_n_false(__bit_iterator<_Cp, false
     }
     // do middle whole words
     __storage_type __nw = __n / __bits_per_word;
-    _VSTD::memset(__first.__seg_, 0, __nw * sizeof(__storage_type));
+    _VSTD::memset(_VSTD::__to_raw_pointer(__first.__seg_), 0, __nw * sizeof(__storage_type));
     __n -= __nw * __bits_per_word;
     // do last partial word
     if (__n > 0)
@@ -363,7 +363,7 @@ __fill_n_true(__bit_iterator<_Cp, false>
     }
     // do middle whole words
     __storage_type __nw = __n / __bits_per_word;
-    _VSTD::memset(__first.__seg_, -1, __nw * sizeof(__storage_type));
+    _VSTD::memset(_VSTD::__to_raw_pointer(__first.__seg_), -1, __nw * sizeof(__storage_type));
     __n -= __nw * __bits_per_word;
     // do last partial word
     if (__n > 0)
@@ -430,7 +430,9 @@ __copy_aligned(__bit_iterator<_Cp, _IsCo
         // __first.__ctz_ == 0;
         // do middle words
         __storage_type __nw = __n / __bits_per_word;
-        _VSTD::memmove(__result.__seg_, __first.__seg_, __nw * sizeof(__storage_type));
+        _VSTD::memmove(_VSTD::__to_raw_pointer(__result.__seg_),
+                       _VSTD::__to_raw_pointer(__first.__seg_),
+                       __nw * sizeof(__storage_type));
         __n -= __nw * __bits_per_word;
         __result.__seg_ += __nw;
         // do last word
@@ -569,7 +571,9 @@ __copy_backward_aligned(__bit_iterator<_
         __storage_type __nw = __n / __bits_per_word;
         __result.__seg_ -= __nw;
         __last.__seg_ -= __nw;
-        _VSTD::memmove(__result.__seg_, __last.__seg_, __nw * sizeof(__storage_type));
+        _VSTD::memmove(_VSTD::__to_raw_pointer(__result.__seg_),
+                       _VSTD::__to_raw_pointer(__last.__seg_),
+                       __nw * sizeof(__storage_type));
         __n -= __nw * __bits_per_word;
         // do last word
         if (__n > 0)
@@ -870,6 +874,7 @@ struct __bit_array
 {
     typedef typename _Cp::difference_type difference_type;
     typedef typename _Cp::__storage_type  __storage_type;
+    typedef typename _Cp::__storage_pointer __storage_pointer;
     typedef typename _Cp::iterator        iterator;
     static const unsigned __bits_per_word = _Cp::__bits_per_word;
     static const unsigned _Np = 4;
@@ -880,9 +885,15 @@ struct __bit_array
     _LIBCPP_INLINE_VISIBILITY static difference_type capacity()
         {return static_cast(_Np * __bits_per_word);}
     _LIBCPP_INLINE_VISIBILITY explicit __bit_array(difference_type __s) : __size_(__s) {}
-    _LIBCPP_INLINE_VISIBILITY iterator begin() {return iterator(__word_, 0);}
-    _LIBCPP_INLINE_VISIBILITY iterator end()   {return iterator(__word_ + __size_ / __bits_per_word,
-                                                  static_cast(__size_ % __bits_per_word));}
+    _LIBCPP_INLINE_VISIBILITY iterator begin()
+    {
+        return iterator(pointer_traits<__storage_pointer>::pointer_to(__word_[0]), 0);
+    }
+    _LIBCPP_INLINE_VISIBILITY iterator end()
+    {
+        return iterator(pointer_traits<__storage_pointer>::pointer_to(__word_[0]) + __size_ / __bits_per_word,
+                                                  static_cast(__size_ % __bits_per_word));
+    }
 };
 
 template 

Modified: projects/bhyve_npt_pmap/contrib/libc++/include/__config
==============================================================================
--- projects/bhyve_npt_pmap/contrib/libc++/include/__config	Wed Aug 21 04:49:58 2013	(r254593)
+++ projects/bhyve_npt_pmap/contrib/libc++/include/__config	Wed Aug 21 06:32:32 2013	(r254594)
@@ -56,6 +56,18 @@
 # endif  // __LONG_LONG_SUPPORTED
 #endif  // __FreeBSD__
 
+#ifdef __NetBSD__
+# include 
+#  if _BYTE_ORDER == _LITTLE_ENDIAN
+#   define _LIBCPP_LITTLE_ENDIAN 1
+#   define _LIBCPP_BIG_ENDIAN    0
+# else  // _BYTE_ORDER == _LITTLE_ENDIAN
+#   define _LIBCPP_LITTLE_ENDIAN 0
+#   define _LIBCPP_BIG_ENDIAN    1
+# endif  // _BYTE_ORDER == _LITTLE_ENDIAN
+# define _LIBCPP_HAS_QUICK_EXIT
+#endif  // __NetBSD__
+
 #ifdef _WIN32
 #  define _LIBCPP_LITTLE_ENDIAN 1
 #  define _LIBCPP_BIG_ENDIAN    0
@@ -135,6 +147,10 @@
 
 #endif // _WIN32
 
+#ifndef __has_attribute
+#define __has_attribute(__x) 0
+#endif
+
 #ifndef _LIBCPP_HIDDEN
 #define _LIBCPP_HIDDEN __attribute__ ((__visibility__("hidden")))
 #endif
@@ -212,7 +228,9 @@ typedef __char32_t char32_t;
 #  define _LIBCPP_NORETURN __attribute__ ((noreturn))
 #endif
 
+#if !(__has_feature(cxx_defaulted_functions))
 #define _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
+#endif  // !(__has_feature(cxx_defaulted_functions))
 
 #if !(__has_feature(cxx_deleted_functions))
 #define _LIBCPP_HAS_NO_DELETED_FUNCTIONS
@@ -272,10 +290,20 @@ typedef __char32_t char32_t;
 #define _LIBCPP_HAS_NO_CONSTEXPR
 #endif
 
-#if defined(__FreeBSD__) && (__ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L)
+#if __ISO_C_VISIBLE >= 2011 || __cplusplus >= 201103L
+#if defined(__FreeBSD__)
+#define _LIBCPP_HAS_QUICK_EXIT
+#define _LIBCPP_HAS_C11_FEATURES
+#elif defined(__linux__)
+#include 
+#if __GLIBC_PREREQ(2, 15)
 #define _LIBCPP_HAS_QUICK_EXIT
+#endif
+#if __GLIBC_PREREQ(2, 17)
 #define _LIBCPP_HAS_C11_FEATURES
 #endif
+#endif
+#endif
 
 #if (__has_feature(cxx_noexcept))
 #  define _NOEXCEPT noexcept
@@ -418,8 +446,14 @@ template  struct __static_asse
 #define _LIBCPP_CONSTEXPR constexpr
 #endif
 
+#ifdef _LIBCPP_HAS_NO_DEFAULTED_FUNCTIONS
+#define _LIBCPP_DEFAULT {}
+#else
+#define _LIBCPP_DEFAULT = default;
+#endif
+
 #ifdef __GNUC__
-#define _NOALIAS __attribute__((malloc))
+#define _NOALIAS __attribute__((__malloc__))
 #else
 #define _NOALIAS
 #endif
@@ -451,7 +485,7 @@ template  struct __static_asse
 #define _LIBCPP_EXTERN_TEMPLATE(...) extern template __VA_ARGS__;
 #endif
 
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(_WIN32) || defined(__sun__)
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(_WIN32) || defined(__sun__) || defined(__NetBSD__)
 #define _LIBCPP_LOCALE__L_EXTENSIONS 1
 #endif
 #ifdef __FreeBSD__
@@ -476,6 +510,14 @@ template  struct __static_asse
 #   endif
 #endif
 
+#ifndef _LIBCPP_STD_VER
+#  if  __cplusplus <= 201103L
+#    define _LIBCPP_STD_VER 11
+#  else
+#    define _LIBCPP_STD_VER 13  // current year, or date of c++14 ratification
+#  endif
+#endif  // _LIBCPP_STD_VER
+
 #ifdef _LIBCPP_DEBUG2
 #   include <__debug>
 #else

Modified: projects/bhyve_npt_pmap/contrib/libc++/include/__functional_base
==============================================================================
--- projects/bhyve_npt_pmap/contrib/libc++/include/__functional_base	Wed Aug 21 04:49:58 2013	(r254593)
+++ projects/bhyve_npt_pmap/contrib/libc++/include/__functional_base	Wed Aug 21 06:32:32 2013	(r254594)
@@ -292,7 +292,8 @@ struct __weak_result_type<_Rp (_Cp::*)(_
 
 // bullets 1 and 2
 
-template 
+template 
 inline _LIBCPP_INLINE_VISIBILITY
 auto
 __invoke(_Fp&& __f, _A0&& __a0, _Args&& ...__args)
@@ -301,7 +302,8 @@ __invoke(_Fp&& __f, _A0&& __a0, _Args&& 
     return (_VSTD::forward<_A0>(__a0).*__f)(_VSTD::forward<_Args>(__args)...);
 }
 
-template 
+template 
 inline _LIBCPP_INLINE_VISIBILITY
 auto
 __invoke(_Fp&& __f, _A0&& __a0, _Args&& ...__args)
@@ -312,7 +314,8 @@ __invoke(_Fp&& __f, _A0&& __a0, _Args&& 
 
 // bullets 3 and 4
 
-template 
+template 
 inline _LIBCPP_INLINE_VISIBILITY
 auto
 __invoke(_Fp&& __f, _A0&& __a0)
@@ -321,7 +324,8 @@ __invoke(_Fp&& __f, _A0&& __a0)
     return _VSTD::forward<_A0>(__a0).*__f;
 }
 
-template 
+template 
 inline _LIBCPP_INLINE_VISIBILITY
 auto
 __invoke(_Fp&& __f, _A0&& __a0)

Modified: projects/bhyve_npt_pmap/contrib/libc++/include/__hash_table
==============================================================================
--- projects/bhyve_npt_pmap/contrib/libc++/include/__hash_table	Wed Aug 21 04:49:58 2013	(r254593)
+++ projects/bhyve_npt_pmap/contrib/libc++/include/__hash_table	Wed Aug 21 06:32:32 2013	(r254594)
@@ -33,7 +33,6 @@ template 
 struct __hash_node_base
 {
     typedef __hash_node_base __first_node;
- //   typedef _NodePtr pointer;
 
     _NodePtr    __next_;
 
@@ -111,7 +110,7 @@ public:
     _LIBCPP_INLINE_VISIBILITY
         reference operator*() const {return __node_->__value_;}
     _LIBCPP_INLINE_VISIBILITY
-        pointer operator->() const {return _VSTD::addressof(__node_->__value_);}
+        pointer operator->() const {return pointer_traits::pointer_to(__node_->__value_);}
 
     _LIBCPP_INLINE_VISIBILITY
     __hash_iterator& operator++()
@@ -189,7 +188,7 @@ public:
     _LIBCPP_INLINE_VISIBILITY
         reference operator*() const {return __node_->__value_;}
     _LIBCPP_INLINE_VISIBILITY
-        pointer operator->() const {return _VSTD::addressof(__node_->__value_);}
+        pointer operator->() const {return pointer_traits::pointer_to(__node_->__value_);}
 
     _LIBCPP_INLINE_VISIBILITY
     __hash_const_iterator& operator++()
@@ -255,7 +254,7 @@ public:
     _LIBCPP_INLINE_VISIBILITY
         reference operator*() const {return __node_->__value_;}
     _LIBCPP_INLINE_VISIBILITY
-        pointer operator->() const {return &__node_->__value_;}
+        pointer operator->() const {return pointer_traits::pointer_to(__node_->__value_);}
 
     _LIBCPP_INLINE_VISIBILITY
     __hash_local_iterator& operator++()
@@ -345,7 +344,7 @@ public:
     _LIBCPP_INLINE_VISIBILITY
         reference operator*() const {return __node_->__value_;}
     _LIBCPP_INLINE_VISIBILITY
-        pointer operator->() const {return &__node_->__value_;}
+        pointer operator->() const {return pointer_traits::pointer_to(__node_->__value_);}
 
     _LIBCPP_INLINE_VISIBILITY
     __hash_const_local_iterator& operator++()
@@ -505,8 +504,15 @@ public:
                                                      __node_allocator;
     typedef allocator_traits<__node_allocator>       __node_traits;
     typedef typename __node_traits::pointer          __node_pointer;
-    typedef typename __node_traits::const_pointer    __node_const_pointer;
+    typedef typename __node_traits::pointer          __node_const_pointer;
     typedef __hash_node_base<__node_pointer>         __first_node;
+    typedef typename pointer_traits<__node_pointer>::template
+#ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
+            rebind<__first_node>
+#else
+            rebind<__first_node>::other
+#endif
+                                                     __node_base_pointer;
 
 private:
 
@@ -558,9 +564,9 @@ public:
 
 public:
     typedef __hash_iterator<__node_pointer>                   iterator;
-    typedef __hash_const_iterator<__node_const_pointer>       const_iterator;
+    typedef __hash_const_iterator<__node_pointer>             const_iterator;
     typedef __hash_local_iterator<__node_pointer>             local_iterator;
-    typedef __hash_const_local_iterator<__node_const_pointer> const_local_iterator;
+    typedef __hash_const_local_iterator<__node_pointer>       const_local_iterator;
 
     __hash_table()
         _NOEXCEPT_(
@@ -706,7 +712,7 @@ public:
 
     _LIBCPP_INLINE_VISIBILITY
     size_type max_bucket_count() const _NOEXCEPT
-        {return __bucket_list_.get_deleter().__alloc().max_size();}
+        {return __pointer_alloc_traits::max_size(__bucket_list_.get_deleter().__alloc());}
     size_type bucket_size(size_type __n) const;
     _LIBCPP_INLINE_VISIBILITY float load_factor() const _NOEXCEPT
     {
@@ -807,6 +813,9 @@ private:
 
     void __deallocate(__node_pointer __np) _NOEXCEPT;
     __node_pointer __detach() _NOEXCEPT;
+
+    template  friend class _LIBCPP_TYPE_VIS unordered_map;
+    template  friend class _LIBCPP_TYPE_VIS unordered_multimap;
 };
 
 template 
@@ -893,7 +902,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>
     if (size() > 0)
     {
         __bucket_list_[__constrain_hash(__p1_.first().__next_->__hash_, bucket_count())] =
-            static_cast<__node_pointer>(_VSTD::addressof(__p1_.first()));
+            static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()));
         __u.__p1_.first().__next_ = nullptr;
         __u.size() = 0;
     }
@@ -917,7 +926,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>
             __p1_.first().__next_ = __u.__p1_.first().__next_;
             __u.__p1_.first().__next_ = nullptr;
             __bucket_list_[__constrain_hash(__p1_.first().__next_->__hash_, bucket_count())] =
-                static_cast<__node_pointer>(_VSTD::addressof(__p1_.first()));
+                static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()));
             size() = __u.size();
             __u.size() = 0;
         }
@@ -1014,7 +1023,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>
     if (size() > 0)
     {
         __bucket_list_[__constrain_hash(__p1_.first().__next_->__hash_, bucket_count())] =
-            static_cast<__node_pointer>(_VSTD::addressof(__p1_.first()));
+            static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()));
         __u.__p1_.first().__next_ = nullptr;
         __u.size() = 0;
     }
@@ -1236,7 +1245,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>
         __node_pointer __pn = __bucket_list_[__chash];
         if (__pn == nullptr)
         {
-            __pn = static_cast<__node_pointer>(_VSTD::addressof(__p1_.first()));
+            __pn = static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()));
             __nd->__next_ = __pn->__next_;
             __pn->__next_ = __nd;
             // fix up __bucket_list_
@@ -1274,7 +1283,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>
     __node_pointer __pn = __bucket_list_[__chash];
     if (__pn == nullptr)
     {
-        __pn = static_cast<__node_pointer>(_VSTD::addressof(__p1_.first()));
+        __pn = static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()));
         __cp->__next_ = __pn->__next_;
         __pn->__next_ = __cp;
         // fix up __bucket_list_
@@ -1322,7 +1331,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>
 {
     if (__p != end() && key_eq()(*__p, __cp->__value_))
     {
-        __node_pointer __np = const_cast<__node_pointer>(__p.__node_);
+        __node_pointer __np = __p.__node_;
         __cp->__hash_ = __np->__hash_;
         size_type __bc = bucket_count();
         if (size()+1 > __bc * max_load_factor() || __bc == 0)
@@ -1380,7 +1389,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>
         __node_pointer __pn = __bucket_list_[__chash];
         if (__pn == nullptr)
         {
-            __pn = static_cast<__node_pointer>(_VSTD::addressof(__p1_.first()));
+            __pn = static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()));
             __h->__next_ = __pn->__next_;
             __pn->__next_ = __h.get();
             // fix up __bucket_list_
@@ -1542,7 +1551,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>
     {
         for (size_type __i = 0; __i < __nbc; ++__i)
             __bucket_list_[__i] = nullptr;
-        __node_pointer __pp(static_cast<__node_pointer>(_VSTD::addressof(__p1_.first())));
+        __node_pointer __pp(static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first())));
         __node_pointer __cp = __pp->__next_;
         if (__cp != nullptr)
         {
@@ -1700,7 +1709,7 @@ template ::iterator
 __hash_table<_Tp, _Hash, _Equal, _Alloc>::erase(const_iterator __p)
 {
-    __node_pointer __np = const_cast<__node_pointer>(__p.__node_);
+    __node_pointer __np = __p.__node_;
     iterator __r(__np);
     ++__r;
     remove(__p);
@@ -1717,7 +1726,7 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>
         ++__first;
         erase(__p);
     }
-    __node_pointer __np = const_cast<__node_pointer>(__last.__node_);
+    __node_pointer __np = __last.__node_;
     return iterator (__np);
 }
 
@@ -1757,7 +1766,7 @@ typename __hash_table<_Tp, _Hash, _Equal
 __hash_table<_Tp, _Hash, _Equal, _Alloc>::remove(const_iterator __p) _NOEXCEPT
 {
     // current node
-    __node_pointer __cn = const_cast<__node_pointer>(__p.__node_);
+    __node_pointer __cn = __p.__node_;
     size_type __bc = bucket_count();
     size_t __chash = __constrain_hash(__cn->__hash_, __bc);
     // find previous node
@@ -1767,7 +1776,8 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>
     // Fix up __bucket_list_
         // if __pn is not in same bucket (before begin is not in same bucket) &&
         //    if __cn->__next_ is not in same bucket (nullptr is not in same bucket)
-    if (__pn == _VSTD::addressof(__p1_.first()) || __constrain_hash(__pn->__hash_, __bc) != __chash)
+    if (__pn == static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()))
+                            || __constrain_hash(__pn->__hash_, __bc) != __chash)
     {
         if (__cn->__next_ == nullptr || __constrain_hash(__cn->__next_->__hash_, __bc) != __chash)
             __bucket_list_[__chash] = nullptr;
@@ -1907,10 +1917,10 @@ __hash_table<_Tp, _Hash, _Equal, _Alloc>
     __p3_.swap(__u.__p3_);
     if (size() > 0)
         __bucket_list_[__constrain_hash(__p1_.first().__next_->__hash_, bucket_count())] =
-            static_cast<__node_pointer>(_VSTD::addressof(__p1_.first()));
+            static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__p1_.first()));
     if (__u.size() > 0)
         __u.__bucket_list_[__constrain_hash(__u.__p1_.first().__next_->__hash_, __u.bucket_count())] =
-            static_cast<__node_pointer>(_VSTD::addressof(__u.__p1_.first()));
+            static_cast<__node_pointer>(pointer_traits<__node_base_pointer>::pointer_to(__u.__p1_.first()));
 }
 
 template 

Modified: projects/bhyve_npt_pmap/contrib/libc++/include/__locale
==============================================================================
--- projects/bhyve_npt_pmap/contrib/libc++/include/__locale	Wed Aug 21 04:49:58 2013	(r254593)
+++ projects/bhyve_npt_pmap/contrib/libc++/include/__locale	Wed Aug 21 06:32:32 2013	(r254594)
@@ -339,12 +339,12 @@ public:
     static const mask punct  = _PUNCT;
     static const mask xdigit = _HEX;
     static const mask blank  = _BLANK;
-#elif (defined(__APPLE__) || defined(__FreeBSD__)) || defined(EMSCRIPTEN)
+#elif defined(__APPLE__) || defined(__FreeBSD__) || defined(EMSCRIPTEN) || defined(__NetBSD__)
 #ifdef __APPLE__
     typedef __uint32_t mask;
 #elif defined(__FreeBSD__)
     typedef unsigned long mask;
-#elif defined(EMSCRIPTEN)
+#elif defined(EMSCRIPTEN) ||  defined(__NetBSD__)
     typedef unsigned short mask;
 #endif
     static const mask space  = _CTYPE_S;
@@ -356,7 +356,11 @@ public:
     static const mask digit  = _CTYPE_D;
     static const mask punct  = _CTYPE_P;
     static const mask xdigit = _CTYPE_X;
+# if defined(__NetBSD__)
+    static const mask blank  = _CTYPE_BL;
+# else
     static const mask blank  = _CTYPE_B;
+# endif
 #elif defined(__sun__)
     typedef unsigned int mask;
     static const mask space  = _ISSPACE;
@@ -596,6 +600,10 @@ public:
     static const int* __classic_upper_table() _NOEXCEPT;
     static const int* __classic_lower_table() _NOEXCEPT;
 #endif
+#if defined(__NetBSD__)
+    static const short* __classic_upper_table() _NOEXCEPT;
+    static const short* __classic_lower_table() _NOEXCEPT;
+#endif
 
 protected:
     ~ctype();

Modified: projects/bhyve_npt_pmap/contrib/libc++/include/__split_buffer
==============================================================================
--- projects/bhyve_npt_pmap/contrib/libc++/include/__split_buffer	Wed Aug 21 04:49:58 2013	(r254593)
+++ projects/bhyve_npt_pmap/contrib/libc++/include/__split_buffer	Wed Aug 21 06:32:32 2013	(r254594)
@@ -290,7 +290,7 @@ void
 __split_buffer<_Tp, _Allocator>::__destruct_at_begin(pointer __new_begin, false_type)
 {
     while (__begin_ != __new_begin)
-        __alloc_traits::destroy(__alloc(), __begin_++);
+        __alloc_traits::destroy(__alloc(), __to_raw_pointer(__begin_++));
 }
 
 template 
@@ -307,7 +307,7 @@ void
 __split_buffer<_Tp, _Allocator>::__destruct_at_end(pointer __new_last, false_type) _NOEXCEPT
 {
     while (__new_last != __end_)
-        __alloc_traits::destroy(__alloc(), --__end_);
+        __alloc_traits::destroy(__alloc(), __to_raw_pointer(--__end_));
 }
 
 template 
@@ -320,7 +320,7 @@ __split_buffer<_Tp, _Allocator>::__destr
 
 template 
 __split_buffer<_Tp, _Allocator>::__split_buffer(size_type __cap, size_type __start, __alloc_rr& __a)
-    : __end_cap_(0, __a)
+    : __end_cap_(nullptr, __a)
 {
     __first_ = __cap != 0 ? __alloc_traits::allocate(__alloc(), __cap) : nullptr;
     __begin_ = __end_ = __first_ + __start;
@@ -331,21 +331,21 @@ template 
 _LIBCPP_INLINE_VISIBILITY inline
 __split_buffer<_Tp, _Allocator>::__split_buffer()
     _NOEXCEPT_(is_nothrow_default_constructible::value)
-    : __first_(0), __begin_(0), __end_(0), __end_cap_(0)
+    : __first_(nullptr), __begin_(nullptr), __end_(nullptr), __end_cap_(nullptr)
 {
 }
 
 template 
 _LIBCPP_INLINE_VISIBILITY inline
 __split_buffer<_Tp, _Allocator>::__split_buffer(__alloc_rr& __a)
-    : __first_(0), __begin_(0), __end_(0), __end_cap_(0, __a)
+    : __first_(nullptr), __begin_(nullptr), __end_(nullptr), __end_cap_(nullptr, __a)
 {
 }
 
 template 
 _LIBCPP_INLINE_VISIBILITY inline
 __split_buffer<_Tp, _Allocator>::__split_buffer(const __alloc_rr& __a)
-    : __first_(0), __begin_(0), __end_(0), __end_cap_(0, __a)
+    : __first_(nullptr), __begin_(nullptr), __end_(nullptr), __end_cap_(nullptr, __a)
 {
 }
 

Modified: projects/bhyve_npt_pmap/contrib/libc++/include/__std_stream
==============================================================================
--- projects/bhyve_npt_pmap/contrib/libc++/include/__std_stream	Wed Aug 21 04:49:58 2013	(r254593)
+++ projects/bhyve_npt_pmap/contrib/libc++/include/__std_stream	Wed Aug 21 06:32:32 2013	(r254594)
@@ -55,6 +55,8 @@ private:
     const codecvt* __cv_;
     state_type* __st_;
     int __encoding_;
+    int_type __last_consumed_;
+    bool __last_consumed_is_next_;
     bool __always_noconv_;
 
     __stdinbuf(const __stdinbuf&);
@@ -66,7 +68,9 @@ private:
 template 
 __stdinbuf<_CharT>::__stdinbuf(FILE* __fp, state_type* __st)
     : __file_(__fp),
-      __st_(__st)
+      __st_(__st),
+      __last_consumed_(traits_type::eof()),
+      __last_consumed_is_next_(false)
 {
     imbue(this->getloc());
 }
@@ -100,6 +104,16 @@ template 
 typename __stdinbuf<_CharT>::int_type
 __stdinbuf<_CharT>::__getchar(bool __consume)
 {
+    if (__last_consumed_is_next_)
+    {
+        int_type __result = __last_consumed_;
+        if (__consume)
+        {
+            __last_consumed_ = traits_type::eof();
+            __last_consumed_is_next_ = false;
+        }
+        return __result;
+    }
     char __extbuf[__limit];
     int __nread = _VSTD::max(1, __encoding_);
     for (int __i = 0; __i < __nread; ++__i)
@@ -154,6 +168,8 @@ __stdinbuf<_CharT>::__getchar(bool __con
                 return traits_type::eof();
         }
     }
+    else
+        __last_consumed_ = traits_type::to_int_type(__1buf);
     return traits_type::to_int_type(__1buf);
 }
 
@@ -162,28 +178,41 @@ typename __stdinbuf<_CharT>::int_type
 __stdinbuf<_CharT>::pbackfail(int_type __c)
 {
     if (traits_type::eq_int_type(__c, traits_type::eof()))
-        return __c;
-    char __extbuf[__limit];
-    char* __enxt;
-    const char_type __ci = traits_type::to_char_type(__c);
-    const char_type* __inxt;
-    switch (__cv_->out(*__st_, &__ci, &__ci + 1, __inxt,
-                              __extbuf, __extbuf + sizeof(__extbuf), __enxt))
     {
-    case _VSTD::codecvt_base::ok:
-        break;
-    case _VSTD::codecvt_base::noconv:
-        __extbuf[0] = static_cast(__c);
-        __enxt = __extbuf + 1;
-        break;
-    case codecvt_base::partial:
-    case codecvt_base::error:
-        return traits_type::eof();
+        if (!__last_consumed_is_next_)
+        {
+            __c = __last_consumed_;
+            __last_consumed_is_next_ = !traits_type::eq_int_type(__last_consumed_,
+                                                                 traits_type::eof());
+        }
+        return __c;
     }
-    while (__enxt > __extbuf)
-        if (ungetc(*--__enxt, __file_) == EOF)
+    if (__last_consumed_is_next_)
+    {
+        char __extbuf[__limit];
+        char* __enxt;
+        const char_type __ci = traits_type::to_char_type(__last_consumed_);
+        const char_type* __inxt;
+        switch (__cv_->out(*__st_, &__ci, &__ci + 1, __inxt,
+                                  __extbuf, __extbuf + sizeof(__extbuf), __enxt))
+        {
+        case _VSTD::codecvt_base::ok:
+            break;
+        case _VSTD::codecvt_base::noconv:
+            __extbuf[0] = static_cast(__last_consumed_);
+            __enxt = __extbuf + 1;
+            break;
+        case codecvt_base::partial:
+        case codecvt_base::error:
             return traits_type::eof();
- return traits_type::not_eof(__c);
+        }
+        while (__enxt > __extbuf)
+            if (ungetc(*--__enxt, __file_) == EOF)
+                return traits_type::eof();
+    }
+    __last_consumed_ = __c;
+    __last_consumed_is_next_ = true;
+    return __c;
 }
 
 // __stdoutbuf
@@ -234,30 +263,31 @@ __stdoutbuf<_CharT>::overflow(int_type _
     char_type __1buf;
     if (!traits_type::eq_int_type(__c, traits_type::eof()))
     {
-        this->setp(&__1buf, &__1buf+1);
-        *this->pptr() = traits_type::to_char_type(__c);
-        this->pbump(1);
+        __1buf = traits_type::to_char_type(__c);
         if (__always_noconv_)
         {
-            if (fwrite(this->pbase(), sizeof(char_type), 1, __file_) != 1)
+            if (fwrite(&__1buf, sizeof(char_type), 1, __file_) != 1)
                 return traits_type::eof();
         }
         else
         {
             char* __extbe = __extbuf;
             codecvt_base::result __r;
+            char_type* pbase = &__1buf;
+            char_type* pptr = pbase + 1;
+            char_type* epptr = pptr;
             do
             {
                 const char_type* __e;
-                __r = __cv_->out(*__st_, this->pbase(), this->pptr(), __e,
+                __r = __cv_->out(*__st_, pbase, pptr, __e,
                                         __extbuf,
                                         __extbuf + sizeof(__extbuf),
                                         __extbe);
-                if (__e == this->pbase())
+                if (__e == pbase)
                     return traits_type::eof();
                 if (__r == codecvt_base::noconv)
                 {
-                    if (fwrite(this->pbase(), 1, 1, __file_) != 1)
+                    if (fwrite(pbase, 1, 1, __file_) != 1)
                         return traits_type::eof();
                 }
                 else if (__r == codecvt_base::ok || __r == codecvt_base::partial)
@@ -267,15 +297,13 @@ __stdoutbuf<_CharT>::overflow(int_type _
                         return traits_type::eof();
                     if (__r == codecvt_base::partial)
                     {
-                        this->setp((char_type*)__e, this->pptr());
-                        this->pbump(static_cast(this->epptr() - this->pbase()));
+                        pbase = (char_type*)__e;
                     }
                 }
                 else
                     return traits_type::eof();
             } while (__r == codecvt_base::partial);
         }
-        this->setp(0, 0);
     }
     return traits_type::not_eof(__c);
 }

Modified: projects/bhyve_npt_pmap/contrib/libc++/include/__tree
==============================================================================
--- projects/bhyve_npt_pmap/contrib/libc++/include/__tree	Wed Aug 21 04:49:58 2013	(r254593)
+++ projects/bhyve_npt_pmap/contrib/libc++/include/__tree	Wed Aug 21 06:32:32 2013	(r254594)
@@ -644,7 +644,8 @@ public:
     _LIBCPP_INLINE_VISIBILITY __tree_iterator() _NOEXCEPT {}
 
     _LIBCPP_INLINE_VISIBILITY reference operator*() const {return __ptr_->__value_;}
-    _LIBCPP_INLINE_VISIBILITY pointer operator->() const {return &__ptr_->__value_;}
+    _LIBCPP_INLINE_VISIBILITY pointer operator->() const
+        {return pointer_traits::pointer_to(__ptr_->__value_);}
 
     _LIBCPP_INLINE_VISIBILITY
     __tree_iterator& operator++()
@@ -686,7 +687,7 @@ class _LIBCPP_TYPE_VIS __tree_const_iter
 {
     typedef _ConstNodePtr                                         __node_pointer;
     typedef typename pointer_traits<__node_pointer>::element_type __node;
-    typedef const typename __node::base                           __node_base;
+    typedef typename __node::base                                 __node_base;
     typedef typename pointer_traits<__node_pointer>::template
 #ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
             rebind<__node_base>
@@ -729,7 +730,8 @@ public:
         : __ptr_(__p.__ptr_) {}
 
     _LIBCPP_INLINE_VISIBILITY reference operator*() const {return __ptr_->__value_;}
-    _LIBCPP_INLINE_VISIBILITY pointer operator->() const {return &__ptr_->__value_;}
+    _LIBCPP_INLINE_VISIBILITY pointer operator->() const
+        {return pointer_traits::pointer_to(__ptr_->__value_);}
 
     _LIBCPP_INLINE_VISIBILITY
     __tree_const_iterator& operator++()
@@ -779,8 +781,10 @@ public:
     typedef typename __alloc_traits::size_type       size_type;
     typedef typename __alloc_traits::difference_type difference_type;
 
-    typedef __tree_node __node;
-    typedef __tree_node_base __node_base;
+    typedef typename __alloc_traits::void_pointer  __void_pointer;
+
+    typedef __tree_node __node;
+    typedef __tree_node_base<__void_pointer>        __node_base;
     typedef typename __alloc_traits::template
 #ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
             rebind_alloc<__node>
@@ -790,9 +794,9 @@ public:
                                                      __node_allocator;
     typedef allocator_traits<__node_allocator>       __node_traits;
     typedef typename __node_traits::pointer          __node_pointer;
-    typedef typename __node_traits::const_pointer    __node_const_pointer;
+    typedef typename __node_traits::pointer          __node_const_pointer;
     typedef typename __node_base::pointer            __node_base_pointer;
-    typedef typename __node_base::const_pointer      __node_base_const_pointer;
+    typedef typename __node_base::pointer            __node_base_const_pointer;
 private:
     typedef typename __node_base::base __end_node_t;
     typedef typename pointer_traits<__node_pointer>::template
@@ -804,9 +808,9 @@ private:
                                                      __end_node_ptr;
     typedef typename pointer_traits<__node_pointer>::template
 #ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES
-            rebind
+            rebind<__end_node_t>
 #else
-            rebind::other
+            rebind<__end_node_t>::other
 #endif
                                                      __end_node_const_ptr;
 
@@ -828,7 +832,7 @@ public:
     {
         return static_cast<__node_const_pointer>
                (
-                   pointer_traits<__end_node_const_ptr>::pointer_to(__pair1_.first())
+                   pointer_traits<__end_node_const_ptr>::pointer_to(const_cast<__end_node_t&>(__pair1_.first()))
                );
     }
     _LIBCPP_INLINE_VISIBILITY
@@ -865,7 +869,7 @@ public:
         {return static_cast<__node_const_pointer>(__end_node()->__left_);}
 
     typedef __tree_iterator             iterator;

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

From owner-svn-src-projects@FreeBSD.ORG  Wed Aug 21 19:30:17 2013
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 3CB28AD6;
 Wed, 21 Aug 2013 19:30:17 +0000 (UTC)
 (envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2649324DF;
 Wed, 21 Aug 2013 19:30:17 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7LJUHDk041336;
 Wed, 21 Aug 2013 19:30:17 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7LJU8a6041067;
 Wed, 21 Aug 2013 19:30:08 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201308211930.r7LJU8a6041067@svn.freebsd.org>
From: Neel Natu 
Date: Wed, 21 Aug 2013 19:30:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r254607 - in projects/bhyve_npt_pmap: . bin/sh
 cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts
 cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs
 cddl/contrib/opensolaris/cmd...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
 tree" 
List-Unsubscribe: , 
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
 
X-List-Received-Date: Wed, 21 Aug 2013 19:30:17 -0000

Author: neel
Date: Wed Aug 21 19:30:07 2013
New Revision: 254607
URL: http://svnweb.freebsd.org/changeset/base/254607

Log:
  IFC @253953

Added:
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d
     - copied unchanged from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d.out
     - copied unchanged from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d.out
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d.out
     - copied unchanged from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d.out
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d
     - copied unchanged from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d.out
     - copied unchanged from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d.out
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d
     - copied unchanged from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d.out
     - copied unchanged from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d.out
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d
     - copied unchanged from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d.out
     - copied unchanged from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d.out
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_AGG.bad.d
     - copied unchanged from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_AGG.bad.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.dyn.d
     - copied unchanged from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.dyn.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d
     - copied unchanged from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out
     - copied unchanged from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/tst.xlate.d.out
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.signs.d
     - copied unchanged from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.signs.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.signs.d.out
     - copied unchanged from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.signs.d.out
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_TRACE_AGG.bad.d
     - copied unchanged from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_TRACE_AGG.bad.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/tst.dyn.d
     - copied unchanged from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/tst.dyn.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability1.ksh
     - copied unchanged from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability1.ksh
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability1.ksh.out
     - copied unchanged from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability1.ksh.out
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability2.ksh
     - copied unchanged from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability2.ksh
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability2.ksh.out
     - copied unchanged from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/tst.TestTransStability2.ksh.out
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/types/tst.const.d
     - copied unchanged from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/types/tst.const.d
  projects/bhyve_npt_pmap/contrib/apr-util/crypto/apr_passwd.c
     - copied unchanged from r253953, head/contrib/apr-util/crypto/apr_passwd.c
  projects/bhyve_npt_pmap/contrib/apr-util/crypto/crypt_blowfish.c
     - copied unchanged from r253953, head/contrib/apr-util/crypto/crypt_blowfish.c
  projects/bhyve_npt_pmap/contrib/apr-util/crypto/crypt_blowfish.h
     - copied unchanged from r253953, head/contrib/apr-util/crypto/crypt_blowfish.h
  projects/bhyve_npt_pmap/contrib/serf/SConstruct
     - copied unchanged from r253953, head/contrib/serf/SConstruct
  projects/bhyve_npt_pmap/contrib/serf/auth/auth_spnego.c
     - copied unchanged from r253953, head/contrib/serf/auth/auth_spnego.c
  projects/bhyve_npt_pmap/contrib/serf/auth/auth_spnego.h
     - copied unchanged from r253953, head/contrib/serf/auth/auth_spnego.h
  projects/bhyve_npt_pmap/contrib/serf/auth/auth_spnego_gss.c
     - copied unchanged from r253953, head/contrib/serf/auth/auth_spnego_gss.c
  projects/bhyve_npt_pmap/contrib/serf/auth/auth_spnego_sspi.c
     - copied unchanged from r253953, head/contrib/serf/auth/auth_spnego_sspi.c
  projects/bhyve_npt_pmap/contrib/serf/build/check.py
     - copied unchanged from r253953, head/contrib/serf/build/check.py
  projects/bhyve_npt_pmap/contrib/serf/build/serf.pc.in
     - copied unchanged from r253953, head/contrib/serf/build/serf.pc.in
  projects/bhyve_npt_pmap/etc/libmap.conf
     - copied unchanged from r253953, head/etc/libmap.conf
  projects/bhyve_npt_pmap/lib/libc++/libc++.ldscript
     - copied unchanged from r253953, head/lib/libc++/libc++.ldscript
  projects/bhyve_npt_pmap/lib/libusb/libusb-0.1.pc
     - copied unchanged from r253953, head/lib/libusb/libusb-0.1.pc
  projects/bhyve_npt_pmap/lib/libusb/libusb-1.0.pc
     - copied unchanged from r253953, head/lib/libusb/libusb-1.0.pc
  projects/bhyve_npt_pmap/lib/libusb/libusb-2.0.pc
     - copied unchanged from r253953, head/lib/libusb/libusb-2.0.pc
  projects/bhyve_npt_pmap/share/man/man4/rsu.4
     - copied unchanged from r253953, head/share/man/man4/rsu.4
  projects/bhyve_npt_pmap/share/man/man4/rsufw.4
     - copied unchanged from r253953, head/share/man/man4/rsufw.4
  projects/bhyve_npt_pmap/sys/arm/freescale/imx/files.imx51
     - copied unchanged from r253953, head/sys/arm/freescale/imx/files.imx51
  projects/bhyve_npt_pmap/sys/arm/freescale/imx/std.imx51
     - copied unchanged from r253953, head/sys/arm/freescale/imx/std.imx51
  projects/bhyve_npt_pmap/sys/contrib/dev/rsu/
     - copied from r253953, head/sys/contrib/dev/rsu/
  projects/bhyve_npt_pmap/sys/dev/cxgbe/t4_tracer.c
     - copied unchanged from r253953, head/sys/dev/cxgbe/t4_tracer.c
  projects/bhyve_npt_pmap/sys/dev/iwn/if_iwn_devid.h
     - copied unchanged from r253953, head/sys/dev/iwn/if_iwn_devid.h
  projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_rsu.c
     - copied unchanged from r253953, head/sys/dev/usb/wlan/if_rsu.c
  projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_rsureg.h
     - copied unchanged from r253953, head/sys/dev/usb/wlan/if_rsureg.h
  projects/bhyve_npt_pmap/sys/dev/wi/if_wi_macio.c
     - copied unchanged from r253953, head/sys/dev/wi/if_wi_macio.c
  projects/bhyve_npt_pmap/sys/libkern/flsll.c
     - copied unchanged from r253953, head/sys/libkern/flsll.c
  projects/bhyve_npt_pmap/sys/modules/usb/rsu/
     - copied from r253953, head/sys/modules/usb/rsu/
  projects/bhyve_npt_pmap/sys/modules/usb/rsufw/
     - copied from r253953, head/sys/modules/usb/rsufw/
  projects/bhyve_npt_pmap/sys/modules/usb/runfw/
     - copied from r253953, head/sys/modules/usb/runfw/
  projects/bhyve_npt_pmap/tools/build/options/WITH_GNU_PATCH
     - copied unchanged from r253953, head/tools/build/options/WITH_GNU_PATCH
Deleted:
  projects/bhyve_npt_pmap/bin/sh/init.h
  projects/bhyve_npt_pmap/bin/sh/mkinit.c
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_DYN.bad.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/translators/man.TestTransStability.d
  projects/bhyve_npt_pmap/contrib/apr-util/aprutil.dsp
  projects/bhyve_npt_pmap/contrib/apr-util/crypto/apr_crypto_nss.dsp
  projects/bhyve_npt_pmap/contrib/apr-util/crypto/apr_crypto_openssl.dsp
  projects/bhyve_npt_pmap/contrib/apr-util/dbd/apr_dbd_freetds.dsp
  projects/bhyve_npt_pmap/contrib/apr-util/dbd/apr_dbd_mysql.dsp
  projects/bhyve_npt_pmap/contrib/apr-util/dbd/apr_dbd_odbc.dsp
  projects/bhyve_npt_pmap/contrib/apr-util/dbd/apr_dbd_oracle.dsp
  projects/bhyve_npt_pmap/contrib/apr-util/dbd/apr_dbd_pgsql.dsp
  projects/bhyve_npt_pmap/contrib/apr-util/dbd/apr_dbd_sqlite2.dsp
  projects/bhyve_npt_pmap/contrib/apr-util/dbd/apr_dbd_sqlite3.dsp
  projects/bhyve_npt_pmap/contrib/apr-util/dbm/apr_dbm_db.dsp
  projects/bhyve_npt_pmap/contrib/apr-util/dbm/apr_dbm_gdbm.dsp
  projects/bhyve_npt_pmap/contrib/apr-util/ldap/apr_ldap.dsp
  projects/bhyve_npt_pmap/contrib/apr-util/libaprutil.dsp
  projects/bhyve_npt_pmap/contrib/apr-util/test/testutildll.dsp
  projects/bhyve_npt_pmap/contrib/apr-util/test/testutillib.dsp
  projects/bhyve_npt_pmap/contrib/serf/Makefile.in
  projects/bhyve_npt_pmap/contrib/serf/auth/auth_kerb.c
  projects/bhyve_npt_pmap/contrib/serf/auth/auth_kerb.h
  projects/bhyve_npt_pmap/contrib/serf/auth/auth_kerb_gss.c
  projects/bhyve_npt_pmap/contrib/serf/auth/auth_kerb_sspi.c
  projects/bhyve_npt_pmap/contrib/serf/build/apr_common.m4
  projects/bhyve_npt_pmap/contrib/serf/build/config.guess
  projects/bhyve_npt_pmap/contrib/serf/build/config.sub
  projects/bhyve_npt_pmap/contrib/serf/build/find_apr.m4
  projects/bhyve_npt_pmap/contrib/serf/build/find_apu.m4
  projects/bhyve_npt_pmap/contrib/serf/build/get-version.sh
  projects/bhyve_npt_pmap/contrib/serf/build/install.sh
  projects/bhyve_npt_pmap/contrib/serf/build/serf.def
  projects/bhyve_npt_pmap/contrib/serf/buildconf
  projects/bhyve_npt_pmap/contrib/serf/config.layout
  projects/bhyve_npt_pmap/contrib/serf/configure
  projects/bhyve_npt_pmap/contrib/serf/configure.in
  projects/bhyve_npt_pmap/contrib/serf/serf.mak
  projects/bhyve_npt_pmap/contrib/serf/serf.pc.in
  projects/bhyve_npt_pmap/contrib/serf/serfmake
  projects/bhyve_npt_pmap/sys/arm/freescale/imx/imx.files
  projects/bhyve_npt_pmap/sys/arm/freescale/imx/std.imx
  projects/bhyve_npt_pmap/sys/modules/runfw/
  projects/bhyve_npt_pmap/tools/build/options/WITH_BSD_PATCH
Modified:
  projects/bhyve_npt_pmap/MAINTAINERS   (contents, props changed)
  projects/bhyve_npt_pmap/Makefile
  projects/bhyve_npt_pmap/UPDATING
  projects/bhyve_npt_pmap/bin/sh/Makefile
  projects/bhyve_npt_pmap/bin/sh/TOUR
  projects/bhyve_npt_pmap/bin/sh/eval.c
  projects/bhyve_npt_pmap/bin/sh/eval.h
  projects/bhyve_npt_pmap/bin/sh/exec.c
  projects/bhyve_npt_pmap/bin/sh/input.c
  projects/bhyve_npt_pmap/bin/sh/input.h
  projects/bhyve_npt_pmap/bin/sh/jobs.c
  projects/bhyve_npt_pmap/bin/sh/main.c
  projects/bhyve_npt_pmap/bin/sh/output.c
  projects/bhyve_npt_pmap/bin/sh/parser.c
  projects/bhyve_npt_pmap/bin/sh/parser.h
  projects/bhyve_npt_pmap/bin/sh/redir.c
  projects/bhyve_npt_pmap/bin/sh/redir.h
  projects/bhyve_npt_pmap/bin/sh/shell.h
  projects/bhyve_npt_pmap/bin/sh/trap.c
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PRINT_VOID.bad.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/err.D_PROTO_LEN.bad.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.copyin.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/speculation/err.BufSizeVariations2.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_PROTO_LEN.bad.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/err.D_TRACE_VOID.bad.d
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cg.c
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.c
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libdtrace/i386/dt_isadep.c
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/tools/ctf/cvt/ctftools.h
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/tools/ctf/cvt/st_parse.c
  projects/bhyve_npt_pmap/contrib/apr-util/CHANGES
  projects/bhyve_npt_pmap/contrib/apr-util/Makefile.win
  projects/bhyve_npt_pmap/contrib/apr-util/NWGNUmakefile
  projects/bhyve_npt_pmap/contrib/apr-util/apr-util.spec
  projects/bhyve_npt_pmap/contrib/apr-util/buckets/apr_brigade.c
  projects/bhyve_npt_pmap/contrib/apr-util/buckets/apr_buckets_alloc.c
  projects/bhyve_npt_pmap/contrib/apr-util/build-outputs.mk
  projects/bhyve_npt_pmap/contrib/apr-util/build.conf
  projects/bhyve_npt_pmap/contrib/apr-util/configure
  projects/bhyve_npt_pmap/contrib/apr-util/configure.in
  projects/bhyve_npt_pmap/contrib/apr-util/crypto/apr_crypto.c
  projects/bhyve_npt_pmap/contrib/apr-util/crypto/apr_crypto_nss.c
  projects/bhyve_npt_pmap/contrib/apr-util/crypto/apr_crypto_openssl.c
  projects/bhyve_npt_pmap/contrib/apr-util/crypto/apr_md5.c
  projects/bhyve_npt_pmap/contrib/apr-util/dbd/NWGNUdbdmysql
  projects/bhyve_npt_pmap/contrib/apr-util/dbd/apr_dbd_freetds.c
  projects/bhyve_npt_pmap/contrib/apr-util/dbd/apr_dbd_mysql.c
  projects/bhyve_npt_pmap/contrib/apr-util/dbd/apr_dbd_pgsql.c
  projects/bhyve_npt_pmap/contrib/apr-util/dbd/apr_dbd_sqlite2.c
  projects/bhyve_npt_pmap/contrib/apr-util/hooks/apr_hooks.c
  projects/bhyve_npt_pmap/contrib/apr-util/include/apr_base64.h
  projects/bhyve_npt_pmap/contrib/apr-util/include/apr_buckets.h
  projects/bhyve_npt_pmap/contrib/apr-util/include/apr_md5.h
  projects/bhyve_npt_pmap/contrib/apr-util/include/apr_queue.h
  projects/bhyve_npt_pmap/contrib/apr-util/include/apu.h.in
  projects/bhyve_npt_pmap/contrib/apr-util/include/apu_version.h
  projects/bhyve_npt_pmap/contrib/apr-util/include/private/apr_crypto_internal.h
  projects/bhyve_npt_pmap/contrib/apr-util/memcache/apr_memcache.c
  projects/bhyve_npt_pmap/contrib/apr-util/misc/apr_thread_pool.c
  projects/bhyve_npt_pmap/contrib/apr-util/test/Makefile.in
  projects/bhyve_npt_pmap/contrib/apr-util/test/Makefile.win
  projects/bhyve_npt_pmap/contrib/apr-util/test/NWGNUmakefile
  projects/bhyve_npt_pmap/contrib/apr-util/test/testbuckets.c
  projects/bhyve_npt_pmap/contrib/apr-util/test/testmd5.c
  projects/bhyve_npt_pmap/contrib/apr-util/test/testmemcache.c
  projects/bhyve_npt_pmap/contrib/apr-util/test/testpass.c
  projects/bhyve_npt_pmap/contrib/apr-util/test/testuri.c
  projects/bhyve_npt_pmap/contrib/apr-util/test/testutil.c
  projects/bhyve_npt_pmap/contrib/apr-util/test/testutil.h
  projects/bhyve_npt_pmap/contrib/apr-util/uri/apr_uri.c
  projects/bhyve_npt_pmap/contrib/apr/CHANGES
  projects/bhyve_npt_pmap/contrib/apr/Makefile.win
  projects/bhyve_npt_pmap/contrib/apr/apr.spec
  projects/bhyve_npt_pmap/contrib/apr/atomic/unix/ia32.c
  projects/bhyve_npt_pmap/contrib/apr/atomic/unix/ppc.c
  projects/bhyve_npt_pmap/contrib/apr/atomic/unix/s390.c
  projects/bhyve_npt_pmap/contrib/apr/configure
  projects/bhyve_npt_pmap/contrib/apr/docs/pool-design.html
  projects/bhyve_npt_pmap/contrib/apr/file_io/unix/seek.c
  projects/bhyve_npt_pmap/contrib/apr/include/apr.hw
  projects/bhyve_npt_pmap/contrib/apr/include/apr_allocator.h
  projects/bhyve_npt_pmap/contrib/apr/include/apr_general.h
  projects/bhyve_npt_pmap/contrib/apr/include/apr_network_io.h
  projects/bhyve_npt_pmap/contrib/apr/include/apr_pools.h
  projects/bhyve_npt_pmap/contrib/apr/include/apr_strings.h
  projects/bhyve_npt_pmap/contrib/apr/include/apr_thread_proc.h
  projects/bhyve_npt_pmap/contrib/apr/include/apr_version.h
  projects/bhyve_npt_pmap/contrib/apr/libapr.rc
  projects/bhyve_npt_pmap/contrib/apr/network_io/unix/multicast.c
  projects/bhyve_npt_pmap/contrib/apr/network_io/unix/sendrecv.c
  projects/bhyve_npt_pmap/contrib/apr/network_io/unix/sockaddr.c
  projects/bhyve_npt_pmap/contrib/apr/network_io/unix/sockopt.c
  projects/bhyve_npt_pmap/contrib/apr/random/unix/sha2.c
  projects/bhyve_npt_pmap/contrib/apr/random/unix/sha2.h
  projects/bhyve_npt_pmap/contrib/apr/random/unix/sha2_glue.c
  projects/bhyve_npt_pmap/contrib/apr/tables/apr_tables.c
  projects/bhyve_npt_pmap/contrib/apr/threadproc/unix/thread.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rdata/generic/keydata_65533.c
  projects/bhyve_npt_pmap/contrib/binutils/ld/ldmain.c
  projects/bhyve_npt_pmap/contrib/bmake/ChangeLog
  projects/bhyve_npt_pmap/contrib/bmake/Makefile
  projects/bhyve_npt_pmap/contrib/bmake/bmake.1
  projects/bhyve_npt_pmap/contrib/bmake/bmake.cat1
  projects/bhyve_npt_pmap/contrib/bmake/compat.c
  projects/bhyve_npt_pmap/contrib/bmake/configure
  projects/bhyve_npt_pmap/contrib/bmake/configure.in
  projects/bhyve_npt_pmap/contrib/bmake/job.c
  projects/bhyve_npt_pmap/contrib/bmake/job.h
  projects/bhyve_npt_pmap/contrib/bmake/main.c
  projects/bhyve_npt_pmap/contrib/bmake/make.1
  projects/bhyve_npt_pmap/contrib/bmake/make.h
  projects/bhyve_npt_pmap/contrib/bmake/meta.c
  projects/bhyve_npt_pmap/contrib/bmake/mk/ChangeLog
  projects/bhyve_npt_pmap/contrib/bmake/mk/init.mk
  projects/bhyve_npt_pmap/contrib/bmake/mk/install-mk
  projects/bhyve_npt_pmap/contrib/bmake/mk/lib.mk
  projects/bhyve_npt_pmap/contrib/bmake/mk/meta2deps.py
  projects/bhyve_npt_pmap/contrib/bmake/mk/own.mk
  projects/bhyve_npt_pmap/contrib/bmake/mk/prog.mk
  projects/bhyve_npt_pmap/contrib/bmake/parse.c
  projects/bhyve_npt_pmap/contrib/bmake/unit-tests/Makefile.in
  projects/bhyve_npt_pmap/contrib/bmake/var.c
  projects/bhyve_npt_pmap/contrib/llvm/tools/clang/lib/Headers/cpuid.h
  projects/bhyve_npt_pmap/contrib/serf/CHANGES
  projects/bhyve_npt_pmap/contrib/serf/README
  projects/bhyve_npt_pmap/contrib/serf/auth/auth.c
  projects/bhyve_npt_pmap/contrib/serf/auth/auth.h
  projects/bhyve_npt_pmap/contrib/serf/auth/auth_basic.c
  projects/bhyve_npt_pmap/contrib/serf/auth/auth_digest.c
  projects/bhyve_npt_pmap/contrib/serf/buckets/aggregate_buckets.c
  projects/bhyve_npt_pmap/contrib/serf/buckets/buckets.c
  projects/bhyve_npt_pmap/contrib/serf/buckets/dechunk_buckets.c
  projects/bhyve_npt_pmap/contrib/serf/buckets/headers_buckets.c
  projects/bhyve_npt_pmap/contrib/serf/buckets/limit_buckets.c
  projects/bhyve_npt_pmap/contrib/serf/buckets/request_buckets.c
  projects/bhyve_npt_pmap/contrib/serf/buckets/response_buckets.c
  projects/bhyve_npt_pmap/contrib/serf/buckets/simple_buckets.c
  projects/bhyve_npt_pmap/contrib/serf/buckets/ssl_buckets.c
  projects/bhyve_npt_pmap/contrib/serf/build/gen_def.py
  projects/bhyve_npt_pmap/contrib/serf/context.c
  projects/bhyve_npt_pmap/contrib/serf/incoming.c
  projects/bhyve_npt_pmap/contrib/serf/outgoing.c
  projects/bhyve_npt_pmap/contrib/serf/serf.h
  projects/bhyve_npt_pmap/contrib/serf/serf_bucket_types.h
  projects/bhyve_npt_pmap/contrib/serf/serf_bucket_util.h
  projects/bhyve_npt_pmap/contrib/serf/serf_private.h
  projects/bhyve_npt_pmap/contrib/serf/ssltunnel.c
  projects/bhyve_npt_pmap/contrib/subversion/CHANGES
  projects/bhyve_npt_pmap/contrib/subversion/Makefile.in
  projects/bhyve_npt_pmap/contrib/subversion/build-outputs.mk
  projects/bhyve_npt_pmap/contrib/subversion/configure
  projects/bhyve_npt_pmap/contrib/subversion/configure.ac
  projects/bhyve_npt_pmap/contrib/subversion/get-deps.sh
  projects/bhyve_npt_pmap/contrib/subversion/subversion/include/private/svn_client_private.h
  projects/bhyve_npt_pmap/contrib/subversion/subversion/include/private/svn_io_private.h
  projects/bhyve_npt_pmap/contrib/subversion/subversion/include/private/svn_ra_private.h
  projects/bhyve_npt_pmap/contrib/subversion/subversion/include/svn_version.h
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_client/client.h
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_client/commit.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_client/copy.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_client/diff.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_client/diff_local.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_client/log.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_client/merge.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_client/mergeinfo.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_client/ra.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_client/switch.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_delta/compat.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_fs_base/bdb/env.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_fs_base/tree.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_fs_fs/fs_fs.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_fs_fs/rep-cache-db.h
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_fs_fs/tree.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_ra/ra_loader.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_ra/util.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_ra_serf/blame.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_ra_serf/commit.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_ra_serf/getdate.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_ra_serf/getlocations.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_ra_serf/getlocationsegments.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_ra_serf/getlocks.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_ra_serf/inherited_props.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_ra_serf/log.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_ra_serf/mergeinfo.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_ra_serf/options.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_ra_serf/property.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_ra_serf/ra_serf.h
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_ra_serf/replay.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_ra_serf/serf.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_ra_serf/update.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_ra_serf/util.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_ra_serf/xml.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_ra_svn/client.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_ra_svn/protocol
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_repos/fs-wrap.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_subr/config_file.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_subr/gpg_agent.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_subr/internal_statements.h
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_subr/io.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_subr/named_atomic.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_subr/sqlite.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_subr/stream.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_subr/subst.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_subr/utf.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_wc/adm_ops.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_wc/crop.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_wc/externals.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_wc/update_editor.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_wc/upgrade.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_wc/wc-checks.h
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_wc/wc-metadata.h
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_wc/wc-queries.h
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_wc/wc-queries.sql
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_wc/wc_db.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_wc/wc_db.h
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_wc/wc_db_update_move.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_wc/wc_db_wcroot.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/libsvn_wc/workqueue.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/svn/cl.h
  projects/bhyve_npt_pmap/contrib/subversion/subversion/svn/conflict-callbacks.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/svn/file-merge.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/svn/merge-cmd.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/svn/mergeinfo-cmd.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/svn/svn.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/svn/util.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/svnadmin/svnadmin.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/svnlook/svnlook.c
  projects/bhyve_npt_pmap/contrib/subversion/subversion/svnserve/serve.c
  projects/bhyve_npt_pmap/contrib/subversion/win-tests.py
  projects/bhyve_npt_pmap/contrib/tcpdump/tcpdump.c
  projects/bhyve_npt_pmap/etc/Makefile
  projects/bhyve_npt_pmap/etc/devd/usb.conf
  projects/bhyve_npt_pmap/etc/mtree/BSD.usr.dist
  projects/bhyve_npt_pmap/etc/network.subr
  projects/bhyve_npt_pmap/etc/rc.d/netif
  projects/bhyve_npt_pmap/gnu/usr.bin/patch/Makefile
  projects/bhyve_npt_pmap/lib/libc++/Makefile
  projects/bhyve_npt_pmap/lib/libc/gen/sysctl.3
  projects/bhyve_npt_pmap/lib/libc/sys/kqueue.2
  projects/bhyve_npt_pmap/lib/libfetch/common.c
  projects/bhyve_npt_pmap/lib/libfetch/common.h
  projects/bhyve_npt_pmap/lib/libfetch/fetch.3
  projects/bhyve_npt_pmap/lib/libfetch/http.c
  projects/bhyve_npt_pmap/lib/libusb/Makefile
  projects/bhyve_npt_pmap/lib/msun/src/math.h
  projects/bhyve_npt_pmap/release/ia64/mkisoimages.sh
  projects/bhyve_npt_pmap/release/sparc64/mkisoimages.sh
  projects/bhyve_npt_pmap/sbin/fsck_ffs/fsck.h
  projects/bhyve_npt_pmap/sbin/fsck_ffs/fsck_ffs.8
  projects/bhyve_npt_pmap/sbin/fsck_ffs/fsutil.c
  projects/bhyve_npt_pmap/sbin/fsck_ffs/main.c
  projects/bhyve_npt_pmap/sbin/ipfw/ipfw.8
  projects/bhyve_npt_pmap/sbin/mdconfig/mdconfig.c
  projects/bhyve_npt_pmap/sbin/route/route.c
  projects/bhyve_npt_pmap/sbin/swapon/swapon.c
  projects/bhyve_npt_pmap/share/man/man4/Makefile
  projects/bhyve_npt_pmap/share/man/man4/bridge.4
  projects/bhyve_npt_pmap/share/man/man5/rc.conf.5
  projects/bhyve_npt_pmap/share/man/man9/Makefile
  projects/bhyve_npt_pmap/share/man/man9/microuptime.9
  projects/bhyve_npt_pmap/share/mk/bsd.own.mk
  projects/bhyve_npt_pmap/sys/amd64/amd64/identcpu.c
  projects/bhyve_npt_pmap/sys/amd64/amd64/initcpu.c
  projects/bhyve_npt_pmap/sys/amd64/amd64/pmap.c
  projects/bhyve_npt_pmap/sys/amd64/amd64/sys_machdep.c
  projects/bhyve_npt_pmap/sys/amd64/include/md_var.h
  projects/bhyve_npt_pmap/sys/amd64/vmm/intel/vmx.c
  projects/bhyve_npt_pmap/sys/amd64/vmm/vmm.c
  projects/bhyve_npt_pmap/sys/amd64/vmm/vmm_instruction_emul.c
  projects/bhyve_npt_pmap/sys/arm/arm/busdma_machdep-v6.c
  projects/bhyve_npt_pmap/sys/arm/arm/cpufunc.c
  projects/bhyve_npt_pmap/sys/arm/arm/gic.c
  projects/bhyve_npt_pmap/sys/arm/arm/identcpu.c
  projects/bhyve_npt_pmap/sys/arm/arm/pl310.c
  projects/bhyve_npt_pmap/sys/arm/conf/BEAGLEBONE
  projects/bhyve_npt_pmap/sys/arm/conf/EFIKA_MX
  projects/bhyve_npt_pmap/sys/arm/conf/RPI-B
  projects/bhyve_npt_pmap/sys/arm/freescale/imx/console.c
  projects/bhyve_npt_pmap/sys/arm/include/armreg.h
  projects/bhyve_npt_pmap/sys/arm/include/kdb.h
  projects/bhyve_npt_pmap/sys/arm/include/smp.h
  projects/bhyve_npt_pmap/sys/arm/ti/am335x/am335x_prcm.c
  projects/bhyve_npt_pmap/sys/arm/ti/ti_prcm.h
  projects/bhyve_npt_pmap/sys/boot/arm/uboot/Makefile
  projects/bhyve_npt_pmap/sys/boot/fdt/dts/am335x.dtsi
  projects/bhyve_npt_pmap/sys/boot/ficl/loader.c
  projects/bhyve_npt_pmap/sys/boot/forth/loader.rc
  projects/bhyve_npt_pmap/sys/cam/ata/ata_da.c
  projects/bhyve_npt_pmap/sys/cam/scsi/scsi_da.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/ddt.h
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_send.h
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_destroy.h
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
  projects/bhyve_npt_pmap/sys/cddl/dev/dtrace/amd64/dis_tables.c
  projects/bhyve_npt_pmap/sys/cddl/dev/dtrace/amd64/dis_tables.h
  projects/bhyve_npt_pmap/sys/cddl/dev/dtrace/i386/dis_tables.c
  projects/bhyve_npt_pmap/sys/cddl/dev/dtrace/i386/dis_tables.h
  projects/bhyve_npt_pmap/sys/conf/NOTES
  projects/bhyve_npt_pmap/sys/conf/WITHOUT_SOURCELESS_UCODE
  projects/bhyve_npt_pmap/sys/conf/files
  projects/bhyve_npt_pmap/sys/conf/newvers.sh
  projects/bhyve_npt_pmap/sys/conf/options
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/changes.txt   (contents, props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/common/dmextern.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/common/getopt.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/asloffset.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/asloperands.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/asloptions.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/dttemplate.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/executer/exoparg1.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/hardware/hwtimer.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/namespace/nspredef.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/namespace/nswalk.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/namespace/nsxfeval.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/tables/tbfadt.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/tables/tbxfroot.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/utilities/utglobal.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/utilities/utosi.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/utilities/utxface.c
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/include/acglobal.h
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/include/aclocal.h
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/include/acnamesp.h
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/include/acpixf.h
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/include/actables.h
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/include/actypes.h
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/include/acutils.h
  projects/bhyve_npt_pmap/sys/dev/ahci/ahci.c
  projects/bhyve_npt_pmap/sys/dev/ahci/ahci.h
  projects/bhyve_npt_pmap/sys/dev/aic7xxx/aic7xxx_pci.c
  projects/bhyve_npt_pmap/sys/dev/ata/chipsets/ata-promise.c
  projects/bhyve_npt_pmap/sys/dev/ciss/ciss.c
  projects/bhyve_npt_pmap/sys/dev/cxgbe/adapter.h
  projects/bhyve_npt_pmap/sys/dev/cxgbe/common/t4_hw.c
  projects/bhyve_npt_pmap/sys/dev/cxgbe/common/t4_hw.h
  projects/bhyve_npt_pmap/sys/dev/cxgbe/t4_ioctl.h
  projects/bhyve_npt_pmap/sys/dev/cxgbe/t4_main.c
  projects/bhyve_npt_pmap/sys/dev/cxgbe/t4_sge.c
  projects/bhyve_npt_pmap/sys/dev/drm2/i915/intel_ringbuffer.c
  projects/bhyve_npt_pmap/sys/dev/drm2/ttm/ttm_bo_vm.c
  projects/bhyve_npt_pmap/sys/dev/filemon/filemon.c
  projects/bhyve_npt_pmap/sys/dev/ipmi/ipmi_isa.c
  projects/bhyve_npt_pmap/sys/dev/ipmi/ipmivars.h
  projects/bhyve_npt_pmap/sys/dev/iwn/if_iwn.c
  projects/bhyve_npt_pmap/sys/dev/iwn/if_iwnreg.h
  projects/bhyve_npt_pmap/sys/dev/ixgbe/ixgbe.c
  projects/bhyve_npt_pmap/sys/dev/mps/mps_sas.c
  projects/bhyve_npt_pmap/sys/dev/scc/scc_bfe.h
  projects/bhyve_npt_pmap/sys/dev/scc/scc_bfe_ebus.c
  projects/bhyve_npt_pmap/sys/dev/scc/scc_bfe_macio.c
  projects/bhyve_npt_pmap/sys/dev/scc/scc_bfe_quicc.c
  projects/bhyve_npt_pmap/sys/dev/scc/scc_bfe_sbus.c
  projects/bhyve_npt_pmap/sys/dev/scc/scc_core.c
  projects/bhyve_npt_pmap/sys/dev/scc/scc_dev_quicc.c
  projects/bhyve_npt_pmap/sys/dev/scc/scc_dev_sab82532.c
  projects/bhyve_npt_pmap/sys/dev/scc/scc_dev_z8530.c
  projects/bhyve_npt_pmap/sys/dev/sound/pci/ds1.c
  projects/bhyve_npt_pmap/sys/dev/uart/uart_bus_pci.c
  projects/bhyve_npt_pmap/sys/dev/usb/gadget/g_audio.c
  projects/bhyve_npt_pmap/sys/dev/usb/gadget/g_keyboard.c
  projects/bhyve_npt_pmap/sys/dev/usb/gadget/g_modem.c
  projects/bhyve_npt_pmap/sys/dev/usb/gadget/g_mouse.c
  projects/bhyve_npt_pmap/sys/dev/usb/net/if_ipheth.c
  projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_rumvar.h
  projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_runvar.h
  projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_uathvar.h
  projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_upgtvar.h
  projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_uralvar.h
  projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_urtwnreg.h
  projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_urtwvar.h
  projects/bhyve_npt_pmap/sys/dev/usb/wlan/if_zydreg.h
  projects/bhyve_npt_pmap/sys/dev/watchdog/watchdog.c
  projects/bhyve_npt_pmap/sys/dev/wi/if_wi.c
  projects/bhyve_npt_pmap/sys/fs/cd9660/iso.h
  projects/bhyve_npt_pmap/sys/fs/devfs/devfs_rule.c
  projects/bhyve_npt_pmap/sys/fs/ext2fs/ext2_hash.c
  projects/bhyve_npt_pmap/sys/fs/ext2fs/ext2_lookup.c
  projects/bhyve_npt_pmap/sys/fs/fuse/fuse_kernel.h
  projects/bhyve_npt_pmap/sys/fs/tmpfs/tmpfs_vnops.c
  projects/bhyve_npt_pmap/sys/gdb/gdb_cons.c
  projects/bhyve_npt_pmap/sys/geom/part/g_part.c
  projects/bhyve_npt_pmap/sys/geom/part/g_part_apm.c
  projects/bhyve_npt_pmap/sys/geom/raid/g_raid.c
  projects/bhyve_npt_pmap/sys/geom/raid/g_raid_ctl.c
  projects/bhyve_npt_pmap/sys/i386/i386/identcpu.c
  projects/bhyve_npt_pmap/sys/i386/i386/initcpu.c
  projects/bhyve_npt_pmap/sys/i386/i386/pmap.c
  projects/bhyve_npt_pmap/sys/i386/i386/sys_machdep.c
  projects/bhyve_npt_pmap/sys/i386/include/md_var.h
  projects/bhyve_npt_pmap/sys/kern/init_main.c
  projects/bhyve_npt_pmap/sys/kern/kern_malloc.c
  projects/bhyve_npt_pmap/sys/kern/kern_ntptime.c
  projects/bhyve_npt_pmap/sys/kern/kern_uuid.c
  projects/bhyve_npt_pmap/sys/kern/sched_4bsd.c
  projects/bhyve_npt_pmap/sys/kern/subr_vmem.c
  projects/bhyve_npt_pmap/sys/kern/uipc_shm.c
  projects/bhyve_npt_pmap/sys/kern/uipc_syscalls.c
  projects/bhyve_npt_pmap/sys/kern/vfs_aio.c
  projects/bhyve_npt_pmap/sys/kern/vfs_mountroot.c
  projects/bhyve_npt_pmap/sys/kern/vfs_subr.c
  projects/bhyve_npt_pmap/sys/mips/conf/DIR-825
  projects/bhyve_npt_pmap/sys/mips/conf/DIR-825.hints
  projects/bhyve_npt_pmap/sys/modules/Makefile
  projects/bhyve_npt_pmap/sys/modules/cxgbe/if_cxgbe/Makefile
  projects/bhyve_npt_pmap/sys/modules/dtrace/dtrace/Makefile
  projects/bhyve_npt_pmap/sys/modules/iwn/Makefile
  projects/bhyve_npt_pmap/sys/modules/usb/Makefile
  projects/bhyve_npt_pmap/sys/modules/wi/Makefile
  projects/bhyve_npt_pmap/sys/net/ieee8023ad_lacp.c
  projects/bhyve_npt_pmap/sys/net/ieee8023ad_lacp.h
  projects/bhyve_npt_pmap/sys/net/if_bridge.c
  projects/bhyve_npt_pmap/sys/net/if_ethersubr.c
  projects/bhyve_npt_pmap/sys/net/if_lagg.c
  projects/bhyve_npt_pmap/sys/net/if_lagg.h
  projects/bhyve_npt_pmap/sys/net/rtsock.c
  projects/bhyve_npt_pmap/sys/net80211/ieee80211.h
  projects/bhyve_npt_pmap/sys/net80211/ieee80211_mesh.c
  projects/bhyve_npt_pmap/sys/net80211/ieee80211_output.c
  projects/bhyve_npt_pmap/sys/net80211/ieee80211_proto.h
  projects/bhyve_npt_pmap/sys/netinet/sctp_usrreq.c
  projects/bhyve_npt_pmap/sys/netinet6/in6.c
  projects/bhyve_npt_pmap/sys/netinet6/in6_ifattach.c
  projects/bhyve_npt_pmap/sys/netinet6/nd6.c
  projects/bhyve_npt_pmap/sys/netpfil/pf/if_pfsync.c
  projects/bhyve_npt_pmap/sys/nfs/bootp_subr.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/en_netdev.c
  projects/bhyve_npt_pmap/sys/ofed/drivers/net/mlx4/en_tx.c
  projects/bhyve_npt_pmap/sys/ofed/include/linux/module.h
  projects/bhyve_npt_pmap/sys/powerpc/include/spr.h
  projects/bhyve_npt_pmap/sys/powerpc/ofw/ofw_real.c
  projects/bhyve_npt_pmap/sys/powerpc/powermac/macio.c
  projects/bhyve_npt_pmap/sys/powerpc/powermac/maciovar.h
  projects/bhyve_npt_pmap/sys/sparc64/include/pmap.h
  projects/bhyve_npt_pmap/sys/sparc64/sparc64/pmap.c
  projects/bhyve_npt_pmap/sys/sys/kernel.h
  projects/bhyve_npt_pmap/sys/sys/libkern.h
  projects/bhyve_npt_pmap/sys/sys/param.h
  projects/bhyve_npt_pmap/sys/sys/priv.h
  projects/bhyve_npt_pmap/sys/sys/sched.h
  projects/bhyve_npt_pmap/sys/sys/uuid.h
  projects/bhyve_npt_pmap/sys/vm/uma_int.h
  projects/bhyve_npt_pmap/sys/vm/vm.h
  projects/bhyve_npt_pmap/sys/vm/vm_glue.c
  projects/bhyve_npt_pmap/sys/vm/vm_map.c
  projects/bhyve_npt_pmap/sys/vm/vm_pageout.c
  projects/bhyve_npt_pmap/sys/vm/vm_param.h
  projects/bhyve_npt_pmap/sys/vm/vnode_pager.c
  projects/bhyve_npt_pmap/sys/x86/include/specialreg.h
  projects/bhyve_npt_pmap/tools/tools/crypto/ipsecstats.c
  projects/bhyve_npt_pmap/tools/tools/cxgbetool/cxgbetool.c
  projects/bhyve_npt_pmap/tools/tools/sysdoc/tunables.mdoc
  projects/bhyve_npt_pmap/tools/tools/zfsboottest/Makefile
  projects/bhyve_npt_pmap/usr.bin/bmake/Makefile
  projects/bhyve_npt_pmap/usr.bin/bmake/config.h
  projects/bhyve_npt_pmap/usr.bin/bmake/unit-tests/Makefile
  projects/bhyve_npt_pmap/usr.bin/fetch/fetch.1
  projects/bhyve_npt_pmap/usr.bin/fetch/fetch.c
  projects/bhyve_npt_pmap/usr.bin/find/function.c
  projects/bhyve_npt_pmap/usr.bin/grep/regex/tre-fastmatch.c
  projects/bhyve_npt_pmap/usr.bin/patch/Makefile
  projects/bhyve_npt_pmap/usr.bin/patch/patch.c
  projects/bhyve_npt_pmap/usr.bin/script/script.1
  projects/bhyve_npt_pmap/usr.bin/svn/lib/libapr_util/Makefile
  projects/bhyve_npt_pmap/usr.bin/svn/lib/libapr_util/apu.h
  projects/bhyve_npt_pmap/usr.bin/svn/lib/libserf/Makefile
  projects/bhyve_npt_pmap/usr.bin/svn/svn_private_config.h
  projects/bhyve_npt_pmap/usr.bin/truss/syscall.h
  projects/bhyve_npt_pmap/usr.bin/truss/syscalls.c
  projects/bhyve_npt_pmap/usr.sbin/makefs/cd9660.c
  projects/bhyve_npt_pmap/usr.sbin/makefs/cd9660/iso9660_rrip.c
  projects/bhyve_npt_pmap/usr.sbin/makefs/ffs/ufs_bswap.h
  projects/bhyve_npt_pmap/usr.sbin/pkg/config.c
  projects/bhyve_npt_pmap/usr.sbin/watchdogd/watchdogd.8
  projects/bhyve_npt_pmap/usr.sbin/watchdogd/watchdogd.c
Directory Properties:
  projects/bhyve_npt_pmap/   (props changed)
  projects/bhyve_npt_pmap/cddl/   (props changed)
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/   (props changed)
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/print/   (props changed)
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
  projects/bhyve_npt_pmap/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/bhyve_npt_pmap/contrib/apr/   (props changed)
  projects/bhyve_npt_pmap/contrib/apr-util/   (props changed)
  projects/bhyve_npt_pmap/contrib/bind9/   (props changed)
  projects/bhyve_npt_pmap/contrib/binutils/   (props changed)
  projects/bhyve_npt_pmap/contrib/bmake/   (props changed)
  projects/bhyve_npt_pmap/contrib/llvm/   (props changed)
  projects/bhyve_npt_pmap/contrib/llvm/tools/clang/   (props changed)
  projects/bhyve_npt_pmap/contrib/serf/   (props changed)
  projects/bhyve_npt_pmap/contrib/subversion/   (props changed)
  projects/bhyve_npt_pmap/contrib/tcpdump/   (props changed)
  projects/bhyve_npt_pmap/lib/libc/   (props changed)
  projects/bhyve_npt_pmap/sbin/   (props changed)
  projects/bhyve_npt_pmap/sbin/ipfw/   (props changed)
  projects/bhyve_npt_pmap/share/man/man4/   (props changed)
  projects/bhyve_npt_pmap/sys/   (props changed)
  projects/bhyve_npt_pmap/sys/amd64/vmm/   (props changed)
  projects/bhyve_npt_pmap/sys/boot/   (props changed)
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/   (props changed)
  projects/bhyve_npt_pmap/sys/conf/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/common/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/compiler/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/debugger/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/disassembler/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/dispatcher/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/events/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/executer/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/hardware/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/namespace/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/parser/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/resources/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/tables/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/components/utilities/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/include/   (props changed)
  projects/bhyve_npt_pmap/sys/contrib/dev/acpica/os_specific/   (props changed)
  projects/bhyve_npt_pmap/sys/dev/usb/serial/uark.c   (props changed)

Modified: projects/bhyve_npt_pmap/MAINTAINERS
==============================================================================
--- projects/bhyve_npt_pmap/MAINTAINERS	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/MAINTAINERS	Wed Aug 21 19:30:07 2013	(r254607)
@@ -128,3 +128,6 @@ sysdoc		trhodes		Pre-commit review prefe
 sh(1)		jilles		Pre-commit review requested. This also applies
 				to kill(1), printf(1) and test(1) which are
 				compiled in as builtins.
+nvme(4)		jimharris	Pre-commit review requested.
+nvd(4)		jimharris	Pre-commit review requested.
+nvmecontrol(8)	jimharris	Pre-commit review requested.

Modified: projects/bhyve_npt_pmap/Makefile
==============================================================================
--- projects/bhyve_npt_pmap/Makefile	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/Makefile	Wed Aug 21 19:30:07 2013	(r254607)
@@ -130,11 +130,34 @@ _MAKEOBJDIRPREFIX!= /usr/bin/env -i PATH
 .error MAKEOBJDIRPREFIX can only be set in environment, not as a global\
 	(in make.conf(5)) or command-line variable.
 .endif
-MAKEPATH=	${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}
-BINMAKE= \
-	`if [ -x ${MAKEPATH}/make ]; then echo ${MAKEPATH}/make; else echo ${MAKE}; fi` \
+
+# We often need to use the tree's version of make to build it.
+# Choices add to complexity though.
+# We cannot blindly use a make which may not be the one we want
+# so be exlicit - until all choice is removed.
+.if !defined(WITHOUT_BMAKE)
+WANT_MAKE=	bmake
+.else
+WANT_MAKE=	fmake
+.endif
+MYMAKE=		${MAKEOBJDIRPREFIX}${.CURDIR}/make.${MACHINE}/${WANT_MAKE}
+.if defined(.PARSEDIR)
+HAVE_MAKE=	bmake
+.else
+HAVE_MAKE=	fmake
+.endif
+.if exists(${MYMAKE})
+SUB_MAKE:= ${MYMAKE} -m ${.CURDIR}/share/mk
+.elif ${WANT_MAKE} != ${HAVE_MAKE} || ${WANT_MAKE} != "bmake"
+# It may not exist yet but we may cause it to.
+# In the case of fmake, upgrade_checks may cause a newer version to be built.
+SUB_MAKE= `test -x ${MYMAKE} && echo ${MYMAKE} || echo ${MAKE}` \
 	-m ${.CURDIR}/share/mk
-_MAKE=	PATH=${PATH} ${BINMAKE} -f Makefile.inc1 TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH}
+.else
+SUB_MAKE= ${MAKE} -m ${.CURDIR}/share/mk
+.endif
+
+_MAKE=	PATH=${PATH} ${SUB_MAKE} -f Makefile.inc1 TARGET=${_TARGET} TARGET_ARCH=${_TARGET_ARCH}
 
 # Guess machine architecture from machine type, and vice versa.
 .if !defined(TARGET_ARCH) && defined(TARGET)
@@ -291,11 +314,13 @@ kernel: buildkernel installkernel
 # Perform a few tests to determine if the installed tools are adequate
 # for building the world.
 #
+# Note: if we ever need to care about the version of bmake, simply testing
+# MAKE_VERSION against a required version should suffice.
+#
 upgrade_checks:
-.if !defined(.PARSEDIR)
-.if !defined(WITHOUT_BMAKE)
-	(cd ${.CURDIR} && ${MAKE} bmake)
-.else
+.if ${HAVE_MAKE} != ${WANT_MAKE}
+	@(cd ${.CURDIR} && ${MAKE} ${WANT_MAKE:S,^f,,})
+.elif ${WANT_MAKE} == "fmake"
 	@if ! (cd ${.CURDIR}/tools/build/make_check && \
 	    PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
 	    PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
@@ -303,14 +328,13 @@ upgrade_checks:
 	    (cd ${.CURDIR} && ${MAKE} make); \
 	fi
 .endif
-.endif
 
 #
 # Upgrade make(1) to the current version using the installed
 # headers, libraries and tools.  Also, allow the location of
 # the system bsdmake-like utility to be overridden.
 #
-MMAKEENV=	MAKEOBJDIRPREFIX=${MAKEPATH} \
+MMAKEENV=	MAKEOBJDIRPREFIX=${MYMAKE:H} \
 		DESTDIR= \
 		INSTALL="sh ${.CURDIR}/tools/install.sh"
 MMAKE=		${MMAKEENV} ${MAKE} \
@@ -327,7 +351,7 @@ make bmake: .PHONY
 		${MMAKE} obj && \
 		${MMAKE} depend && \
 		${MMAKE} all && \
-		${MMAKE} install DESTDIR=${MAKEPATH} BINDIR=
+		${MMAKE} install DESTDIR=${MYMAKE:H} BINDIR= PROGNAME=${MYMAKE:T}
 
 tinderbox:
 	@cd ${.CURDIR} && ${MAKE} DOING_TINDERBOX=YES universe
@@ -377,7 +401,8 @@ MAKEFAIL=tee -a ${FAILFILE}
 MAKEFAIL=cat
 .endif
 
-universe: universe_prologue upgrade_checks
+universe_prologue:  upgrade_checks
+universe: universe_prologue
 universe_prologue:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> make universe started on ${STARTTIME}"
@@ -387,9 +412,9 @@ universe_prologue:
 .endif
 .for target in ${TARGETS}
 universe: universe_${target}
-.ORDER: universe_prologue upgrade_checks universe_${target} universe_epilogue
+universe_epilogue: universe_${target}
 universe_${target}: universe_${target}_prologue
-universe_${target}_prologue:
+universe_${target}_prologue: universe_prologue
 	@echo ">> ${target} started on `LC_ALL=C date`"
 .if !defined(MAKE_JUST_KERNELS)
 .for target_arch in ${TARGET_ARCHES_${target}}
@@ -397,7 +422,7 @@ universe_${target}: universe_${target}_$
 universe_${target}_${target_arch}: universe_${target}_prologue
 	@echo ">> ${target}.${target_arch} ${UNIVERSE_TARGET} started on `LC_ALL=C date`"
 	@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
-	    ${MAKE} ${JFLAG} ${UNIVERSE_TARGET} \
+	    ${SUB_MAKE} ${JFLAG} ${UNIVERSE_TARGET} \
 	    TARGET=${target} \
 	    TARGET_ARCH=${target_arch} \
 	    > _.${target}.${target_arch}.${UNIVERSE_TARGET} 2>&1 || \
@@ -418,11 +443,11 @@ universe_${target}: universe_${target}_k
 universe_${target}_kernels: universe_${target}_prologue
 .if exists(${KERNSRCDIR}/${target}/conf/NOTES)
 	@(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \
-	    ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
+	    ${SUB_MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
 	    (echo "${target} 'make LINT' failed," \
 	    "check _.${target}.makeLINT for details"| ${MAKEFAIL}))
 .endif
-	@cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} TARGET=${target} \
+	@cd ${.CURDIR} && ${SUB_MAKE} ${.MAKEFLAGS} TARGET=${target} \
 	    universe_kernels
 .endif
 	@echo ">> ${target} completed on `LC_ALL=C date`"
@@ -445,7 +470,7 @@ TARGET_ARCH_${kernel}!=	cd ${KERNSRCDIR}
 universe_kernconfs: universe_kernconf_${TARGET}_${kernel}
 universe_kernconf_${TARGET}_${kernel}:
 	@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
-	    ${MAKE} ${JFLAG} buildkernel \
+	    ${SUB_MAKE} ${JFLAG} buildkernel \
 	    TARGET=${TARGET} \
 	    TARGET_ARCH=${TARGET_ARCH_${kernel}} \
 	    KERNCONF=${kernel} \

Modified: projects/bhyve_npt_pmap/UPDATING
==============================================================================
--- projects/bhyve_npt_pmap/UPDATING	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/UPDATING	Wed Aug 21 19:30:07 2013	(r254607)
@@ -31,6 +31,26 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20130802:
+	find -delete can now delete the pathnames given as arguments,
+	instead of only files found below them or if the pathname did
+	not contain any slashes. Formerly, the following error message
+	would result:
+
+	find: -delete: : relative path potentially not safe
+
+	Deleting the pathnames given as arguments can be prevented
+	without error messages using -mindepth 1 or by changing
+	directory and passing "." as argument to find. This works in the
+	old as well as the new version of find.
+
+20130726:
+	Behavior of devfs rules path matching has been changed.
+	Pattern is now always matched against fully qualified devfs
+	path and slash characters must be explicitly matched by
+	slashes in pattern (FNM_PATHNAME). Rulesets involving devfs
+	subdirectories must be reviewed.
+
 20130716:
 	The default ARM ABI has changed to the ARM EABI. The old ABI is
 	incompatible with the ARM EABI and all programs and modules will

Modified: projects/bhyve_npt_pmap/bin/sh/Makefile
==============================================================================
--- projects/bhyve_npt_pmap/bin/sh/Makefile	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/bin/sh/Makefile	Wed Aug 21 19:30:07 2013	(r254607)
@@ -8,7 +8,7 @@ SHSRCS=	alias.c arith_yacc.c arith_yylex
 	histedit.c input.c jobs.c kill.c mail.c main.c memalloc.c miscbltin.c \
 	mystring.c options.c output.c parser.c printf.c redir.c show.c \
 	test.c trap.c var.c
-GENSRCS= builtins.c init.c nodes.c syntax.c
+GENSRCS= builtins.c nodes.c syntax.c
 GENHDRS= builtins.h nodes.h syntax.h token.h
 SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS}
 
@@ -30,26 +30,21 @@ WFORMAT=0
 	${.CURDIR}/../test \
 	${.CURDIR}/../../usr.bin/printf
 
-CLEANFILES+= mkinit mkinit.o mknodes mknodes.o \
+CLEANFILES+= mknodes mknodes.o \
 	mksyntax mksyntax.o
 CLEANFILES+= ${GENSRCS} ${GENHDRS}
 
-build-tools: mkinit mknodes mksyntax
+build-tools: mknodes mksyntax
 
 .ORDER: builtins.c builtins.h
 builtins.c builtins.h: mkbuiltins builtins.def
 	sh ${.CURDIR}/mkbuiltins ${.CURDIR}
 
-init.c: mkinit alias.c eval.c exec.c input.c jobs.c options.c parser.c \
-	redir.c trap.c var.c
-	./mkinit ${.ALLSRC:S/^mkinit$//}
-
 # XXX this is just to stop the default .c rule being used, so that the
 # intermediate object has a fixed name.
 # XXX we have a default .c rule, but no default .o rule.
 .o:
 	${CC} ${CFLAGS} ${LDFLAGS} ${.IMPSRC} ${LDLIBS} -o ${.TARGET}
-mkinit: mkinit.o
 mknodes: mknodes.o
 mksyntax: mksyntax.o
 

Modified: projects/bhyve_npt_pmap/bin/sh/TOUR
==============================================================================
--- projects/bhyve_npt_pmap/bin/sh/TOUR	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/bin/sh/TOUR	Wed Aug 21 19:30:07 2013	(r254607)
@@ -25,38 +25,11 @@ programs is:
         program         input files         generates
         -------         -----------         ---------
         mkbuiltins      builtins            builtins.h builtins.c
-        mkinit          *.c                 init.c
         mknodes         nodetypes           nodes.h nodes.c
         mksyntax            -               syntax.h syntax.c
         mktokens            -               token.h
 
-There are undoubtedly too many of these.  Mkinit searches all the
-C source files for entries looking like:
-
-        RESET {
-              x = 2;    /* executed when the shell does a longjmp
-                           back to the main command loop */
-        }
-
-It pulls this code out into routines which are when particular
-events occur.  The intent is to improve modularity by isolating
-the information about which modules need to be explicitly
-initialized/reset within the modules themselves.
-
-Mkinit recognizes several constructs for placing declarations in
-the init.c file.
-        INCLUDE "file.h"
-includes a file.  The storage class MKINIT makes a declaration
-available in the init.c file, for example:
-        MKINIT int funcnest;    /* depth of function calls */
-MKINIT alone on a line introduces a structure or union declara-
-tion:
-        MKINIT
-        struct redirtab {
-              short renamed[10];
-        };
-Preprocessor #define statements are copied to init.c without any
-special action to request this.
+There are undoubtedly too many of these.
 
 EXCEPTIONS:  Code for dealing with exceptions appears in
 exceptions.c.  The C language doesn't include exception handling,

Modified: projects/bhyve_npt_pmap/bin/sh/eval.c
==============================================================================
--- projects/bhyve_npt_pmap/bin/sh/eval.c	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/bin/sh/eval.c	Wed Aug 21 19:30:07 2013	(r254607)
@@ -76,7 +76,7 @@ __FBSDID("$FreeBSD$");
 
 int evalskip;			/* set if we are skipping commands */
 int skipcount;			/* number of levels to skip */
-MKINIT int loopnest;		/* current loop nesting level */
+static int loopnest;		/* current loop nesting level */
 int funcnest;			/* depth of function calls */
 static int builtin_flags;	/* evalcommand flags for builtins */
 
@@ -104,16 +104,13 @@ static void prehash(union node *);
  * Called to reset things after an exception.
  */
 
-#ifdef mkinit
-INCLUDE "eval.h"
-
-RESET {
+void
+reseteval(void)
+{
 	evalskip = 0;
 	loopnest = 0;
 	funcnest = 0;
 }
-#endif
-
 
 
 /*

Modified: projects/bhyve_npt_pmap/bin/sh/eval.h
==============================================================================
--- projects/bhyve_npt_pmap/bin/sh/eval.h	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/bin/sh/eval.h	Wed Aug 21 19:30:07 2013	(r254607)
@@ -46,6 +46,8 @@ struct backcmd {		/* result of evalbackc
 	struct job *jp;		/* job structure for command */
 };
 
+void reseteval(void);
+
 /* flags in argument to evaltree/evalstring */
 #define EV_EXIT 01		/* exit after evaluating tree */
 #define EV_TESTED 02		/* exit status is checked; ignore -e flag */

Modified: projects/bhyve_npt_pmap/bin/sh/exec.c
==============================================================================
--- projects/bhyve_npt_pmap/bin/sh/exec.c	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/bin/sh/exec.c	Wed Aug 21 19:30:07 2013	(r254607)
@@ -70,7 +70,6 @@ __FBSDID("$FreeBSD$");
 #include "syntax.h"
 #include "memalloc.h"
 #include "error.h"
-#include "init.h"
 #include "mystring.h"
 #include "show.h"
 #include "jobs.h"

Modified: projects/bhyve_npt_pmap/bin/sh/input.c
==============================================================================
--- projects/bhyve_npt_pmap/bin/sh/input.c	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/bin/sh/input.c	Wed Aug 21 19:30:07 2013	(r254607)
@@ -92,7 +92,7 @@ struct parsefile {
 
 int plinno = 1;			/* input line number */
 int parsenleft;			/* copy of parsefile->nleft */
-MKINIT int parselleft;		/* copy of parsefile->lleft */
+static int parselleft;		/* copy of parsefile->lleft */
 const char *parsenextc;		/* copy of parsefile->nextc */
 static char basebuf[BUFSIZ + 1];/* buffer for top level input file */
 static struct parsefile basepf = {	/* top level input file */
@@ -108,15 +108,12 @@ static void pushfile(void);
 static int preadfd(void);
 static void popstring(void);
 
-#ifdef mkinit
-INCLUDE "input.h"
-INCLUDE "error.h"
-
-RESET {
+void
+resetinput(void)
+{
 	popallfiles();
 	parselleft = parsenleft = 0;	/* clear input buffer */
 }
-#endif
 
 
 /*

Modified: projects/bhyve_npt_pmap/bin/sh/input.h
==============================================================================
--- projects/bhyve_npt_pmap/bin/sh/input.h	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/bin/sh/input.h	Wed Aug 21 19:30:07 2013	(r254607)
@@ -47,6 +47,7 @@ extern const char *parsenextc;	/* next c
 struct alias;
 struct parsefile;
 
+void resetinput(void);
 char *pfgets(char *, int);
 int pgetc(void);
 int preadbuffer(void);

Modified: projects/bhyve_npt_pmap/bin/sh/jobs.c
==============================================================================
--- projects/bhyve_npt_pmap/bin/sh/jobs.c	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/bin/sh/jobs.c	Wed Aug 21 19:30:07 2013	(r254607)
@@ -77,8 +77,8 @@ __FBSDID("$FreeBSD$");
 
 static struct job *jobtab;	/* array of jobs */
 static int njobs;		/* size of array */
-MKINIT pid_t backgndpid = -1;	/* pid of last background process */
-MKINIT struct job *bgjob = NULL; /* last background process */
+static pid_t backgndpid = -1;	/* pid of last background process */
+static struct job *bgjob = NULL; /* last background process */
 #if JOBS
 static struct job *jobmru;	/* most recently used job list */
 static pid_t initialpgrp;	/* pgrp of shell on invocation */
@@ -116,7 +116,7 @@ static void showjob(struct job *, int);
  * Turn job control on and off.
  */
 
-MKINIT int jobctl;
+static int jobctl;
 
 #if JOBS
 void

Modified: projects/bhyve_npt_pmap/bin/sh/main.c
==============================================================================
--- projects/bhyve_npt_pmap/bin/sh/main.c	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/bin/sh/main.c	Wed Aug 21 19:30:07 2013	(r254607)
@@ -68,10 +68,10 @@ __FBSDID("$FreeBSD$");
 #include "show.h"
 #include "memalloc.h"
 #include "error.h"
-#include "init.h"
 #include "mystring.h"
 #include "exec.h"
 #include "cd.h"
+#include "redir.h"
 #include "builtins.h"
 
 int rootpid;
@@ -79,6 +79,7 @@ int rootshell;
 struct jmploc main_handler;
 int localeisutf8, initial_localeisutf8;
 
+static void reset(void);
 static void cmdloop(int);
 static void read_profile(const char *);
 static char *find_dot_file(char *);
@@ -179,6 +180,14 @@ state4:
 	return 0;
 }
 
+static void
+reset(void)
+{
+	reseteval();
+	resetinput();
+	resetparser();
+	resetredir();
+}
 
 /*
  * Read and execute commands.  "Top" is nonzero for the top level command

Modified: projects/bhyve_npt_pmap/bin/sh/output.c
==============================================================================
--- projects/bhyve_npt_pmap/bin/sh/output.c	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/bin/sh/output.c	Wed Aug 21 19:30:07 2013	(r254607)
@@ -75,25 +75,6 @@ struct output memout = {NULL, 0, NULL, 0
 struct output *out1 = &output;
 struct output *out2 = &errout;
 
-
-
-#ifdef mkinit
-
-INCLUDE "output.h"
-INCLUDE "memalloc.h"
-
-RESET {
-	out1 = &output;
-	out2 = &errout;
-	if (memout.buf != NULL) {
-		ckfree(memout.buf);
-		memout.buf = NULL;
-	}
-}
-
-#endif
-
-
 void
 outcslow(int c, struct output *file)
 {

Modified: projects/bhyve_npt_pmap/bin/sh/parser.c
==============================================================================
--- projects/bhyve_npt_pmap/bin/sh/parser.c	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/bin/sh/parser.c	Wed Aug 21 19:30:07 2013	(r254607)
@@ -96,9 +96,9 @@ static struct heredoc *heredoclist;	/* l
 static int doprompt;		/* if set, prompt the user */
 static int needprompt;		/* true if interactive and at start of line */
 static int lasttoken;		/* last token read */
-MKINIT int tokpushback;		/* last token pushed back */
+int tokpushback;		/* last token pushed back */
 static char *wordtext;		/* text of last word returned by readtoken */
-MKINIT int checkkwd;            /* 1 == check for kwds, 2 == also eat newlines */
+static int checkkwd;
 static struct nodelist *backquotelist;
 static union node *redirnode;
 static struct heredoc *heredoc;
@@ -1819,13 +1819,13 @@ parsearith: {
 } /* end of readtoken */
 
 
-
-#ifdef mkinit
-RESET {
+void
+resetparser(void)
+{
 	tokpushback = 0;
 	checkkwd = 0;
 }
-#endif
+
 
 /*
  * Returns true if the text contains nothing to expand (no dollar signs

Modified: projects/bhyve_npt_pmap/bin/sh/parser.h
==============================================================================
--- projects/bhyve_npt_pmap/bin/sh/parser.h	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/bin/sh/parser.h	Wed Aug 21 19:30:07 2013	(r254607)
@@ -79,6 +79,7 @@ extern const char *const parsekwd[];
 
 union node *parsecmd(int);
 void fixredir(union node *, const char *, int);
+void resetparser(void);
 int goodname(const char *);
 int isassignment(const char *);
 char *getprompt(void *);

Modified: projects/bhyve_npt_pmap/bin/sh/redir.c
==============================================================================
--- projects/bhyve_npt_pmap/bin/sh/redir.c	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/bin/sh/redir.c	Wed Aug 21 19:30:07 2013	(r254607)
@@ -66,14 +66,13 @@ __FBSDID("$FreeBSD$");
 #define CLOSED -1		/* fd was not open before redir */
 
 
-MKINIT
 struct redirtab {
 	struct redirtab *next;
 	int renamed[10];
 };
 
 
-MKINIT struct redirtab *redirlist;
+static struct redirtab *redirlist;
 
 /*
  * We keep track of whether or not fd0 has been redirected.  This is for
@@ -324,16 +323,13 @@ popredir(void)
  * Undo all redirections.  Called on error or interrupt.
  */
 
-#ifdef mkinit
-
-INCLUDE "redir.h"
-
-RESET {
+void
+resetredir(void)
+{
 	while (redirlist)
 		popredir();
 }
 
-#endif
 
 /* Return true if fd 0 has already been redirected at least once.  */
 int

Modified: projects/bhyve_npt_pmap/bin/sh/redir.h
==============================================================================
--- projects/bhyve_npt_pmap/bin/sh/redir.h	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/bin/sh/redir.h	Wed Aug 21 19:30:07 2013	(r254607)
@@ -40,6 +40,7 @@
 union node;
 void redirect(union node *, int);
 void popredir(void);
+void resetredir(void);
 int fd0_redirected_p(void);
 void clearredir(void);
 

Modified: projects/bhyve_npt_pmap/bin/sh/shell.h
==============================================================================
--- projects/bhyve_npt_pmap/bin/sh/shell.h	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/bin/sh/shell.h	Wed Aug 21 19:30:07 2013	(r254607)
@@ -63,7 +63,6 @@ typedef intmax_t arith_t;
 #define	ARITH_MAX INTMAX_MAX
 
 typedef void *pointer;
-#define MKINIT  /* empty */
 
 #include 
 

Modified: projects/bhyve_npt_pmap/bin/sh/trap.c
==============================================================================
--- projects/bhyve_npt_pmap/bin/sh/trap.c	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/bin/sh/trap.c	Wed Aug 21 19:30:07 2013	(r254607)
@@ -72,7 +72,7 @@ __FBSDID("$FreeBSD$");
 #define S_RESET 5		/* temporary - to reset a hard ignored sig */
 
 
-MKINIT char sigmode[NSIG];	/* current value of signal */
+static char sigmode[NSIG];	/* current value of signal */
 volatile sig_atomic_t pendingsig;	/* indicates some signal received */
 int in_dotrap;			/* do we execute in a trap handler? */
 static char *volatile trap[NSIG];	/* trap handler commands */

Modified: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl
==============================================================================
--- projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl	Wed Aug 21 19:30:07 2013	(r254607)
@@ -583,6 +583,8 @@ if ($opt_x) {
 die "$PNAME: failed to open $PNAME.$$.log: $!\n"
     unless (!$opt_l || open(LOG, ">$PNAME.$$.log"));
 
+$ENV{'DTRACE_DEBUG_REGSET'} = 'true';
+
 if ($opt_g) {
 	$ENV{'UMEM_DEBUG'} = 'default,verbose';
 	$ENV{'UMEM_LOGGING'} = 'fail,contents';

Copied: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d (from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d	Wed Aug 21 19:30:07 2013	(r254607, copy of r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d)
@@ -0,0 +1,35 @@
+/*
+ * CDDL HEADER START
+ *
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2012 by Delphix. All rights reserved.
+ */
+
+#pragma D option quiet
+
+/*
+ * Make sure the sizes of compatible keys doesn't affect the sort order.
+ */
+
+BEGIN
+{
+	@[(int)1, 0] = sum(10);
+	@[(uint64_t)2, 0] = sum(20);
+	@[(int)3, 0] = sum(30);
+	@[(uint64_t)4, 0] = sum(40);
+	printa(@);
+
+	exit(0);
+}

Copied: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d.out (from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d.out)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d.out	Wed Aug 21 19:30:07 2013	(r254607, copy of r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sizedkeys.d.out)
@@ -0,0 +1,6 @@
+
+        1        0               10
+                2        0               20
+        3        0               30
+                4        0               40
+

Copied: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d.out (from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d.out)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d.out	Wed Aug 21 19:30:07 2013	(r254607, copy of r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d.out)
@@ -0,0 +1,8 @@
+The value of i is 6
+The value of i is 18
+The value of i is 72
+The value of i is 25920
+The value of i is 935761216
+The value of i is -91738734
+The value of i is -91738729
+

Copied: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d (from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d	Wed Aug 21 19:30:07 2013	(r254607, copy of r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d)
@@ -0,0 +1,50 @@
+/*
+ * CDDL HEADER START
+ *
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2012 by Delphix. All rights reserved.
+ */
+
+/*
+ * Test compile-time casting between integer types of different size.
+ */
+
+#pragma D option quiet
+
+int64_t x;
+
+BEGIN
+{
+	x = (int32_t)(int16_t)0xfff0;
+	printf("%16x %20d %20u\n", x, x, x);
+	x = (int32_t)(uint16_t)0xfff0;
+	printf("%16x %20d %20u\n", x, x, x);
+	x = (uint32_t)(int16_t)0xfff0;
+	printf("%16x %20d %20u\n", x, x, x);
+	x = (uint32_t)(uint16_t)0xfff0;
+	printf("%16x %20d %20u\n", x, x, x);
+	printf("\n");
+
+	x = (int16_t)(int32_t)0xfff0;
+	printf("%16x %20d %20u\n", x, x, x);
+	x = (int16_t)(uint32_t)0xfff0;
+	printf("%16x %20d %20u\n", x, x, x);
+	x = (uint16_t)(int32_t)0xfff0;
+	printf("%16x %20d %20u\n", x, x, x);
+	x = (uint16_t)(uint32_t)0xfff0;
+	printf("%16x %20d %20u\n", x, x, x);
+
+	exit(0);
+}

Copied: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d.out (from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d.out)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d.out	Wed Aug 21 19:30:07 2013	(r254607, copy of r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compcast.d.out)
@@ -0,0 +1,10 @@
+fffffffffffffff0                  -16 18446744073709551600
+            fff0                65520                65520
+        fffffff0           4294967280           4294967280
+            fff0                65520                65520
+
+fffffffffffffff0                  -16 18446744073709551600
+fffffffffffffff0                  -16 18446744073709551600
+            fff0                65520                65520
+            fff0                65520                65520
+

Copied: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d (from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d	Wed Aug 21 19:30:07 2013	(r254607, copy of r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d)
@@ -0,0 +1,36 @@
+/*
+ * CDDL HEADER START
+ *
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2012 by Delphix. All rights reserved.
+ */
+
+/*
+ * Test narrowing at assignment.
+ */
+
+#pragma D option quiet
+
+uint16_t x;
+uint32_t y;
+
+BEGIN
+{
+	x = 0xbeefcafe;
+	y = x;
+	printf("%x", y); /* where's the beef? */
+
+	exit(0);
+}

Copied: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d.out (from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d.out)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d.out	Wed Aug 21 19:30:07 2013	(r254607, copy of r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.compnarrowassign.d.out)
@@ -0,0 +1 @@
+cafe

Copied: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d (from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d	Wed Aug 21 19:30:07 2013	(r254607, copy of r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d)
@@ -0,0 +1,52 @@
+/*
+ * CDDL HEADER START
+ *
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ *
+ * CDDL HEADER END
+ */
+
+/*
+ * Copyright (c) 2012 by Delphix. All rights reserved.
+ */
+
+/*
+ * Test execution-time casting between integer types of different size.
+ */
+
+#pragma D option quiet
+
+int64_t x;
+
+BEGIN
+{
+	z = 0xfff0;
+
+	x = (int32_t)(int16_t)z;
+	printf("%16x %20d %20u\n", x, x, x);
+	x = (int32_t)(uint16_t)z;
+	printf("%16x %20d %20u\n", x, x, x);
+	x = (uint32_t)(int16_t)z;
+	printf("%16x %20d %20u\n", x, x, x);
+	x = (uint32_t)(uint16_t)z;
+	printf("%16x %20d %20u\n", x, x, x);
+	printf("\n");
+
+	x = (int16_t)(int32_t)z;
+	printf("%16x %20d %20u\n", x, x, x);
+	x = (int16_t)(uint32_t)z;
+	printf("%16x %20d %20u\n", x, x, x);
+	x = (uint16_t)(int32_t)z;
+	printf("%16x %20d %20u\n", x, x, x);
+	x = (uint16_t)(uint32_t)z;
+	printf("%16x %20d %20u\n", x, x, x);
+
+	exit(0);
+}

Copied: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d.out (from r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d.out)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d.out	Wed Aug 21 19:30:07 2013	(r254607, copy of r253953, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.execcast.d.out)
@@ -0,0 +1,10 @@
+fffffffffffffff0                  -16 18446744073709551600
+            fff0                65520                65520
+        fffffff0           4294967280           4294967280
+            fff0                65520                65520
+
+fffffffffffffff0                  -16 18446744073709551600
+fffffffffffffff0                  -16 18446744073709551600
+            fff0                65520                65520
+            fff0                65520                65520
+

Modified: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d
==============================================================================
--- projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d	Wed Aug 21 19:30:07 2013	(r254607)
@@ -36,12 +36,12 @@
 #pragma D option quiet
 #pragma D option statusrate=10ms
 
-fbt::ioctl:entry
+fbt::kern_ioctl:entry
 {
 	printf("Entering the ioctl function\n");
 }
 
-fbt::ioctl:return
+fbt::kern_ioctl:return
 {
 	printf("Returning from ioctl function\n");
 	exit(0);

Modified: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d
==============================================================================
--- projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d	Wed Aug 21 19:30:07 2013	(r254607)
@@ -36,7 +36,7 @@
 #pragma D option quiet
 #pragma D option statusrate=10ms
 
-fbt::ioctl:return
+fbt::kern_ioctl:return
 {
 	printf("The function return value is stored in %u\n", arg1);
 	exit(0);

Modified: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d
==============================================================================
--- projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d	Wed Aug 21 19:30:07 2013	(r254607)
@@ -36,13 +36,13 @@
 #pragma D option quiet
 #pragma D option statusrate=10ms
 
-fbt::ioctl:entry
+fbt::kern_ioctl:entry
 {
 	printf("Entering the ioctl function\n");
 	printf("The few arguments are %u %u %u %u\n", arg0, arg1, arg2, arg3);
 }
 
-fbt::ioctl:return
+fbt::kern_ioctl:return
 {
 	printf("Returning from ioctl function\n");
 	printf("The few arguments are %u %u %u %u\n", arg0, arg1, arg2, arg3);

Modified: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d
==============================================================================
--- projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d	Wed Aug 21 19:30:07 2013	(r254607)
@@ -41,12 +41,12 @@ BEGIN
 	self->traceme = 1;
 }
 
-fbt::ioctl:entry
+fbt::kern_ioctl:entry
 {
 	printf("Entering the function\n");
 }
 
-fbt::ioctl:return
+fbt::kern_ioctl:return
 {
 	printf("The offset = %u\n", arg0);
 	exit(0);

Modified: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d
==============================================================================
--- projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d	Wed Aug 21 19:30:07 2013	(r254607)
@@ -36,14 +36,14 @@
 #pragma D option quiet
 #pragma D option statusrate=10ms
 
-fbt::ioctl:entry
+fbt::kern_ioctl:entry
 {
 	printf("Entering the ioctl function\n");
 	printf("The few arguments are %u %u %u %u\n", arg0, arg1, arg2, arg3);
 	exit(0);
 }
 
-fbt::ioctl:return
+fbt::kern_ioctl:return
 {
 	printf("Returning from ioctl function\n");
 	printf("The few arguments are %u %u %u %u\n", arg0, arg1, arg2, arg3);

Modified: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d
==============================================================================
--- projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d	Wed Aug 21 19:30:07 2013	(r254607)
@@ -36,7 +36,7 @@
 #pragma D option quiet
 #pragma D option statusrate=10ms
 
-fbt::ioctl:return
+fbt::kern_ioctl:return
 /arg1 == 0/
 {
 	printf("%s %x returned 0", probefunc, arg0);

Modified: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d
==============================================================================
--- projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d	Wed Aug 21 19:30:07 2013	(r254607)
@@ -36,7 +36,7 @@
 #pragma D option quiet
 #pragma D option statusrate=10ms
 
-fbt::ioctl:entry
+fbt::kern_ioctl:entry
 {
 	self->traceme = 1;
 }
@@ -47,7 +47,7 @@ fbt:::entry
 	printf("called %s\n", probefunc);
 }
 
-fbt::ioctl:return
+fbt::kern_ioctl:return
 /self->traceme/
 {
 	self->traceme = 0;

Modified: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d
==============================================================================
--- projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d	Wed Aug 21 19:30:07 2013	(r254607)
@@ -24,7 +24,9 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*
+ * Copyright (c) 2012 by Delphix. All rights reserved.
+ */
 
 #pragma D option quiet
 
@@ -36,3 +38,8 @@ BEGIN
 	printf("%s\n", strjoin("", ""));
 	exit(0);
 }
+
+BEGIN
+{
+	exit(1);
+}

Modified: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d
==============================================================================
--- projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d	Wed Aug 21 19:30:07 2013	(r254607)
@@ -24,7 +24,9 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*
+ * Copyright (c) 2012 by Delphix. All rights reserved.
+ */
 
 /*
  * ASSERTION: This test reproduces the alignment error.
@@ -39,9 +41,10 @@
 
 BEGIN
 {
-	x = (int *) 64;
+	x = (int *)64;
 	y = *x;
 	trace(y);
+	exit(0);
 }
 
 ERROR

Modified: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d
==============================================================================
--- projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d	Wed Aug 21 19:30:07 2013	(r254607)
@@ -24,7 +24,9 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*
+ * Copyright (c) 2012 by Delphix. All rights reserved.
+ */
 
 /*
  * ASSERTION: D pointers do not allow invalid pointer accesses.
@@ -44,6 +46,7 @@ BEGIN
 	y = (int *) (x - 3300778156056);
 	*y = 3;
 	trace(*y);
+	exit(0);
 }
 
 ERROR

Modified: projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d
==============================================================================
--- projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d	Wed Aug 21 19:02:34 2013	(r254606)
+++ projects/bhyve_npt_pmap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d	Wed Aug 21 19:30:07 2013	(r254607)
@@ -24,7 +24,9 @@
  * Use is subject to license terms.
  */
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*
+ * Copyright (c) 2012 by Delphix. All rights reserved.
+ */
 
 /*
  * ASSERTION: D pointers do not allow invalid pointer accesses.
@@ -39,9 +41,10 @@
 
 BEGIN
 {
-	y = (int *) (-33007);
+	y = (int *)-33007;
 	*y = 3;
 	trace(*y);
+	exit(0);
 }
 
 ERROR

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

From owner-svn-src-projects@FreeBSD.ORG  Wed Aug 21 20:38:23 2013
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 7941FF60;
 Wed, 21 Aug 2013 20:38:23 +0000 (UTC)
 (envelope-from neel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 63257292A;
 Wed, 21 Aug 2013 20:38:23 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7LKcN9c078913;
 Wed, 21 Aug 2013 20:38:23 GMT (envelope-from neel@svn.freebsd.org)
Received: (from neel@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7LKcKjv078850;
 Wed, 21 Aug 2013 20:38:20 GMT (envelope-from neel@svn.freebsd.org)
Message-Id: <201308212038.r7LKcKjv078850@svn.freebsd.org>
From: Neel Natu 
Date: Wed, 21 Aug 2013 20:38:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r254609 - in projects/bhyve_npt_pmap: . contrib/bind9
 contrib/bind9/bin contrib/bind9/bin/check contrib/bind9/bin/confgen
 contrib/bind9/bin/dig contrib/bind9/bin/dig/include/dig contrib...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
 tree" 
List-Unsubscribe: , 
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
 
X-List-Received-Date: Wed, 21 Aug 2013 20:38:23 -0000

Author: neel
Date: Wed Aug 21 20:38:19 2013
New Revision: 254609
URL: http://svnweb.freebsd.org/changeset/base/254609

Log:
  IFC @254025

Added:
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rdata/generic/eui48_108.c
     - copied unchanged from r254025, head/contrib/bind9/lib/dns/rdata/generic/eui48_108.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rdata/generic/eui48_108.h
     - copied unchanged from r254025, head/contrib/bind9/lib/dns/rdata/generic/eui48_108.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rdata/generic/eui64_109.c
     - copied unchanged from r254025, head/contrib/bind9/lib/dns/rdata/generic/eui64_109.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rdata/generic/eui64_109.h
     - copied unchanged from r254025, head/contrib/bind9/lib/dns/rdata/generic/eui64_109.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rdata/generic/l32_105.c
     - copied unchanged from r254025, head/contrib/bind9/lib/dns/rdata/generic/l32_105.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rdata/generic/l32_105.h
     - copied unchanged from r254025, head/contrib/bind9/lib/dns/rdata/generic/l32_105.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rdata/generic/l64_106.c
     - copied unchanged from r254025, head/contrib/bind9/lib/dns/rdata/generic/l64_106.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rdata/generic/l64_106.h
     - copied unchanged from r254025, head/contrib/bind9/lib/dns/rdata/generic/l64_106.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rdata/generic/lp_107.c
     - copied unchanged from r254025, head/contrib/bind9/lib/dns/rdata/generic/lp_107.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rdata/generic/lp_107.h
     - copied unchanged from r254025, head/contrib/bind9/lib/dns/rdata/generic/lp_107.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rdata/generic/nid_104.c
     - copied unchanged from r254025, head/contrib/bind9/lib/dns/rdata/generic/nid_104.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rdata/generic/nid_104.h
     - copied unchanged from r254025, head/contrib/bind9/lib/dns/rdata/generic/nid_104.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rdata/generic/uri_256.c
     - copied unchanged from r254025, head/contrib/bind9/lib/dns/rdata/generic/uri_256.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rdata/generic/uri_256.h
     - copied unchanged from r254025, head/contrib/bind9/lib/dns/rdata/generic/uri_256.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/include/isc/regex.h
     - copied unchanged from r254025, head/contrib/bind9/lib/isc/include/isc/regex.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/regex.c
     - copied unchanged from r254025, head/contrib/bind9/lib/isc/regex.c
  projects/bhyve_npt_pmap/sys/cddl/compat/opensolaris/sys/debug_compat.h
     - copied unchanged from r254025, head/sys/cddl/compat/opensolaris/sys/debug_compat.h
Replaced:
  projects/bhyve_npt_pmap/contrib/bind9/libtool.m4/
     - copied from r254025, head/contrib/bind9/libtool.m4/
Modified:
  projects/bhyve_npt_pmap/UPDATING
  projects/bhyve_npt_pmap/contrib/bind9/CHANGES
  projects/bhyve_npt_pmap/contrib/bind9/COPYRIGHT
  projects/bhyve_npt_pmap/contrib/bind9/FAQ
  projects/bhyve_npt_pmap/contrib/bind9/FAQ.xml
  projects/bhyve_npt_pmap/contrib/bind9/Makefile.in
  projects/bhyve_npt_pmap/contrib/bind9/README
  projects/bhyve_npt_pmap/contrib/bind9/aclocal.m4
  projects/bhyve_npt_pmap/contrib/bind9/bin/Makefile.in
  projects/bhyve_npt_pmap/contrib/bind9/bin/check/check-tool.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/check/named-checkconf.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/check/named-checkzone.8
  projects/bhyve_npt_pmap/contrib/bind9/bin/check/named-checkzone.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/check/named-checkzone.docbook
  projects/bhyve_npt_pmap/contrib/bind9/bin/check/named-checkzone.html
  projects/bhyve_npt_pmap/contrib/bind9/bin/confgen/keygen.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/confgen/rndc-confgen.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/dig/dig.1
  projects/bhyve_npt_pmap/contrib/bind9/bin/dig/dig.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/dig/dig.docbook
  projects/bhyve_npt_pmap/contrib/bind9/bin/dig/dig.html
  projects/bhyve_npt_pmap/contrib/bind9/bin/dig/dighost.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/dig/host.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/dig/include/dig/dig.h
  projects/bhyve_npt_pmap/contrib/bind9/bin/dnssec/dnssec-keyfromlabel.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/dnssec/dnssec-keygen.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/dnssec/dnssec-revoke.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/dnssec/dnssec-settime.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/dnssec/dnssec-signzone.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/Makefile.in
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/client.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/config.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/control.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/controlconf.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/include/named/client.h
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/include/named/globals.h
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/include/named/server.h
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/interfacemgr.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/log.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/logconf.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/lwresd.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/main.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/named.conf.5
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/named.conf.docbook
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/named.conf.html
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/query.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/server.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/statschannel.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/tkeyconf.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/tsigconf.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/unix/dlz_dlopen_driver.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/update.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/xfrout.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/named/zoneconf.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/nsupdate/nsupdate.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/rndc/rndc.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/tools/genrandom.c
  projects/bhyve_npt_pmap/contrib/bind9/bin/tools/isc-hmac-fixup.8
  projects/bhyve_npt_pmap/contrib/bind9/bin/tools/isc-hmac-fixup.docbook
  projects/bhyve_npt_pmap/contrib/bind9/bin/tools/isc-hmac-fixup.html
  projects/bhyve_npt_pmap/contrib/bind9/config.h.in
  projects/bhyve_npt_pmap/contrib/bind9/config.threads.in
  projects/bhyve_npt_pmap/contrib/bind9/configure.in
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/Bv9ARM-book.xml
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/Bv9ARM.ch01.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/Bv9ARM.ch02.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/Bv9ARM.ch03.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/Bv9ARM.ch04.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/Bv9ARM.ch05.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/Bv9ARM.ch06.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/Bv9ARM.ch07.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/Bv9ARM.ch08.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/Bv9ARM.ch09.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/Bv9ARM.ch10.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/Bv9ARM.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/Bv9ARM.pdf
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/man.arpaname.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/man.ddns-confgen.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/man.dig.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/man.dnssec-dsfromkey.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/man.dnssec-keyfromlabel.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/man.dnssec-keygen.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/man.dnssec-revoke.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/man.dnssec-settime.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/man.dnssec-signzone.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/man.genrandom.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/man.host.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/man.isc-hmac-fixup.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/man.named-checkconf.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/man.named-checkzone.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/man.named-journalprint.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/man.named.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/man.nsec3hash.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/man.nsupdate.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/man.rndc-confgen.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/man.rndc.conf.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/man.rndc.html
  projects/bhyve_npt_pmap/contrib/bind9/doc/arm/pkcs11.xml
  projects/bhyve_npt_pmap/contrib/bind9/doc/misc/options
  projects/bhyve_npt_pmap/contrib/bind9/isc-config.sh.in
  projects/bhyve_npt_pmap/contrib/bind9/lib/Makefile.in
  projects/bhyve_npt_pmap/contrib/bind9/lib/bind9/Makefile.in
  projects/bhyve_npt_pmap/contrib/bind9/lib/bind9/api
  projects/bhyve_npt_pmap/contrib/bind9/lib/bind9/check.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/Makefile.in
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/acache.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/adb.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/api
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/cache.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/client.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/db.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/dispatch.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/dlz.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/dnssec.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/dst_api.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/dst_internal.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/dst_openssl.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/ecdb.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/gen.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/gssapictx.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/include/dns/acache.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/include/dns/db.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/include/dns/message.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/include/dns/name.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/include/dns/ncache.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/include/dns/nsec.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/include/dns/nsec3.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/include/dns/rdata.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/include/dns/result.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/include/dns/rpz.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/include/dns/types.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/include/dns/validator.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/include/dns/view.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/include/dns/zone.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/include/dst/dst.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/master.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/message.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/name.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/ncache.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/nsec.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/nsec3.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/openssl_link.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/openssldsa_link.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/opensslecdsa_link.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/opensslgost_link.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/opensslrsa_link.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/peer.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rbt.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rbtdb.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rdata.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rdata/any_255/tsig_250.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rdata/generic/dlv_32769.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rdata/generic/mx_15.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rdata/generic/sshfp_44.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rdata/generic/txt_16.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rdata/in_1/nsap_22.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/request.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/resolver.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/result.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rootns.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/rpz.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/sdb.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/sdlz.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/spnego.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/spnego_asn1.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/ssu.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/ssu_external.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/tkey.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/tsig.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/validator.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/view.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/xfrin.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/dns/zone.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/export/dns/Makefile.in
  projects/bhyve_npt_pmap/contrib/bind9/lib/export/irs/Makefile.in
  projects/bhyve_npt_pmap/contrib/bind9/lib/export/isc/Makefile.in
  projects/bhyve_npt_pmap/contrib/bind9/lib/export/isc/include/isc/Makefile.in
  projects/bhyve_npt_pmap/contrib/bind9/lib/export/isc/nls/Makefile.in
  projects/bhyve_npt_pmap/contrib/bind9/lib/export/isc/nothreads/Makefile.in
  projects/bhyve_npt_pmap/contrib/bind9/lib/export/isc/pthreads/Makefile.in
  projects/bhyve_npt_pmap/contrib/bind9/lib/export/isc/unix/Makefile.in
  projects/bhyve_npt_pmap/contrib/bind9/lib/export/isccfg/Makefile.in
  projects/bhyve_npt_pmap/contrib/bind9/lib/export/samples/Makefile.in
  projects/bhyve_npt_pmap/contrib/bind9/lib/export/samples/nsprobe.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/export/samples/sample-async.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/export/samples/sample-gai.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/export/samples/sample-request.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/export/samples/sample-update.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/export/samples/sample.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/irs/api
  projects/bhyve_npt_pmap/contrib/bind9/lib/irs/dnsconf.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/irs/getaddrinfo.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/irs/getnameinfo.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/irs/resconf.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/Makefile.in
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/api
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/buffer.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/include/isc/Makefile.in
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/include/isc/buffer.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/include/isc/file.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/include/isc/list.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/include/isc/mem.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/include/isc/namespace.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/include/isc/region.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/include/isc/sockaddr.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/include/isc/socket.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/include/isc/task.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/include/isc/timer.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/inet_aton.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/mem.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/nothreads/Makefile.in
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/parseint.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/pthreads/thread.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/ratelimiter.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/sockaddr.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/sparc64/include/isc/atomic.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/symtab.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/task.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/taskpool.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/timer.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/timer_api.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/unix/entropy.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/unix/file.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/unix/include/isc/time.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/unix/net.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/unix/socket.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/isc/unix/time.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/isccc/api
  projects/bhyve_npt_pmap/contrib/bind9/lib/isccc/cc.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/isccfg/Makefile.in
  projects/bhyve_npt_pmap/contrib/bind9/lib/isccfg/aclconf.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/isccfg/api
  projects/bhyve_npt_pmap/contrib/bind9/lib/isccfg/include/isccfg/cfg.h
  projects/bhyve_npt_pmap/contrib/bind9/lib/isccfg/namedconf.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/isccfg/parser.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/lwres/api
  projects/bhyve_npt_pmap/contrib/bind9/lib/lwres/context.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/lwres/getaddrinfo.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/lwres/getipnode.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/lwres/getnameinfo.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/lwres/getrrset.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/lwres/lwinetaton.c
  projects/bhyve_npt_pmap/contrib/bind9/lib/lwres/print.c
  projects/bhyve_npt_pmap/contrib/bind9/ltmain.sh
  projects/bhyve_npt_pmap/contrib/bind9/make/rules.in
  projects/bhyve_npt_pmap/contrib/bind9/version
  projects/bhyve_npt_pmap/contrib/wpa/src/drivers/driver_wired.c
  projects/bhyve_npt_pmap/lib/bind/config.h
  projects/bhyve_npt_pmap/lib/bind/dns/code.h
  projects/bhyve_npt_pmap/lib/bind/dns/dns/enumtype.h
  projects/bhyve_npt_pmap/lib/bind/dns/dns/rdatastruct.h
  projects/bhyve_npt_pmap/lib/bind/isc/Makefile
  projects/bhyve_npt_pmap/sbin/fdisk_pc98/fdisk.c
  projects/bhyve_npt_pmap/sbin/geom/class/eli/geli.8
  projects/bhyve_npt_pmap/share/man/man4/ciss.4
  projects/bhyve_npt_pmap/share/man/man4/usb_quirk.4
  projects/bhyve_npt_pmap/sys/amd64/amd64/mp_machdep.c
  projects/bhyve_npt_pmap/sys/amd64/amd64/pmap.c
  projects/bhyve_npt_pmap/sys/amd64/amd64/sys_machdep.c
  projects/bhyve_npt_pmap/sys/amd64/amd64/vm_machdep.c
  projects/bhyve_npt_pmap/sys/arm/arm/bus_space_generic.c
  projects/bhyve_npt_pmap/sys/arm/arm/busdma_machdep-v6.c
  projects/bhyve_npt_pmap/sys/arm/arm/busdma_machdep.c
  projects/bhyve_npt_pmap/sys/arm/arm/exception.S
  projects/bhyve_npt_pmap/sys/arm/arm/mp_machdep.c
  projects/bhyve_npt_pmap/sys/arm/arm/mpcore_timer.c
  projects/bhyve_npt_pmap/sys/arm/arm/pmap-v6.c
  projects/bhyve_npt_pmap/sys/arm/arm/pmap.c
  projects/bhyve_npt_pmap/sys/arm/arm/vm_machdep.c
  projects/bhyve_npt_pmap/sys/arm/at91/at91.c
  projects/bhyve_npt_pmap/sys/arm/include/asmacros.h
  projects/bhyve_npt_pmap/sys/arm/include/frame.h
  projects/bhyve_npt_pmap/sys/arm/mv/armadaxp/armadaxp_mp.c
  projects/bhyve_npt_pmap/sys/arm/s3c2xx0/s3c2xx0_space.c
  projects/bhyve_npt_pmap/sys/arm/ti/omap4/omap4_prcm_clks.c
  projects/bhyve_npt_pmap/sys/arm/xscale/i80321/i80321_space.c
  projects/bhyve_npt_pmap/sys/arm/xscale/i8134x/i81342_space.c
  projects/bhyve_npt_pmap/sys/arm/xscale/ixp425/ixp425_pci_space.c
  projects/bhyve_npt_pmap/sys/boot/fdt/dts/pandaboard.dts
  projects/bhyve_npt_pmap/sys/boot/pc98/boot2/boot2.c
  projects/bhyve_npt_pmap/sys/boot/pc98/libpc98/biosdisk.c
  projects/bhyve_npt_pmap/sys/cam/cam.h
  projects/bhyve_npt_pmap/sys/cam/cam_queue.c
  projects/bhyve_npt_pmap/sys/cam/cam_queue.h
  projects/bhyve_npt_pmap/sys/cam/cam_xpt.c
  projects/bhyve_npt_pmap/sys/cam/cam_xpt_internal.h
  projects/bhyve_npt_pmap/sys/cam/ctl/ctl.c
  projects/bhyve_npt_pmap/sys/cam/ctl/ctl_frontend_internal.c
  projects/bhyve_npt_pmap/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c
  projects/bhyve_npt_pmap/sys/cddl/compat/opensolaris/sys/kmem.h
  projects/bhyve_npt_pmap/sys/cddl/compat/opensolaris/sys/mutex.h
  projects/bhyve_npt_pmap/sys/cddl/compat/opensolaris/sys/rwlock.h
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  projects/bhyve_npt_pmap/sys/cddl/dev/dtrace/dtrace_load.c
  projects/bhyve_npt_pmap/sys/cddl/dev/dtrace/dtrace_unload.c
  projects/bhyve_npt_pmap/sys/compat/linux/linux_misc.c
  projects/bhyve_npt_pmap/sys/compat/ndis/subr_ntoskrnl.c
  projects/bhyve_npt_pmap/sys/conf/kern.pre.mk
  projects/bhyve_npt_pmap/sys/conf/newvers.sh
  projects/bhyve_npt_pmap/sys/conf/options
  projects/bhyve_npt_pmap/sys/dev/aac/aac_pci.c
  projects/bhyve_npt_pmap/sys/dev/aac/aacvar.h
  projects/bhyve_npt_pmap/sys/dev/bktr/bktr_core.c
  projects/bhyve_npt_pmap/sys/dev/ciss/ciss.c
  projects/bhyve_npt_pmap/sys/dev/drm/drm_scatter.c
  projects/bhyve_npt_pmap/sys/dev/drm2/drm_scatter.c
  projects/bhyve_npt_pmap/sys/dev/drm2/i915/intel_ringbuffer.c
  projects/bhyve_npt_pmap/sys/dev/drm2/ttm/ttm_bo_util.c
  projects/bhyve_npt_pmap/sys/dev/e1000/if_em.c
  projects/bhyve_npt_pmap/sys/dev/e1000/if_igb.c
  projects/bhyve_npt_pmap/sys/dev/filemon/filemon.c
  projects/bhyve_npt_pmap/sys/dev/filemon/filemon_wrapper.c
  projects/bhyve_npt_pmap/sys/dev/ixgbe/ixgbe.c
  projects/bhyve_npt_pmap/sys/dev/ixgbe/ixv.c
  projects/bhyve_npt_pmap/sys/dev/xen/blkback/blkback.c
  projects/bhyve_npt_pmap/sys/dev/xen/netback/netback.c
  projects/bhyve_npt_pmap/sys/dev/xen/xenpci/xenpci.c
  projects/bhyve_npt_pmap/sys/fs/tmpfs/tmpfs.h
  projects/bhyve_npt_pmap/sys/fs/tmpfs/tmpfs_subr.c
  projects/bhyve_npt_pmap/sys/geom/geom_pc98.c
  projects/bhyve_npt_pmap/sys/geom/part/g_part_pc98.c
  projects/bhyve_npt_pmap/sys/i386/i386/machdep.c
  projects/bhyve_npt_pmap/sys/i386/i386/mp_machdep.c
  projects/bhyve_npt_pmap/sys/i386/i386/pmap.c
  projects/bhyve_npt_pmap/sys/i386/i386/sys_machdep.c
  projects/bhyve_npt_pmap/sys/i386/i386/vm_machdep.c
  projects/bhyve_npt_pmap/sys/i386/ibcs2/imgact_coff.c
  projects/bhyve_npt_pmap/sys/i386/pci/pci_cfgreg.c
  projects/bhyve_npt_pmap/sys/i386/xen/mp_machdep.c
  projects/bhyve_npt_pmap/sys/i386/xen/pmap.c
  projects/bhyve_npt_pmap/sys/ia64/ia64/mp_machdep.c
  projects/bhyve_npt_pmap/sys/kern/imgact_gzip.c
  projects/bhyve_npt_pmap/sys/kern/init_main.c
  projects/bhyve_npt_pmap/sys/kern/kern_exec.c
  projects/bhyve_npt_pmap/sys/kern/kern_malloc.c
  projects/bhyve_npt_pmap/sys/kern/kern_mbuf.c
  projects/bhyve_npt_pmap/sys/kern/kern_sharedpage.c
  projects/bhyve_npt_pmap/sys/kern/subr_busdma_bufalloc.c
  projects/bhyve_npt_pmap/sys/kern/subr_vmem.c
  projects/bhyve_npt_pmap/sys/kern/vfs_bio.c
  projects/bhyve_npt_pmap/sys/kern/vfs_lookup.c
  projects/bhyve_npt_pmap/sys/mips/mips/mp_machdep.c
  projects/bhyve_npt_pmap/sys/mips/mips/pmap.c
  projects/bhyve_npt_pmap/sys/mips/mips/vm_machdep.c
  projects/bhyve_npt_pmap/sys/mips/sibyte/sb_zbpci.c
  projects/bhyve_npt_pmap/sys/modules/cyclic/Makefile
  projects/bhyve_npt_pmap/sys/modules/dtrace/dtio/Makefile
  projects/bhyve_npt_pmap/sys/modules/dtrace/dtmalloc/Makefile
  projects/bhyve_npt_pmap/sys/modules/dtrace/dtnfscl/Makefile
  projects/bhyve_npt_pmap/sys/modules/dtrace/dtnfsclient/Makefile
  projects/bhyve_npt_pmap/sys/modules/dtrace/dtrace/Makefile
  projects/bhyve_npt_pmap/sys/modules/dtrace/dtrace_test/Makefile
  projects/bhyve_npt_pmap/sys/modules/dtrace/dtraceall/Makefile
  projects/bhyve_npt_pmap/sys/modules/dtrace/fasttrap/Makefile
  projects/bhyve_npt_pmap/sys/modules/dtrace/fbt/Makefile
  projects/bhyve_npt_pmap/sys/modules/dtrace/lockstat/Makefile
  projects/bhyve_npt_pmap/sys/modules/dtrace/profile/Makefile
  projects/bhyve_npt_pmap/sys/modules/dtrace/prototype/Makefile
  projects/bhyve_npt_pmap/sys/modules/dtrace/sdt/Makefile
  projects/bhyve_npt_pmap/sys/modules/dtrace/systrace/Makefile
  projects/bhyve_npt_pmap/sys/modules/dtrace/systrace_freebsd32/Makefile
  projects/bhyve_npt_pmap/sys/modules/dtrace/systrace_linux32/Makefile
  projects/bhyve_npt_pmap/sys/modules/opensolaris/Makefile
  projects/bhyve_npt_pmap/sys/modules/zfs/Makefile
  projects/bhyve_npt_pmap/sys/net/if_tun.c
  projects/bhyve_npt_pmap/sys/netinet6/icmp6.c
  projects/bhyve_npt_pmap/sys/netinet6/in6.c
  projects/bhyve_npt_pmap/sys/netinet6/in6.h
  projects/bhyve_npt_pmap/sys/netinet6/ip6_forward.c
  projects/bhyve_npt_pmap/sys/netinet6/ip6_id.c
  projects/bhyve_npt_pmap/sys/netinet6/ip6_mroute.c
  projects/bhyve_npt_pmap/sys/netinet6/nd6.c
  projects/bhyve_npt_pmap/sys/netinet6/nd6_rtr.c
  projects/bhyve_npt_pmap/sys/ofed/include/linux/dma-mapping.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/gfp.h
  projects/bhyve_npt_pmap/sys/ofed/include/linux/linux_compat.c
  projects/bhyve_npt_pmap/sys/pc98/pc98/machdep.c
  projects/bhyve_npt_pmap/sys/powerpc/aim/mmu_oea.c
  projects/bhyve_npt_pmap/sys/powerpc/aim/mmu_oea64.c
  projects/bhyve_npt_pmap/sys/powerpc/aim/vm_machdep.c
  projects/bhyve_npt_pmap/sys/powerpc/booke/pmap.c
  projects/bhyve_npt_pmap/sys/powerpc/booke/vm_machdep.c
  projects/bhyve_npt_pmap/sys/powerpc/ofw/ofw_syscons.c
  projects/bhyve_npt_pmap/sys/powerpc/powerpc/busdma_machdep.c
  projects/bhyve_npt_pmap/sys/powerpc/powerpc/mp_machdep.c
  projects/bhyve_npt_pmap/sys/sparc64/include/atomic.h
  projects/bhyve_npt_pmap/sys/sparc64/sparc64/bus_machdep.c
  projects/bhyve_npt_pmap/sys/sparc64/sparc64/mem.c
  projects/bhyve_npt_pmap/sys/sparc64/sparc64/mp_machdep.c
  projects/bhyve_npt_pmap/sys/sparc64/sparc64/pmap.c
  projects/bhyve_npt_pmap/sys/sparc64/sparc64/vm_machdep.c
  projects/bhyve_npt_pmap/sys/sys/diskpc98.h
  projects/bhyve_npt_pmap/sys/sys/param.h
  projects/bhyve_npt_pmap/sys/ufs/ffs/ffs_softdep.c
  projects/bhyve_npt_pmap/sys/ufs/ufs/ufs_vnops.c
  projects/bhyve_npt_pmap/sys/vm/memguard.c
  projects/bhyve_npt_pmap/sys/vm/memguard.h
  projects/bhyve_npt_pmap/sys/vm/pmap.h
  projects/bhyve_npt_pmap/sys/vm/uma_core.c
  projects/bhyve_npt_pmap/sys/vm/vm_extern.h
  projects/bhyve_npt_pmap/sys/vm/vm_glue.c
  projects/bhyve_npt_pmap/sys/vm/vm_init.c
  projects/bhyve_npt_pmap/sys/vm/vm_kern.c
  projects/bhyve_npt_pmap/sys/vm/vm_kern.h
  projects/bhyve_npt_pmap/sys/vm/vm_map.c
  projects/bhyve_npt_pmap/sys/vm/vm_map.h
  projects/bhyve_npt_pmap/sys/vm/vm_object.c
  projects/bhyve_npt_pmap/sys/vm/vm_phys.c
  projects/bhyve_npt_pmap/sys/x86/x86/busdma_machdep.c
  projects/bhyve_npt_pmap/sys/xen/gnttab.c
  projects/bhyve_npt_pmap/tools/build/mk/OptionalObsoleteFiles.inc
  projects/bhyve_npt_pmap/tools/tools/bootparttest/bootparttest.c
  projects/bhyve_npt_pmap/usr.bin/ldd/ldd.c
  projects/bhyve_npt_pmap/usr.sbin/boot98cfg/boot98cfg.c
  projects/bhyve_npt_pmap/usr.sbin/named/Makefile
  projects/bhyve_npt_pmap/usr.sbin/ndp/ndp.c
  projects/bhyve_npt_pmap/usr.sbin/rtadvctl/rtadvctl.c
  projects/bhyve_npt_pmap/usr.sbin/rtadvd/config.c
  projects/bhyve_npt_pmap/usr.sbin/rtadvd/rrenum.c
  projects/bhyve_npt_pmap/usr.sbin/rtadvd/rtadvd.c
  projects/bhyve_npt_pmap/usr.sbin/rtadvd/rtadvd.h
  projects/bhyve_npt_pmap/usr.sbin/rtadvd/timer.c
  projects/bhyve_npt_pmap/usr.sbin/rtadvd/timer.h
  projects/bhyve_npt_pmap/usr.sbin/rtadvd/timer_subr.c
  projects/bhyve_npt_pmap/usr.sbin/rtadvd/timer_subr.h
  projects/bhyve_npt_pmap/usr.sbin/rtsold/dump.c
  projects/bhyve_npt_pmap/usr.sbin/rtsold/rtsol.c
  projects/bhyve_npt_pmap/usr.sbin/rtsold/rtsold.c
  projects/bhyve_npt_pmap/usr.sbin/rtsold/rtsold.h
Directory Properties:
  projects/bhyve_npt_pmap/   (props changed)
  projects/bhyve_npt_pmap/contrib/bind9/   (props changed)
  projects/bhyve_npt_pmap/contrib/wpa/   (props changed)
  projects/bhyve_npt_pmap/sbin/   (props changed)
  projects/bhyve_npt_pmap/share/man/man4/   (props changed)
  projects/bhyve_npt_pmap/sys/   (props changed)
  projects/bhyve_npt_pmap/sys/boot/   (props changed)
  projects/bhyve_npt_pmap/sys/cddl/contrib/opensolaris/   (props changed)
  projects/bhyve_npt_pmap/sys/conf/   (props changed)
  projects/bhyve_npt_pmap/usr.sbin/rtadvctl/   (props changed)
  projects/bhyve_npt_pmap/usr.sbin/rtadvd/   (props changed)
  projects/bhyve_npt_pmap/usr.sbin/rtsold/   (props changed)

Modified: projects/bhyve_npt_pmap/UPDATING
==============================================================================
--- projects/bhyve_npt_pmap/UPDATING	Wed Aug 21 19:40:43 2013	(r254608)
+++ projects/bhyve_npt_pmap/UPDATING	Wed Aug 21 20:38:19 2013	(r254609)
@@ -31,6 +31,24 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10
 	disable the most expensive debugging functionality run
 	"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
 
+20130806:
+	INVARIANTS option now enables DEBUG for code with OpenSolaris and
+	Illumos origin, including ZFS.  If you have INVARIANTS in your
+	kernel configuration, then there is no need to set DEBUG or ZFS_DEBUG
+	explicitly.
+	DEBUG used to enable witness(9) tracking of OpenSolaris (mostly ZFS)
+	locks if WITNESS option was set.  Because that generated a lot of
+	witness(9) reports and all of them were believed to be false
+	positives, this is no longer done.  New option OPENSOLARIS_WITNESS
+	can be used to achieve the previous behavior.
+
+20130806:
+	Timer values in IPv6 data structures now use time_uptime instead
+	of time_second.  Although this is not a user-visible functional
+	change, userland utilities which directly use them---ndp(8),
+	rtadvd(8), and rtsold(8) in the base system---need to be updated
+	to r253970 or later.
+
 20130802:
 	find -delete can now delete the pathnames given as arguments,
 	instead of only files found below them or if the pathname did

Modified: projects/bhyve_npt_pmap/contrib/bind9/CHANGES
==============================================================================
--- projects/bhyve_npt_pmap/contrib/bind9/CHANGES	Wed Aug 21 19:40:43 2013	(r254608)
+++ projects/bhyve_npt_pmap/contrib/bind9/CHANGES	Wed Aug 21 20:38:19 2013	(r254609)
@@ -1,20 +1,392 @@
-	--- 9.8.4-P2 released ---
+	--- 9.8.5-P2 released ---
 
-3516.	[security]	Removed the check for regex.h in configure in order
-			to disable regex syntax checking, as it exposes
-			BIND to a critical flaw in libregex on some
-			platforms. [RT #32688]
+3621.	[security]	Incorrect bounds checking on private type 'keydata'
+			can lead to a remotely triggerable REQUIRE failure
+			(CVE-2013-4854). [RT #34238]
 
-	--- 9.8.4-P1 released ---
+	--- 9.8.5-P1 released ---
 
-3407.	[security]	Named could die on specific queries with dns64 enabled.
-			[Addressed in change #3388 for BIND 9.8.5 and 9.9.3.]
+3584.	[security]	Caching data from an incompletely signed zone could
+			trigger an assertion failure in resolver.c [RT #33690]
 
-	--- 9.8.4 released ---
+	--- 9.8.5 released ---
+
+3568.	[cleanup]	Add a product description line to the version file,
+			to be reported by named -v/-V. [RT #33366]
+
+3567.	[bug]		Silence clang static analyzer warnings. [RT #33365]
+
+3563.	[contrib]	zone2sqlite failed with some table names. [RT #33375]
+
+3561.	[bug]		dig: issue a warning if an EDNS query returns FORMERR
+			or NOTIMP.  Adjust usage message. [RT #33363]
+
+	--- 9.8.5rc1 released ---
+
+3560.	[bug]		isc-config.sh did not honor includedir and libdir
+			when set via configure. [RT #33345]
+
+3559.	[func]		Check that both forms of Sender Policy Framework
+			records exist or do not exist. [RT #33355]
+
+3558.	[bug]		IXFR of a DLZ stored zone was broken. [RT #33331]
+
+3556.	[maint]		Added AAAA for D.ROOT-SERVERS.NET.
+
+3555.	[bug]		Address theoretical race conditions in acache.c
+			(change #3553 was incomplete). [RT #33252]
+
+3553.	[bug]		Address suspected double free in acache. [RT #33252]
+
+3552.	[bug]		Wrong getopt option string for 'nsupdate -r'.
+			[RT #33280]
+
+3549.	[doc]		Documentation for "request-nsid" was missing.
+			[RT #33153]
+
+3548.	[bug]		The NSID request code in resolver.c was broken
+			resulting in invalid EDNS options being sent.
+			[RT #33153]
+
+3547.	[bug]		Some malformed unknown rdata records were not properly
+			detected and rejected. [RT #33129]
+
+3056.	[func]		Added support for URI resource record. [RT #23386]
+
+	--- 9.8.5rc1 released ---
+
+3546.	[func]		Add EUI48 and EUI64 types. [RT #33082]
+
+3544.	[contrib]	check5011.pl: Script to report the status of
+			managed keys as recorded in managed-keys.bind.
+			Contributed by Tony Finch 
+
+3543.	[bug]		Update socket structure before attaching to socket
+			manager after accept. [RT #33084]
+
+3542.	[bug]		masterformat system test was broken. [RT #33086]
+
+3541.	[bug]		Parts of libdns were not properly initialized when
+			built in libexport mode. [RT #33028]
+
+3540.	[test]		libt_api: t_info and t_assert were not thread safe.
+
+3539.	[port]		win32: timestamp format didn't match other platforms.
+
+3538.	[test]		Running "make test" now requires loopback interfaces
+			to be set up. [RT #32452]
+
+3537.	[tuning]	Slave zones, when updated, now send NOTIFY messages
+			to peers before being dumped to disk rather than
+			after. [RT #27242]
+
+3535.	[bug]		Minor win32 cleanups. [RT #32962]
+
+3534.	[bug]		Extra text after an embedded NULL was ignored when
+			parsing zone files. [RT #32699]
+
+3533.	[contrib]	query-loc-0.4.0: memory leaks. [RT #32960]
+
+3532.	[contrib]	zkt: fixed buffer overrun, resource leaks. [RT #32960]
+
+3531.	[bug]		win32: A uninitialized value could be returned on out
+			of memory. [RT #32960]
+
+3530.	[contrib]	Better RTT tracking in queryperf. [RT #30128]
+
+3526.	[cleanup]	Set up dependencies for unit tests correctly during
+			build. [RT #32803]
+
+3521.	[bug]		Address memory leak in opensslecdsa_link.c. [RT #32249]
+
+3520.	[bug]		'mctx' was not being referenced counted in some places
+			where it should have been.  [RT #32794]
+
+	--- 9.8.5b2 released ---
+
+3517.	[bug]		Reorder destruction to avoid shutdown race. [RT #32777]
+
+3515.	[port]		'%T' is not portable in strftime(). [RT #32763]
+
+3514.	[bug]		The ranges for valid key sizes in ddns-confgen and
+			rndc-confgen were too constrained. Keys up to 512
+			bits are now allowed for most algorithms, and up
+			to 1024 bits for hmac-sha384 and hmac-sha512.
+			[RT #32753]
+
+3509.	[cleanup]	Added a product line to version file to allow for
+			easy naming of different products (BIND
+			vs BIND ESV, for example). [RT #32755]
+
+3508.	[contrib]	queryperf was incorrectly rejecting the -T option.
+			[RT #32338]
+
+3503.	[doc]		Clarify size_spec syntax. [RT #32449]
+
+3500.	[security]	Support NAPTR regular expression validation on
+			all platforms without using libregex, which
+			can be vulnerable to memory exhaustion attack
+			(CVE-2013-2266). [RT #32688]
+
+3499.	[doc]		Corrected ARM documentation of built-in zones.
+			[RT #32694]
+
+3498.	[bug]		zone statistics for zones which matched a potential
+			empty zone could have their zone-statistics setting
+			overridden.
+
+3496.	[func]		Improvements to RPZ performance. The "response-policy"
+			syntax now includes a "min-ns-dots" clause, with
+			default 1, to exclude top-level domains from
+			NSIP and NSDNAME checking. --enable-rpz-nsip and
+			--enable-rpz-nsdname are now the default. [RT #32251]
+
+3489.	[bug]		--enable-developer now turns on ISC_LIST_CHECKINIT.
+			When cloning a rdataset do not copy the link contents.
+			[RT #32651]
+
+3488.	[bug]		Use after free error with DH generated keys. [RT #32649]
+
+3487.	[bug]		Change 3444 was not complete.  There was a additional
+			place where the NOQNAME proof needed to be saved.
+			[RT #32629]
+
+3486.	[bug]		named could crash when using TKEY-negotiated keys
+			that had been deleted and then recreated. [RT #32506]
+
+3485.	[cleanup]	Only compile openssl_gostlink.c if we support GOST.
+
+3481.	[cleanup]	Removed use of const const in atf.
+
+3479.	[bug]		Address potential memory leaks in gssapi support
+			code. [RT #32405]
+
+3478.	[port]		Fix a build failure in strict C99 environments
+			[RT #32475]
+
+3474.	[bug]		nsupdate could assert when the local and remote
+			address families didn't match. [RT #22897]
+
+3470.	[bug]		Slave zones could fail to dump when successfully
+			refreshing after an initial failure. [RT #31276]
+
+	--- 9.8.5b1 released ---
+
+3468.	[security]	RPZ rules to generate A records (but not AAAA records)
+			could trigger an assertion failure when used in
+			conjunction with DNS64 (CVE-2012-5689). [RT #32141]
+
+3467.	[bug]		Added checks in dnssec-keygen and dnssec-settime
+			to check for delete date < inactive date. [RT #31719]
+
+3465.	[bug]		Handle isolated reserved ports. [RT #31778]
+
+3464.	[maint]		Updates to PKCS#11 openssl patches, supporting
+			versions 0.9.8x, 1.0.0j, 1.0.1c [RT #29749]
+
+3463.	[doc]		Clarify managed-keys syntax in ARM. [RT #32232]
+
+3462.	[doc]		Clarify server selection behavior of dig when using
+			-4 or -6 options. [RT #32181]
+
+3461.	[bug]		Negative responses could incorrectly have AD=1
+			set. [RT #32237]
+
+3458.	[bug]		Return FORMERR when presented with a overly long
+			domain named in a request. [RT #29682]
+
+3457.	[protocol]	Add ILNP records (NID, LP, L32, L64). [RT #31836]
+
+3456.	[port]		g++47: ATF failed to compile. [RT #32012]
+
+3455.	[contrib]	queryperf: fix getopt option list. [RT #32338]
+
+3454.	[port]		sparc64: improve atomic support. [RT #25182]
+
+3452.	[bug]		Accept duplicate singleton records. [RT #32329]
+
+3451.	[port]		Increase per thread stack size from 64K to 1M.
+			[RT #32230]
+
+3450.	[bug]		Stop logfileconfig system test spam system logs.
+			[RT #32315]
+
+3449.	[bug]		gen.c: use the pre-processor to construct format
+			strings so that compiler can perform sanity checks;
+			check the snprintf results. [RT #17576]
+
+3448.	[bug]		The allow-query-on ACL was not processed correctly.
+			[RT #29486]
+
+3447.	[port]		Add support for libxml2-2.9.x [RT #32231]
+
+3446.	[port]		win32: Add source ID (see change #3400) to build.
+			[RT #31683]
+
+3445.	[bug]		Warn about zone files with blank owner names
+			immediately after $ORIGIN directives. [RT #31848]
+
+3444.	[bug]		The NOQNAME proof was not being returned from cached
+			insecure responses. [RT #21409]
+
+3443.	[bug]		ddns-confgen: Some TSIG algorithms were incorrectly
+			rejected when generating keys. [RT #31927]
+
+3442.	[port]		Net::DNS 0.69 introduced a non backwards compatible
+			change. [RT #32216]
+
+3441.	[maint]		D.ROOT-SERVERS.NET is now 199.7.91.13.
+
+3440.	[bug]		Reorder get_key_struct to not trigger a assertion when
+			cleaning up due to out of memory error. [RT #32131]
+
+3439.	[bug]		contrib/dlz error checking fixes. [RT #32102]
+
+3438.	[bug]		Don't accept unknown data escape in quotes. [RT #32031]
+
+3437.	[bug]		isc_buffer_init -> isc_buffer_constinit to initialize
+			buffers with constant data. [RT #32064]
+
+3436.	[bug]		Check malloc/calloc return values. [RT #32088]
+
+3435.	[bug]		Cross compilation support in configure was broken.
+			[RT #32078]
+
+3431.	[bug]		ddns-confgen: Some valid key algorithms were
+			not accepted. [RT #31927]
+
+3430.	[bug]		win32: isc_time_formatISO8601 was missing the
+			'T' between the date and time. [RT #32044]
+
+3429.	[bug]		dns_zone_getserial2 could a return success without
+			returning a valid serial. [RT #32007]
+
+3428.	[cleanup]	dig: Add timezone to date output. [RT #2269]
+
+3427.	[bug]		dig +trace incorrectly displayed name server
+			addresses instead of names. [RT #31641]
+
+3425.	[bug]		"acacheentry" reference counting was broken resulting
+			in use after free. [RT #31908]
+
+3422.	[bug]		Added a clear error message for when the SOA does not
+			match the referral. [RT #31281]
+
+3421.	[bug]		Named loops when re-signing if all keys are offline.
+			[RT #31916]
+
+3420.	[bug]		Address VPATH compilation issues. [RT #31879]
+
+3419.	[bug]		Memory leak on validation cancel. [RT #31869]
+
+3415.	[bug]		named could die with a REQUIRE failure if a validation
+			was canceled. [RT #31804]
+
+3412.	[bug]		Copy timeval structure from control message data.
+			[RT #31548]
+
+3411.	[tuning]	Use IPV6_USE_MIN_MTU or equivalent with TCP in addition
+			to UDP. [RT #31690]
+
+3410.	[bug]		Addressed Coverity warnings. [RT #31626]
+
+3409.	[contrib]	contrib/dane/mkdane.sh: Tool to generate TLSA RR's
+			from X.509 certificates, for use with DANE
+			(DNS-based Authentication of Named Entities).
+			[RT #30513]
+
+3406.	[bug]		mem.c: Fix compilation errors when building with
+			ISC_MEM_TRACKLINES or ISC_MEMPOOL_NAMES disabled.
+			Also, ISC_MEM_DEBUG is no longer optional. [RT #31559]
+
+3405.	[bug]		Handle time going backwards in acache. [RT #31253]
+
+3404.	[bug]		dnssec-signzone: When re-signing a zone, remove
+			RRSIG and NSEC records from nodes that used to be
+			in-zone but are now below a zone cut. [RT #31556]
+
+3403.	[bug]		Silence noisy OpenSSL logging. [RT #31497]
+
+3402.	[test]		The IPv6 interface numbers used for system
+			tests were incorrect on some platforms. [RT #25085]
+
+3401.	[bug]		Addressed Coverity warnings. [RT #31484]
+
+3400.	[cleanup]	"named -V" can now report a source ID string, defined
+			in the "srcid" file in the build tree and normally set
+			to the most recent git hash.  [RT #31494]
+
+3397.	[bug]		dig crashed when using +nssearch with +tcp. [RT #25298]
+
+3396.	[bug]		OPT records were incorrectly removed from signed,
+			truncated responses. [RT #31439]
+
+3395.	[protocol]	Add RFC 6598 reverse zones to built in empty zones
+			list, 64.100.IN-ADDR.ARPA ... 127.100.IN-ADDR.ARPA.
+			[RT #31336]
+
+3394.	[bug]		Adjust 'successfully validated after lower casing
+			signer' log level and category. [RT #31414]
+
+3393.	[bug]		'host -C' could core dump if REFUSED was received.
+			[RT #31381]
+
+3391.	[bug]		A DNSKEY lookup that encountered a CNAME failed.
+			[RT #31262]
+
+3390.	[bug]		Silence clang compiler warnings. [RT #30417]
+
+3389.	[bug]		Always return NOERROR (not 0) in TSIG. [RT #31275]
+
+3388.	[bug]		Fixed several Coverity warnings.
+			Note: This change includes a fix for a bug that
+			was subsequently determined to be an exploitable
+			security vulnerability, CVE-2012-5688: named could
+			die on specific queries with dns64 enabled.
+			[RT #30996]
+
+3386.	[bug]		Address locking violation when generating new NSEC /
+			NSEC3 chains. [RT #31224]
+
+3384.	[bug]		Improved logging of crypto errors. [RT #30963]
 
 3383.	[security]	A certain combination of records in the RBT could
-                        cause named to hang while populating the additional
-                        section of a response. [RT #31090]
+			cause named to hang while populating the additional
+			section of a response. [RT #31090]
+
+3382.	[bug]		SOA query from slave used use-v6-udp-ports range,
+			if set, regardless of the address family in use.
+			[RT #24173]
+
+3381.	[contrib]	Update queryperf to support more RR types.
+			[RT #30762]
+
+3380.	[bug]		named could die if a nonexistent master list was
+			referenced in a also-notify. [RT #31004]
+
+3379.	[bug]		isc_interval_zero and isc_time_epoch should be
+			"const (type)* const". [RT #31069]
+
+3378.	[bug]		Handle missing 'managed-keys-directory' better.
+			[RT #30625]
+
+3376.	[bug]		Lack of EDNS support was being recorded without a
+			successful response. [RT #30811]
+
+3375.	[func]		Check that 'rndc dumpdb' works on a empty cache.
+			[RT #30808]
+
+3374.	[bug]		isc_parse_uint32 failed to return a range error on
+			systems with 64 bit longs. [RT #30232]
+
+3372.	[bug]		Silence spurious "deleted from unreachable cache"
+			messages.  [RT #30501]
+
+3371.	[bug]		AD=1 should behave like DO=1 when deciding whether to
+			add NS RRsets to the additional section or not.
+			[RT #30479]
+
+	--- 9.8.4 released ---
 
 3373.	[bug]		win32: open raw files in binary mode. [RT #30944]
 
@@ -135,11 +507,11 @@
 	--- 9.8.3 released ---
 
 3318.	[tuning]	Reduce the amount of work performed while holding a
-			bucket lock when finshed with a fetch context.
+			bucket lock when finished with a fetch context.
 			[RT #29239]
 
-3314.	[bug]		The masters list could be updated while refesh_callback
-			and stub_callback were using it. [RT #26732]
+3314.	[bug]		The masters list could be updated while stub_callback
+			or refresh_callback were using it. [RT #26732]
 
 3313.	[protocol]	Add TLSA record type. [RT #28989]
 
@@ -151,7 +523,7 @@
 
 3310.	[test]		Increase table size for mutex profiling. [RT #28809]
 
-3309.	[bug]		resolver.c:fctx_finddone() was not threadsafe.
+3309.	[bug]		resolver.c:fctx_finddone() was not thread safe.
 			[RT #27995]
 
 3307.	[bug]		Add missing ISC_LANG_BEGINDECLS and ISC_LANG_ENDDECLS.
@@ -328,7 +700,7 @@
 
 3234.	[bug]		'make depend' produced invalid makefiles. [RT #26830]
 
-3231.	[bug]		named could fail to send a uncompressable zone.
+3231.	[bug]		named could fail to send a incompressible zone.
 			[RT #26796]
 
 3230.	[bug]		'dig axfr' failed to properly handle a multi-message
@@ -345,7 +717,7 @@
 
 3226.	[bug]		Address minor resource leakages. [RT #26624]
 
-3221.	[bug]		Fixed a potential coredump on shutdown due to
+3221.	[bug]		Fixed a potential core dump on shutdown due to
 			referencing fetch context after it's been freed.
 			[RT #26720]
 
@@ -369,7 +741,7 @@
 
 3209.	[func]		Add "dnssec-lookaside 'no'".  [RT #24858]
 
-3208.	[bug]		'dig -y' handle unknown tsig alorithm better.
+3208.	[bug]		'dig -y' handle unknown tsig algorithm better.
 			[RT #25522]
 
 3207.	[contrib]	Fixed build error in Berkeley DB DLZ module. [RT #26444]
@@ -672,7 +1044,7 @@
 3077.	[bug]		zone.c:zone_refreshkeys() incorrectly called
 			dns_zone_attach(), use zone->irefs instead. [RT #23303]
 
-3075.	[bug]		dns_dnssec_findzonekeys{2} used a inconsistant
+3075.	[bug]		dns_dnssec_findzonekeys{2} used a inconsistent
 			timestamp when determining which keys are active.
 			[RT #23642]
 
@@ -686,7 +1058,7 @@
 3072.	[bug]		dns_dns64_aaaaok() potential NULL pointer dereference.
 			[RT #20256]
 
-3071.	[bug]		has_nsec could be used unintialised in
+3071.	[bug]		has_nsec could be used uninitialized in
 			update.c:next_active. [RT #20256]
 
 3070.	[bug]		dnssec-signzone potential NULL pointer dereference.
@@ -732,7 +1104,7 @@
 
 3052.	[test]		Fixed last autosign test report. [RT #23256]
 
-3051.	[bug]		NS records obsure DNAME records at the bottom of the
+3051.	[bug]		NS records obscure DNAME records at the bottom of the
 			zone if both are present. [RT #23035]
 
 3050.	[bug]		The autosign system test was timing dependent.
@@ -742,7 +1114,7 @@
 3049.	[bug]		Save and restore the gid when creating creating
 			named.pid at startup. [RT #23290]
 
-3048.	[bug]		Fully separate view key mangement. [RT #23419]
+3048.	[bug]		Fully separate view key management. [RT #23419]
 
 3047.	[bug]		DNSKEY NODATA responses not cached fixed in
 			validator.c. Tests added to dnssec system test.
@@ -1079,7 +1451,7 @@
 			no data response. [RT #21744]
 
 2952.	[port]		win32: named-checkzone and named-checkconf failed
-			to initialise winsock. [RT #21932]
+			to initialize winsock. [RT #21932]
 
 2951.	[bug]		named failed to generate a correct signed response
 			in a optout, delegation only zone with no secure
@@ -1125,7 +1497,7 @@
 			in use. [RT# 21868]
 
 2938.	[bug]		When generating signed responses, from a signed zone
-			that uses NSEC3, named would use a uninitialised
+			that uses NSEC3, named would use a uninitialized
 			pointer if it needed to skip a NSEC3 record because
 			it didn't match the selected NSEC3PARAM record for
 			zone. [RT# 21868]
@@ -1179,7 +1551,7 @@
 			revisit the issue and complete the fix later.
 			[RT #21710]
 
-2930.	[experimental]	New "rndc addzone" and "rndc delzone" commads
+2930.	[experimental]	New "rndc addzone" and "rndc delzone" commands
 			allow dynamic addition and deletion of zones.
 			To enable this feature, specify a "new-zone-file"
 			option at the view or options level in named.conf.
@@ -1355,7 +1727,7 @@
 			successfully responds to the query using plain DNS.
 			[RT #20930]
 
-2873.	[bug]		Cancelling a dynamic update via the dns/client module
+2873.	[bug]		Canceling a dynamic update via the dns/client module
 			could trigger an assertion failure. [RT #21133]
 
 2872.	[bug]		Modify dns/client.c:dns_client_createx() to only
@@ -1397,7 +1769,7 @@
 
 2860.	[bug]		named-checkconf's usage was out of date. [RT #21039]
 
-2859.	[bug]		When cancelling validation it was possible to leak
+2859.	[bug]		When canceling validation it was possible to leak
 			memory. [RT #20800]
 
 2858.	[bug]		RTT estimates were not being adjusted on ICMP errors.
@@ -1950,7 +2322,7 @@
 
 2695.	[func]		DHCP/DDNS - update fdwatch code for use by
 			DHCP.  Modify the api to isc_sockfdwatch_t (the
-			callback functon for isc_socket_fdwatchcreate)
+			callback function for isc_socket_fdwatchcreate)
 			to include information about the direction (read
 			or write) and add isc_socket_fdwatchpoke.
 			[RT #20253]
@@ -2015,7 +2387,7 @@
 			  sets the time when a key is no longer used for
 			  signing but is still published.
 			- The "unpublished" date (-U) is deprecated in
-			  favour of "deleted" (-D).
+			  favor of "deleted" (-D).
 			[RT #20247]
 
 2676.	[bug]		--with-export-installdir should have been
@@ -2461,7 +2833,7 @@
 
 2553.	[bug]		Reference leak on DNSSEC validation errors. [RT #19291]
 
-2552.	[bug]		zero-no-soa-ttl-cache was not being honoured.
+2552.	[bug]		zero-no-soa-ttl-cache was not being honored.
 			[RT #19340]
 
 2551.	[bug]		Potential Reference leak on return. [RT #19341]
@@ -2514,7 +2886,7 @@
 
 2534.	[func]		Check NAPTR records regular expressions and
 			replacement strings to ensure they are syntactically
-			valid and consistant. [RT #18168]
+			valid and consistent. [RT #18168]
 
 2533.	[doc]		ARM: document @ (at-sign). [RT #17144]
 

Modified: projects/bhyve_npt_pmap/contrib/bind9/COPYRIGHT
==============================================================================
--- projects/bhyve_npt_pmap/contrib/bind9/COPYRIGHT	Wed Aug 21 19:40:43 2013	(r254608)
+++ projects/bhyve_npt_pmap/contrib/bind9/COPYRIGHT	Wed Aug 21 20:38:19 2013	(r254609)
@@ -1,4 +1,4 @@
-Copyright (C) 2004-2012  Internet Systems Consortium, Inc. ("ISC")
+Copyright (C) 2004-2013  Internet Systems Consortium, Inc. ("ISC")
 Copyright (C) 1996-2003  Internet Software Consortium.
 
 Permission to use, copy, modify, and/or distribute this software for any

Modified: projects/bhyve_npt_pmap/contrib/bind9/FAQ
==============================================================================
--- projects/bhyve_npt_pmap/contrib/bind9/FAQ	Wed Aug 21 19:40:43 2013	(r254608)
+++ projects/bhyve_npt_pmap/contrib/bind9/FAQ	Wed Aug 21 20:38:19 2013	(r254609)
@@ -1,6 +1,6 @@
 Frequently Asked Questions about BIND 9
 
-Copyright © 2004-2010 Internet Systems Consortium, Inc. ("ISC")
+Copyright © 2004-2010, 2013 Internet Systems Consortium, Inc. ("ISC")
 
 Copyright © 2000-2003 Internet Software Consortium.
 
@@ -869,7 +869,7 @@ A: If you run Tiger(Mac OS 10.4) or late
    Copy the key statement from /etc/rndc.conf into /etc/rndc.key, e.g.:
 
    key "rndc-key" {
-           algorithm hmac-md5;
+           algorithm hmac-sha256;
            secret "uvceheVuqf17ZwIcTydddw==";
    };
 

Modified: projects/bhyve_npt_pmap/contrib/bind9/FAQ.xml
==============================================================================
--- projects/bhyve_npt_pmap/contrib/bind9/FAQ.xml	Wed Aug 21 19:40:43 2013	(r254608)
+++ projects/bhyve_npt_pmap/contrib/bind9/FAQ.xml	Wed Aug 21 20:38:19 2013	(r254609)
@@ -1,7 +1,7 @@
 
 |        |
+ * +--------+          +--------+
+ * Very useful for seeding software RNGs with output of
+ * Hardware RNGs like Intel's RdRand and VIA's Padlock.
+ *
+ * Returns a handle to the newly created kernel process.
+ */
+void *
+random_adaptor_use_as_entropy(const char *id, struct random_adaptor *adaptor,
+    int *control)
+{
+	int error;
+	struct proc *random_chain_proc;
+	struct entropy_thread_ctx *ctx;
+
+	KASSERT(adaptor != NULL, ("can't obtain randomness"));
+	KASSERT(control != NULL, ("can't control entropy process"));
+
+	ctx = malloc(sizeof(struct entropy_thread_ctx), M_RANDOM_ADAPTORS,
+	    M_WAITOK);
+
+	ctx->control = control;
+	ctx->adaptor = adaptor;
+
+	/* Start the thread */
+	error = kproc_create(random_proc, ctx, &random_chain_proc, RFHIGHPID,
+	    0, "%s_entropy", id);
+	if (error != 0)
+		panic("Cannot create rng chaining thread");
+
+	return random_chain_proc;
+}
+
 static void
 random_adaptors_deinit(void *unused)
 {
@@ -99,18 +263,28 @@ static int
 random_sysctl_adaptors_handler(SYSCTL_HANDLER_ARGS)
 {
 	struct random_adaptors	*rpp;
-	int error;
+	int error, count;
 
-	error = 0;
+	count = error = 0;
 
 	sx_slock(&adaptors_lock);
 
-	if (LIST_EMPTY(&adaptors))
-		error = SYSCTL_OUT(req, "", strlen(""));
+	if (LIST_EMPTY(&adaptors)) {
+		error = SYSCTL_OUT(req, "", 0);
+	} else {
+
+		LIST_FOREACH(rpp, &adaptors, entries) {
 
-	LIST_FOREACH(rpp, &adaptors, entries) {
-		if (0 != SYSCTL_OUT(req, rpp->name, strlen(rpp->name)))
-			break;
+			error = SYSCTL_OUT(req, ",", count++ ? 1 : 0);
+
+			if (error)
+				break;
+
+			error = SYSCTL_OUT(req, rpp->name, strlen(rpp->name));
+
+			if (error)
+				break;
+		}
 	}
 
 	sx_sunlock(&adaptors_lock);
@@ -118,6 +292,37 @@ random_sysctl_adaptors_handler(SYSCTL_HA
 	return (error);
 }
 
+static int
+random_sysctl_active_adaptor_handler(SYSCTL_HANDLER_ARGS)
+{
+	struct random_adaptor	*rsp;
+	struct random_adaptors	*rpp;
+	const char		*name;
+	int error;
+
+	name = NULL;
+	rsp = random_get_active_adaptor();
+
+	if (rsp != NULL) {
+		sx_slock(&adaptors_lock);
+
+		LIST_FOREACH(rpp, &adaptors, entries) {
+			if (rpp->rsp == rsp)
+				name = rpp->name;
+		}
+
+		sx_sunlock(&adaptors_lock);
+	}
+
+	if (rsp == NULL || name == NULL) {
+		error = SYSCTL_OUT(req, "", 0);
+	} else {
+		error = SYSCTL_OUT(req, name, strlen(name));
+	}
+
+	return (error);
+}
+
 static void
 random_adaptors_init(void *unused)
 {
@@ -127,6 +332,11 @@ random_adaptors_init(void *unused)
 	    NULL, 0, random_sysctl_adaptors_handler, "",
 	    "Random Number Generator adaptors");
 
+	SYSCTL_PROC(_kern_random, OID_AUTO, active_adaptor,
+	    CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_MPSAFE,
+	    NULL, 0, random_sysctl_active_adaptor_handler, "",
+	    "Active Random Number Generator Adaptor");
+
 	sx_init(&adaptors_lock, "random_adaptors");
 }
 

Modified: projects/random_number_generator/sys/dev/random/random_adaptors.h
==============================================================================
--- projects/random_number_generator/sys/dev/random/random_adaptors.h	Sat Aug 24 13:49:43 2013	(r254783)
+++ projects/random_number_generator/sys/dev/random/random_adaptors.h	Sat Aug 24 13:54:56 2013	(r254784)
@@ -39,6 +39,9 @@ struct random_adaptors {
 
 struct random_adaptor *random_adaptor_get(const char *);
 int random_adaptor_register(const char *, struct random_adaptor *);
+void random_adaptor_choose(struct random_adaptor **);
+void *random_adaptor_use_as_entropy(const char *, struct random_adaptor *,
+    int *);
 
 /*
  * random_adaptor's should be registered prior to

Modified: projects/random_number_generator/sys/dev/random/randomdev.c
==============================================================================
--- projects/random_number_generator/sys/dev/random/randomdev.c	Sat Aug 24 13:49:43 2013	(r254783)
+++ projects/random_number_generator/sys/dev/random/randomdev.c	Sat Aug 24 13:54:56 2013	(r254784)
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
 #include 
 #include 
 
+#include 
 #include 
 
 #define RANDOM_MINOR	0
@@ -85,6 +86,13 @@ random_null_func(void)
 {
 }
 
+struct random_adaptor *
+random_get_active_adaptor(void)
+{ 
+
+	return (random_adaptor);
+}
+
 /* ARGSUSED */
 static int
 random_close(struct cdev *dev __unused, int flags, int fmt __unused,
@@ -215,7 +223,7 @@ random_modevent(module_t mod __unused, i
 
 	switch (type) {
 	case MOD_LOAD:
-		random_ident_hardware(&random_adaptor);
+		random_adaptor_choose(&random_adaptor);
 
 		if (random_adaptor == NULL) {
 			printf(

Modified: projects/random_number_generator/sys/dev/random/randomdev.h
==============================================================================
--- projects/random_number_generator/sys/dev/random/randomdev.h	Sat Aug 24 13:49:43 2013	(r254783)
+++ projects/random_number_generator/sys/dev/random/randomdev.h	Sat Aug 24 13:54:56 2013	(r254784)
@@ -53,3 +53,4 @@ struct random_adaptor {
 
 extern void random_ident_hardware(struct random_adaptor **);
 extern void random_null_func(void);
+struct random_adaptor *random_get_active_adaptor(void);

Modified: projects/random_number_generator/sys/modules/random/Makefile
==============================================================================
--- projects/random_number_generator/sys/modules/random/Makefile	Sat Aug 24 13:49:43 2013	(r254783)
+++ projects/random_number_generator/sys/modules/random/Makefile	Sat Aug 24 13:54:56 2013	(r254784)
@@ -5,7 +5,7 @@
 .PATH: ${.CURDIR}/../../crypto/sha2
 
 KMOD=	random
-SRCS=	randomdev.c probe.c
+SRCS=	randomdev.c
 .if ${MACHINE} == "amd64" || ${MACHINE} == "i386"
 SRCS+=	nehemiah.c
 SRCS+=	ivy.c

From owner-svn-src-projects@FreeBSD.ORG  Sat Aug 24 14:49:55 2013
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 7ECBB659;
 Sat, 24 Aug 2013 14:49:55 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6994921DE;
 Sat, 24 Aug 2013 14:49:55 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7OEnt6N064048;
 Sat, 24 Aug 2013 14:49:55 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7OEnpoR063993;
 Sat, 24 Aug 2013 14:49:51 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201308241449.r7OEnpoR063993@svn.freebsd.org>
From: Alexander Motin 
Date: Sat, 24 Aug 2013 14:49:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r254788 - in projects/camlock: bin/sh
 cddl/contrib/opensolaris/cmd/zpool cddl/contrib/opensolaris/common/ctf
 cddl/contrib/opensolaris/lib/libctf/common
 cddl/contrib/opensolaris/lib/libz...
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
 tree" 
List-Unsubscribe: , 
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
 
X-List-Received-Date: Sat, 24 Aug 2013 14:49:55 -0000

Author: mav
Date: Sat Aug 24 14:49:51 2013
New Revision: 254788
URL: http://svnweb.freebsd.org/changeset/base/254788

Log:
  MFC @ r254787

Modified:
  projects/camlock/bin/sh/jobs.c
  projects/camlock/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  projects/camlock/cddl/contrib/opensolaris/common/ctf/ctf_create.c
  projects/camlock/cddl/contrib/opensolaris/common/ctf/ctf_error.c
  projects/camlock/cddl/contrib/opensolaris/common/ctf/ctf_impl.h
  projects/camlock/cddl/contrib/opensolaris/common/ctf/ctf_open.c
  projects/camlock/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c
  projects/camlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c
  projects/camlock/contrib/llvm/tools/lldb/include/lldb/Expression/IRExecutionUnit.h
  projects/camlock/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp
  projects/camlock/contrib/llvm/tools/lldb/source/Expression/IRExecutionUnit.cpp
  projects/camlock/contrib/llvm/tools/lldb/source/Host/common/FileSpec.cpp
  projects/camlock/contrib/llvm/tools/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
  projects/camlock/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
  projects/camlock/etc/network.subr
  projects/camlock/share/man/man4/sa.4
  projects/camlock/share/man/man9/pfil.9
  projects/camlock/sys/cam/cam_xpt.c
  projects/camlock/sys/cam/ctl/ctl.c
  projects/camlock/sys/cam/ctl/ctl.h
  projects/camlock/sys/cam/ctl/ctl_backend.h
  projects/camlock/sys/cam/ctl/ctl_backend_block.c
  projects/camlock/sys/cam/ctl/ctl_backend_ramdisk.c
  projects/camlock/sys/cam/ctl/ctl_frontend.h
  projects/camlock/sys/cam/ctl/ctl_io.h
  projects/camlock/sys/cam/scsi/scsi_sa.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_destroy.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h
  projects/camlock/sys/contrib/dev/acpica/acpica_prep.sh
  projects/camlock/sys/contrib/dev/acpica/changes.txt   (contents, props changed)
  projects/camlock/sys/contrib/dev/acpica/common/adisasm.c
  projects/camlock/sys/contrib/dev/acpica/common/adwalk.c
  projects/camlock/sys/contrib/dev/acpica/common/dmextern.c
  projects/camlock/sys/contrib/dev/acpica/common/dmtable.c
  projects/camlock/sys/contrib/dev/acpica/compiler/aslcompile.c
  projects/camlock/sys/contrib/dev/acpica/compiler/aslglobal.h
  projects/camlock/sys/contrib/dev/acpica/compiler/aslload.c
  projects/camlock/sys/contrib/dev/acpica/compiler/aslmain.c
  projects/camlock/sys/contrib/dev/acpica/compiler/asloptions.c
  projects/camlock/sys/contrib/dev/acpica/compiler/dtcompile.c
  projects/camlock/sys/contrib/dev/acpica/components/debugger/dbcmds.c
  projects/camlock/sys/contrib/dev/acpica/components/debugger/dbfileio.c
  projects/camlock/sys/contrib/dev/acpica/components/debugger/dbinput.c
  projects/camlock/sys/contrib/dev/acpica/components/debugger/dbnames.c
  projects/camlock/sys/contrib/dev/acpica/components/events/evgpeutil.c
  projects/camlock/sys/contrib/dev/acpica/components/events/evmisc.c
  projects/camlock/sys/contrib/dev/acpica/components/events/evregion.c
  projects/camlock/sys/contrib/dev/acpica/components/events/evsci.c
  projects/camlock/sys/contrib/dev/acpica/components/events/evxface.c
  projects/camlock/sys/contrib/dev/acpica/components/hardware/hwxface.c
  projects/camlock/sys/contrib/dev/acpica/components/namespace/nsaccess.c
  projects/camlock/sys/contrib/dev/acpica/components/namespace/nsdump.c
  projects/camlock/sys/contrib/dev/acpica/components/namespace/nsxfeval.c
  projects/camlock/sys/contrib/dev/acpica/components/tables/tbinstal.c
  projects/camlock/sys/contrib/dev/acpica/components/tables/tbprint.c
  projects/camlock/sys/contrib/dev/acpica/components/tables/tbxfroot.c
  projects/camlock/sys/contrib/dev/acpica/components/utilities/utdebug.c
  projects/camlock/sys/contrib/dev/acpica/components/utilities/utglobal.c
  projects/camlock/sys/contrib/dev/acpica/include/acdebug.h
  projects/camlock/sys/contrib/dev/acpica/include/acdisasm.h
  projects/camlock/sys/contrib/dev/acpica/include/acevents.h
  projects/camlock/sys/contrib/dev/acpica/include/acexcep.h
  projects/camlock/sys/contrib/dev/acpica/include/acglobal.h
  projects/camlock/sys/contrib/dev/acpica/include/aclocal.h
  projects/camlock/sys/contrib/dev/acpica/include/acnamesp.h
  projects/camlock/sys/contrib/dev/acpica/include/acpiosxf.h
  projects/camlock/sys/contrib/dev/acpica/include/acpixf.h
  projects/camlock/sys/contrib/dev/acpica/include/actypes.h
  projects/camlock/sys/contrib/dev/acpica/os_specific/service_layers/osunixxf.c
  projects/camlock/sys/dev/mfi/mfi_cam.c
  projects/camlock/sys/fs/tmpfs/tmpfs_vfsops.c
  projects/camlock/sys/geom/geom_disk.c
  projects/camlock/sys/kern/kern_jail.c
  projects/camlock/sys/kern/kern_mbuf.c
  projects/camlock/sys/kern/kern_physio.c
  projects/camlock/sys/kern/uipc_mbuf.c
  projects/camlock/sys/net/pfil.c
  projects/camlock/sys/net/pfil.h
  projects/camlock/sys/netpfil/ipfw/ip_dummynet.c
  projects/camlock/sys/netpfil/ipfw/ip_fw2.c
  projects/camlock/sys/netpfil/ipfw/ip_fw_nat.c
  projects/camlock/sys/netpfil/ipfw/ip_fw_private.h
  projects/camlock/sys/sys/conf.h
  projects/camlock/sys/sys/jail.h
  projects/camlock/sys/sys/mbuf.h
  projects/camlock/sys/sys/mount.h
  projects/camlock/sys/sys/param.h
  projects/camlock/usr.sbin/jail/jail.8
Directory Properties:
  projects/camlock/   (props changed)
  projects/camlock/cddl/   (props changed)
  projects/camlock/cddl/contrib/opensolaris/   (props changed)
  projects/camlock/cddl/contrib/opensolaris/lib/libzfs/   (props changed)
  projects/camlock/contrib/llvm/   (props changed)
  projects/camlock/share/man/man4/   (props changed)
  projects/camlock/sys/   (props changed)
  projects/camlock/sys/cddl/contrib/opensolaris/   (props changed)
  projects/camlock/sys/contrib/dev/acpica/   (props changed)
  projects/camlock/sys/contrib/dev/acpica/common/   (props changed)
  projects/camlock/sys/contrib/dev/acpica/compiler/   (props changed)
  projects/camlock/sys/contrib/dev/acpica/components/debugger/   (props changed)
  projects/camlock/sys/contrib/dev/acpica/components/events/   (props changed)
  projects/camlock/sys/contrib/dev/acpica/components/hardware/   (props changed)
  projects/camlock/sys/contrib/dev/acpica/components/namespace/   (props changed)
  projects/camlock/sys/contrib/dev/acpica/components/tables/   (props changed)
  projects/camlock/sys/contrib/dev/acpica/components/utilities/   (props changed)
  projects/camlock/sys/contrib/dev/acpica/include/   (props changed)
  projects/camlock/sys/contrib/dev/acpica/os_specific/   (props changed)
  projects/camlock/usr.sbin/jail/   (props changed)

Modified: projects/camlock/bin/sh/jobs.c
==============================================================================
--- projects/camlock/bin/sh/jobs.c	Sat Aug 24 14:41:49 2013	(r254787)
+++ projects/camlock/bin/sh/jobs.c	Sat Aug 24 14:49:51 2013	(r254788)
@@ -495,14 +495,10 @@ waitcmdloop(struct job *job)
 	in_waitcmd++;
 	do {
 		if (job != NULL) {
-			if (job->state) {
+			if (job->state == JOBDONE) {
 				status = job->ps[job->nprocs - 1].status;
 				if (WIFEXITED(status))
 					retval = WEXITSTATUS(status);
-#if JOBS
-				else if (WIFSTOPPED(status))
-					retval = WSTOPSIG(status) + 128;
-#endif
 				else
 					retval = WTERMSIG(status) + 128;
 				if (! iflag || ! job->changed)

Modified: projects/camlock/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Sat Aug 24 14:41:49 2013	(r254787)
+++ projects/camlock/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c	Sat Aug 24 14:49:51 2013	(r254788)
@@ -25,6 +25,7 @@
  * Copyright (c) 2012 by Delphix. All rights reserved.
  * Copyright (c) 2012 by Frederik Wessels. All rights reserved.
  * Copyright (c) 2012 Martin Matuska . All rights reserved.
+ * Copyright (c) 2013 by Prasad Joshi (sTec). All rights reserved.
  */
 
 #include 
@@ -2128,8 +2129,10 @@ zpool_do_import(int argc, char **argv)
 
 		errno = 0;
 		searchguid = strtoull(argv[0], &endptr, 10);
-		if (errno != 0 || *endptr != '\0')
+		if (errno != 0 || *endptr != '\0') {
 			searchname = argv[0];
+			searchguid = 0;
+		}
 		found_config = NULL;
 
 		/*

Modified: projects/camlock/cddl/contrib/opensolaris/common/ctf/ctf_create.c
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/common/ctf/ctf_create.c	Sat Aug 24 14:41:49 2013	(r254787)
+++ projects/camlock/cddl/contrib/opensolaris/common/ctf/ctf_create.c	Sat Aug 24 14:49:51 2013	(r254788)
@@ -24,13 +24,15 @@
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*
+ * Copyright (c) 2013, Joyent, Inc.  All rights reserved.
+ */
 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 /*
  * This static string is used as the template for initially populating a
@@ -167,6 +169,51 @@ ctf_copy_membnames(ctf_dtdef_t *dtd, uch
 }
 
 /*
+ * Only types of dyanmic CTF containers contain reference counts. These
+ * containers are marked RD/WR. Because of that we basically make this a no-op
+ * for compatability with non-dynamic CTF sections. This is also a no-op for
+ * types which are not dynamic types. It is the responsibility of the caller to
+ * make sure it is a valid type. We help that caller out on debug builds.
+ *
+ * Note that the reference counts are not maintained for types that are not
+ * within this container. In other words if we have a type in a parent, that
+ * will not have its reference count increased. On the flip side, the parent
+ * will not be allowed to remove dynamic types if it has children.
+ */
+static void
+ctf_ref_inc(ctf_file_t *fp, ctf_id_t tid)
+{
+	ctf_dtdef_t *dtd = ctf_dtd_lookup(fp, tid);
+
+	if (dtd == NULL)
+		return;
+
+	if (!(fp->ctf_flags & LCTF_RDWR))
+		return;
+
+	dtd->dtd_ref++;
+}
+
+/*
+ * Just as with ctf_ref_inc, this is a no-op on non-writeable containers and the
+ * caller should ensure that this is already a valid type.
+ */
+static void
+ctf_ref_dec(ctf_file_t *fp, ctf_id_t tid)
+{
+	ctf_dtdef_t *dtd = ctf_dtd_lookup(fp, tid);
+
+	if (dtd == NULL)
+		return;
+
+	if (!(fp->ctf_flags & LCTF_RDWR))
+		return;
+
+	ASSERT(dtd->dtd_ref >= 1);
+	dtd->dtd_ref--;
+}
+
+/*
  * If the specified CTF container is writable and has been modified, reload
  * this container with the updated type definitions.  In order to make this
  * code and the rest of libctf as simple as possible, we perform updates by
@@ -180,6 +227,10 @@ ctf_copy_membnames(ctf_dtdef_t *dtd, uch
  * ctf_bufopen() will return a new ctf_file_t, but we want to keep the fp
  * constant for the caller, so after ctf_bufopen() returns, we use bcopy to
  * swap the interior of the old and new ctf_file_t's, and then free the old.
+ *
+ * Note that the lists of dynamic types stays around and the resulting container
+ * is still writeable. Furthermore, the reference counts that are on the dtd's
+ * are still valid.
  */
 int
 ctf_update(ctf_file_t *fp)
@@ -432,6 +483,7 @@ ctf_dtd_delete(ctf_file_t *fp, ctf_dtdef
 	ctf_dtdef_t *p, **q = &fp->ctf_dthash[h];
 	ctf_dmdef_t *dmd, *nmd;
 	size_t len;
+	int kind, i;
 
 	for (p = *q; p != NULL; p = p->dtd_hash) {
 		if (p != dtd)
@@ -443,7 +495,8 @@ ctf_dtd_delete(ctf_file_t *fp, ctf_dtdef
 	if (p != NULL)
 		*q = p->dtd_hash;
 
-	switch (CTF_INFO_KIND(dtd->dtd_data.ctt_info)) {
+	kind = CTF_INFO_KIND(dtd->dtd_data.ctt_info);
+	switch (kind) {
 	case CTF_K_STRUCT:
 	case CTF_K_UNION:
 	case CTF_K_ENUM:
@@ -454,14 +507,33 @@ ctf_dtd_delete(ctf_file_t *fp, ctf_dtdef
 				ctf_free(dmd->dmd_name, len);
 				fp->ctf_dtstrlen -= len;
 			}
+			if (kind != CTF_K_ENUM)
+				ctf_ref_dec(fp, dmd->dmd_type);
 			nmd = ctf_list_next(dmd);
 			ctf_free(dmd, sizeof (ctf_dmdef_t));
 		}
 		break;
 	case CTF_K_FUNCTION:
+		ctf_ref_dec(fp, dtd->dtd_data.ctt_type);
+		for (i = 0; i < CTF_INFO_VLEN(dtd->dtd_data.ctt_info); i++)
+			if (dtd->dtd_u.dtu_argv[i] != 0)
+				ctf_ref_dec(fp, dtd->dtd_u.dtu_argv[i]);
 		ctf_free(dtd->dtd_u.dtu_argv, sizeof (ctf_id_t) *
 		    CTF_INFO_VLEN(dtd->dtd_data.ctt_info));
 		break;
+	case CTF_K_ARRAY:
+		ctf_ref_dec(fp, dtd->dtd_u.dtu_arr.ctr_contents);
+		ctf_ref_dec(fp, dtd->dtd_u.dtu_arr.ctr_index);
+		break;
+	case CTF_K_TYPEDEF:
+		ctf_ref_dec(fp, dtd->dtd_data.ctt_type);
+		break;
+	case CTF_K_POINTER:
+	case CTF_K_VOLATILE:
+	case CTF_K_CONST:
+	case CTF_K_RESTRICT:
+		ctf_ref_dec(fp, dtd->dtd_data.ctt_type);
+		break;
 	}
 
 	if (dtd->dtd_name) {
@@ -495,7 +567,9 @@ ctf_dtd_lookup(ctf_file_t *fp, ctf_id_t 
  * Discard all of the dynamic type definitions that have been added to the
  * container since the last call to ctf_update().  We locate such types by
  * scanning the list and deleting elements that have type IDs greater than
- * ctf_dtoldid, which is set by ctf_update(), above.
+ * ctf_dtoldid, which is set by ctf_update(), above. Note that to work properly
+ * with our reference counting schemes, we must delete the dynamic list in
+ * reverse.
  */
 int
 ctf_discard(ctf_file_t *fp)
@@ -508,11 +582,11 @@ ctf_discard(ctf_file_t *fp)
 	if (!(fp->ctf_flags & LCTF_DIRTY))
 		return (0); /* no update required */
 
-	for (dtd = ctf_list_next(&fp->ctf_dtdefs); dtd != NULL; dtd = ntd) {
+	for (dtd = ctf_list_prev(&fp->ctf_dtdefs); dtd != NULL; dtd = ntd) {
 		if (dtd->dtd_type <= fp->ctf_dtoldid)
 			continue; /* skip types that have been committed */
 
-		ntd = ctf_list_next(dtd);
+		ntd = ctf_list_prev(dtd);
 		ctf_dtd_delete(fp, dtd);
 	}
 
@@ -614,6 +688,8 @@ ctf_add_reftype(ctf_file_t *fp, uint_t f
 	if ((type = ctf_add_generic(fp, flag, NULL, &dtd)) == CTF_ERR)
 		return (CTF_ERR); /* errno is set for us */
 
+	ctf_ref_inc(fp, ref);
+
 	dtd->dtd_data.ctt_info = CTF_TYPE_INFO(kind, flag, 0);
 	dtd->dtd_data.ctt_type = (ushort_t)ref;
 
@@ -645,16 +721,29 @@ ctf_add_array(ctf_file_t *fp, uint_t fla
 {
 	ctf_dtdef_t *dtd;
 	ctf_id_t type;
+	ctf_file_t *fpd;
 
 	if (arp == NULL)
 		return (ctf_set_errno(fp, EINVAL));
 
+	fpd = fp;
+	if (ctf_lookup_by_id(&fpd, arp->ctr_contents) == NULL &&
+	    ctf_dtd_lookup(fp, arp->ctr_contents) == NULL)
+		return (ctf_set_errno(fp, ECTF_BADID));
+
+	fpd = fp;
+	if (ctf_lookup_by_id(&fpd, arp->ctr_index) == NULL &&
+	    ctf_dtd_lookup(fp, arp->ctr_index) == NULL)
+		return (ctf_set_errno(fp, ECTF_BADID));
+
 	if ((type = ctf_add_generic(fp, flag, NULL, &dtd)) == CTF_ERR)
 		return (CTF_ERR); /* errno is set for us */
 
 	dtd->dtd_data.ctt_info = CTF_TYPE_INFO(CTF_K_ARRAY, flag, 0);
 	dtd->dtd_data.ctt_size = 0;
 	dtd->dtd_u.dtu_arr = *arp;
+	ctf_ref_inc(fp, arp->ctr_contents);
+	ctf_ref_inc(fp, arp->ctr_index);
 
 	return (type);
 }
@@ -662,6 +751,7 @@ ctf_add_array(ctf_file_t *fp, uint_t fla
 int
 ctf_set_array(ctf_file_t *fp, ctf_id_t type, const ctf_arinfo_t *arp)
 {
+	ctf_file_t *fpd;
 	ctf_dtdef_t *dtd = ctf_dtd_lookup(fp, type);
 
 	if (!(fp->ctf_flags & LCTF_RDWR))
@@ -670,8 +760,22 @@ ctf_set_array(ctf_file_t *fp, ctf_id_t t
 	if (dtd == NULL || CTF_INFO_KIND(dtd->dtd_data.ctt_info) != CTF_K_ARRAY)
 		return (ctf_set_errno(fp, ECTF_BADID));
 
+	fpd = fp;
+	if (ctf_lookup_by_id(&fpd, arp->ctr_contents) == NULL &&
+	    ctf_dtd_lookup(fp, arp->ctr_contents) == NULL)
+		return (ctf_set_errno(fp, ECTF_BADID));
+
+	fpd = fp;
+	if (ctf_lookup_by_id(&fpd, arp->ctr_index) == NULL &&
+	    ctf_dtd_lookup(fp, arp->ctr_index) == NULL)
+		return (ctf_set_errno(fp, ECTF_BADID));
+
+	ctf_ref_dec(fp, dtd->dtd_u.dtu_arr.ctr_contents);
+	ctf_ref_dec(fp, dtd->dtd_u.dtu_arr.ctr_index);
 	fp->ctf_flags |= LCTF_DIRTY;
 	dtd->dtd_u.dtu_arr = *arp;
+	ctf_ref_inc(fp, arp->ctr_contents);
+	ctf_ref_inc(fp, arp->ctr_index);
 
 	return (0);
 }
@@ -683,7 +787,9 @@ ctf_add_function(ctf_file_t *fp, uint_t 
 	ctf_dtdef_t *dtd;
 	ctf_id_t type;
 	uint_t vlen;
+	int i;
 	ctf_id_t *vdat = NULL;
+	ctf_file_t *fpd;
 
 	if (ctc == NULL || (ctc->ctc_flags & ~CTF_FUNC_VARARG) != 0 ||
 	    (ctc->ctc_argc != 0 && argv == NULL))
@@ -696,6 +802,18 @@ ctf_add_function(ctf_file_t *fp, uint_t 
 	if (vlen > CTF_MAX_VLEN)
 		return (ctf_set_errno(fp, EOVERFLOW));
 
+	fpd = fp;
+	if (ctf_lookup_by_id(&fpd, ctc->ctc_return) == NULL &&
+	    ctf_dtd_lookup(fp, ctc->ctc_return) == NULL)
+		return (ctf_set_errno(fp, ECTF_BADID));
+
+	for (i = 0; i < ctc->ctc_argc; i++) {
+		fpd = fp;
+		if (ctf_lookup_by_id(&fpd, argv[i]) == NULL &&
+		    ctf_dtd_lookup(fp, argv[i]) == NULL)
+			return (ctf_set_errno(fp, ECTF_BADID));
+	}
+
 	if (vlen != 0 && (vdat = ctf_alloc(sizeof (ctf_id_t) * vlen)) == NULL)
 		return (ctf_set_errno(fp, EAGAIN));
 
@@ -707,6 +825,10 @@ ctf_add_function(ctf_file_t *fp, uint_t 
 	dtd->dtd_data.ctt_info = CTF_TYPE_INFO(CTF_K_FUNCTION, flag, vlen);
 	dtd->dtd_data.ctt_type = (ushort_t)ctc->ctc_return;
 
+	ctf_ref_inc(fp, ctc->ctc_return);
+	for (i = 0; i < ctc->ctc_argc; i++)
+		ctf_ref_inc(fp, argv[i]);
+
 	bcopy(argv, vdat, sizeof (ctf_id_t) * ctc->ctc_argc);
 	if (ctc->ctc_flags & CTF_FUNC_VARARG)
 		vdat[vlen - 1] = 0; /* add trailing zero to indicate varargs */
@@ -825,8 +947,11 @@ ctf_add_typedef(ctf_file_t *fp, uint_t f
 {
 	ctf_dtdef_t *dtd;
 	ctf_id_t type;
+	ctf_file_t *fpd;
 
-	if (ref == CTF_ERR || ref < 0 || ref > CTF_MAX_TYPE)
+	fpd = fp;
+	if (ref == CTF_ERR || (ctf_lookup_by_id(&fpd, ref) == NULL &&
+	    ctf_dtd_lookup(fp, ref) == NULL))
 		return (ctf_set_errno(fp, EINVAL));
 
 	if ((type = ctf_add_generic(fp, flag, name, &dtd)) == CTF_ERR)
@@ -834,6 +959,7 @@ ctf_add_typedef(ctf_file_t *fp, uint_t f
 
 	dtd->dtd_data.ctt_info = CTF_TYPE_INFO(CTF_K_TYPEDEF, flag, 0);
 	dtd->dtd_data.ctt_type = (ushort_t)ref;
+	ctf_ref_inc(fp, ref);
 
 	return (type);
 }
@@ -1008,6 +1134,45 @@ ctf_add_member(ctf_file_t *fp, ctf_id_t 
 	if (s != NULL)
 		fp->ctf_dtstrlen += strlen(s) + 1;
 
+	ctf_ref_inc(fp, type);
+	fp->ctf_flags |= LCTF_DIRTY;
+	return (0);
+}
+
+/*
+ * This removes a type from the dynamic section. This will fail if the type is
+ * referenced by another type. Note that the CTF ID is never reused currently by
+ * CTF. Note that if this container is a parent container then we just outright
+ * refuse to remove the type. There currently is no notion of searching for the
+ * ctf_dtdef_t in parent containers. If there is, then this constraint could
+ * become finer grained.
+ */
+int
+ctf_delete_type(ctf_file_t *fp, ctf_id_t type)
+{
+	ctf_file_t *fpd;
+	ctf_dtdef_t *dtd = ctf_dtd_lookup(fp, type);
+
+	if (!(fp->ctf_flags & LCTF_RDWR))
+		return (ctf_set_errno(fp, ECTF_RDONLY));
+
+	/*
+	 * We want to give as useful an errno as possible. That means that we
+	 * want to distinguish between a type which does not exist and one for
+	 * which the type is not dynamic.
+	 */
+	fpd = fp;
+	if (ctf_lookup_by_id(&fpd, type) == NULL &&
+	    ctf_dtd_lookup(fp, type) == NULL)
+		return (CTF_ERR); /* errno is set for us */
+
+	if (dtd == NULL)
+		return (ctf_set_errno(fp, ECTF_NOTDYN));
+
+	if (dtd->dtd_ref != 0 || fp->ctf_refcnt > 1)
+		return (ctf_set_errno(fp, ECTF_REFERENCED));
+
+	ctf_dtd_delete(fp, dtd);
 	fp->ctf_flags |= LCTF_DIRTY;
 	return (0);
 }
@@ -1103,6 +1268,9 @@ ctf_add_type(ctf_file_t *dst_fp, ctf_fil
 	ctf_hash_t *hp;
 	ctf_helem_t *hep;
 
+	if (dst_fp == src_fp)
+		return (src_type);
+
 	if (!(dst_fp->ctf_flags & LCTF_RDWR))
 		return (ctf_set_errno(dst_fp, ECTF_RDONLY));
 
@@ -1313,6 +1481,14 @@ ctf_add_type(ctf_file_t *dst_fp, ctf_fil
 
 		if (errs)
 			return (CTF_ERR); /* errno is set for us */
+
+		/*
+		 * Now that we know that we can't fail, we go through and bump
+		 * all the reference counts on the member types.
+		 */
+		for (dmd = ctf_list_next(&dtd->dtd_u.dtu_members);
+		    dmd != NULL; dmd = ctf_list_next(dmd))
+			ctf_ref_inc(dst_fp, dmd->dmd_type);
 		break;
 	}
 

Modified: projects/camlock/cddl/contrib/opensolaris/common/ctf/ctf_error.c
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/common/ctf/ctf_error.c	Sat Aug 24 14:41:49 2013	(r254787)
+++ projects/camlock/cddl/contrib/opensolaris/common/ctf/ctf_error.c	Sat Aug 24 14:49:51 2013	(r254788)
@@ -23,8 +23,9 @@
  * Copyright 2003 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*
+ * Copyright (c) 2012, Joyent, Inc.
+ */
 
 #include 
 
@@ -73,6 +74,8 @@ static const char *const _ctf_errlist[] 
 	"Limit on number of dynamic types reached",	 /* ECTF_FULL */
 	"Duplicate member name definition",		 /* ECTF_DUPMEMBER */
 	"Conflicting type is already defined",		 /* ECTF_CONFLICT */
+	"Type has outstanding references",		 /* ECTF_REFERENCED */
+	"Type is not a dynamic type"			 /* ECTF_NOTDYN */
 };
 
 static const int _ctf_nerr = sizeof (_ctf_errlist) / sizeof (_ctf_errlist[0]);

Modified: projects/camlock/cddl/contrib/opensolaris/common/ctf/ctf_impl.h
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/common/ctf/ctf_impl.h	Sat Aug 24 14:41:49 2013	(r254787)
+++ projects/camlock/cddl/contrib/opensolaris/common/ctf/ctf_impl.h	Sat Aug 24 14:49:51 2013	(r254788)
@@ -24,12 +24,13 @@
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
+/*
+ * Copyright (c) 2012, Joyent, Inc.  All rights reserved.
+ */
 
 #ifndef	_CTF_IMPL_H
 #define	_CTF_IMPL_H
 
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
-
 #include 
 #include 
 #include 
@@ -149,6 +150,7 @@ typedef struct ctf_dtdef {
 	char *dtd_name;		/* name associated with definition (if any) */
 	ctf_id_t dtd_type;	/* type identifier for this definition */
 	ctf_type_t dtd_data;	/* type node (see ) */
+	int dtd_ref;		/* recfount for dyanmic types */
 	union {
 		ctf_list_t dtu_members;	/* struct, union, or enum */
 		ctf_arinfo_t dtu_arr;	/* array */
@@ -269,7 +271,9 @@ enum {
 	ECTF_DTFULL,		/* CTF type is full (no more members allowed) */
 	ECTF_FULL,		/* CTF container is full */
 	ECTF_DUPMEMBER,		/* duplicate member name definition */
-	ECTF_CONFLICT		/* conflicting type definition present */
+	ECTF_CONFLICT,		/* conflicting type definition present */
+	ECTF_REFERENCED,	/* type has outstanding references */
+	ECTF_NOTDYN		/* type is not a dynamic type */
 };
 
 extern ssize_t ctf_get_ctt_size(const ctf_file_t *, const ctf_type_t *,

Modified: projects/camlock/cddl/contrib/opensolaris/common/ctf/ctf_open.c
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/common/ctf/ctf_open.c	Sat Aug 24 14:41:49 2013	(r254787)
+++ projects/camlock/cddl/contrib/opensolaris/common/ctf/ctf_open.c	Sat Aug 24 14:49:51 2013	(r254788)
@@ -24,8 +24,9 @@
  * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
-
-#pragma ident	"%Z%%M%	%I%	%E% SMI"
+/*
+ * Copyright (c) 2012, Joyent, Inc.  All rights reserved.
+ */
 
 #include 
 #include 
@@ -810,8 +811,12 @@ ctf_close(ctf_file_t *fp)
 	if (fp->ctf_parent != NULL)
 		ctf_close(fp->ctf_parent);
 
-	for (dtd = ctf_list_next(&fp->ctf_dtdefs); dtd != NULL; dtd = ntd) {
-		ntd = ctf_list_next(dtd);
+	/*
+	 * Note, to work properly with reference counting on the dynamic
+	 * section, we must delete the list in reverse.
+	 */
+	for (dtd = ctf_list_prev(&fp->ctf_dtdefs); dtd != NULL; dtd = ntd) {
+		ntd = ctf_list_prev(dtd);
 		ctf_dtd_delete(fp, dtd);
 	}
 

Modified: projects/camlock/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c	Sat Aug 24 14:41:49 2013	(r254787)
+++ projects/camlock/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c	Sat Aug 24 14:49:51 2013	(r254788)
@@ -216,6 +216,7 @@ ctf_fdopen(int fd, int *errp)
 {
 	ctf_sect_t ctfsect, symsect, strsect;
 	ctf_file_t *fp = NULL;
+	size_t shstrndx, shnum;
 
 	struct stat64 st;
 	ssize_t nbytes;
@@ -278,11 +279,10 @@ ctf_fdopen(int fd, int *errp)
 #else
 		uchar_t order = ELFDATA2LSB;
 #endif
-		GElf_Half i, n;
 		GElf_Shdr *sp;
 
 		void *strs_map;
-		size_t strs_mapsz;
+		size_t strs_mapsz, i;
 		char *strs;
 
 		if (hdr.e32.e_ident[EI_DATA] != order)
@@ -298,11 +298,38 @@ ctf_fdopen(int fd, int *errp)
 			ehdr_to_gelf(&e32, &hdr.e64);
 		}
 
-		if (hdr.e64.e_shstrndx >= hdr.e64.e_shnum)
+		shnum = hdr.e64.e_shnum;
+		shstrndx = hdr.e64.e_shstrndx;
+
+		/* Extended ELF sections */
+		if ((shstrndx == SHN_XINDEX) || (shnum == 0)) {
+			if (hdr.e32.e_ident[EI_CLASS] == ELFCLASS32) {
+				Elf32_Shdr x32;
+
+				if (pread64(fd, &x32, sizeof (x32),
+				    hdr.e64.e_shoff) != sizeof (x32))
+					return (ctf_set_open_errno(errp,
+					    errno));
+
+				shnum = x32.sh_size;
+				shstrndx = x32.sh_link;
+			} else {
+				Elf64_Shdr x64;
+
+				if (pread64(fd, &x64, sizeof (x64),
+				    hdr.e64.e_shoff) != sizeof (x64))
+					return (ctf_set_open_errno(errp,
+					    errno));
+
+				shnum = x64.sh_size;
+				shstrndx = x64.sh_link;
+			}
+		}
+
+		if (shstrndx >= shnum)
 			return (ctf_set_open_errno(errp, ECTF_CORRUPT));
 
-		n = hdr.e64.e_shnum;
-		nbytes = sizeof (GElf_Shdr) * n;
+		nbytes = sizeof (GElf_Shdr) * shnum;
 
 		if ((sp = malloc(nbytes)) == NULL)
 			return (ctf_set_open_errno(errp, errno));
@@ -314,7 +341,7 @@ ctf_fdopen(int fd, int *errp)
 		if (hdr.e32.e_ident[EI_CLASS] == ELFCLASS32) {
 			Elf32_Shdr *sp32;
 
-			nbytes = sizeof (Elf32_Shdr) * n;
+			nbytes = sizeof (Elf32_Shdr) * shnum;
 
 			if ((sp32 = malloc(nbytes)) == NULL || pread64(fd,
 			    sp32, nbytes, hdr.e64.e_shoff) != nbytes) {
@@ -322,7 +349,7 @@ ctf_fdopen(int fd, int *errp)
 				return (ctf_set_open_errno(errp, errno));
 			}
 
-			for (i = 0; i < n; i++)
+			for (i = 0; i < shnum; i++)
 				shdr_to_gelf(&sp32[i], &sp[i]);
 
 			free(sp32);
@@ -336,14 +363,14 @@ ctf_fdopen(int fd, int *errp)
 		 * Now mmap the section header strings section so that we can
 		 * perform string comparison on the section names.
 		 */
-		strs_mapsz = sp[hdr.e64.e_shstrndx].sh_size +
-		    (sp[hdr.e64.e_shstrndx].sh_offset & ~_PAGEMASK);
+		strs_mapsz = sp[shstrndx].sh_size +
+		    (sp[shstrndx].sh_offset & ~_PAGEMASK);
 
 		strs_map = mmap64(NULL, strs_mapsz, PROT_READ, MAP_PRIVATE,
-		    fd, sp[hdr.e64.e_shstrndx].sh_offset & _PAGEMASK);
+		    fd, sp[shstrndx].sh_offset & _PAGEMASK);
 
 		strs = (char *)strs_map +
-		    (sp[hdr.e64.e_shstrndx].sh_offset & ~_PAGEMASK);
+		    (sp[shstrndx].sh_offset & ~_PAGEMASK);
 
 		if (strs_map == MAP_FAILED) {
 			free(sp);
@@ -354,15 +381,15 @@ ctf_fdopen(int fd, int *errp)
 		 * Iterate over the section header array looking for the CTF
 		 * section and symbol table.  The strtab is linked to symtab.
 		 */
-		for (i = 0; i < n; i++) {
+		for (i = 0; i < shnum; i++) {
 			const GElf_Shdr *shp = &sp[i];
 			const GElf_Shdr *lhp = &sp[shp->sh_link];
 
-			if (shp->sh_link >= hdr.e64.e_shnum)
+			if (shp->sh_link >= shnum)
 				continue; /* corrupt sh_link field */
 
-			if (shp->sh_name >= sp[hdr.e64.e_shstrndx].sh_size ||
-			    lhp->sh_name >= sp[hdr.e64.e_shstrndx].sh_size)
+			if (shp->sh_name >= sp[shstrndx].sh_size ||
+			    lhp->sh_name >= sp[shstrndx].sh_size)
 				continue; /* corrupt sh_name field */
 
 			if (shp->sh_type == SHT_PROGBITS &&

Modified: projects/camlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c
==============================================================================
--- projects/camlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c	Sat Aug 24 14:41:49 2013	(r254787)
+++ projects/camlock/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_iter.c	Sat Aug 24 14:49:51 2013	(r254788)
@@ -21,10 +21,10 @@
 
 /*
  * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2010 Nexenta Systems, Inc. All rights reserved.
  * Copyright (c) 2012 by Delphix. All rights reserved.
  * Copyright (c) 2012 Pawel Jakub Dawidek .
  * All rights reserved.
+ * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
  */
 
 #include 
@@ -452,8 +452,12 @@ iter_dependents_cb(zfs_handle_t *zhp, vo
 		}
 		ida->stack = isf.next;
 	}
+
 	if (!first && err == 0)
 		err = ida->func(zhp, ida->data);
+	else
+		zfs_close(zhp);
+
 	return (err);
 }
 

Modified: projects/camlock/contrib/llvm/tools/lldb/include/lldb/Expression/IRExecutionUnit.h
==============================================================================
--- projects/camlock/contrib/llvm/tools/lldb/include/lldb/Expression/IRExecutionUnit.h	Sat Aug 24 14:41:49 2013	(r254787)
+++ projects/camlock/contrib/llvm/tools/lldb/include/lldb/Expression/IRExecutionUnit.h	Sat Aug 24 14:49:51 2013	(r254788)
@@ -336,13 +336,7 @@ private:
         /// @return
         ///     True in case of failure, false in case of success.
         //------------------------------------------------------------------
-        virtual bool finalizeMemory(std::string *ErrMsg) {
-            // TODO: Ensure that the instruction cache is flushed because
-            // relocations are updated by dy-load.  See:
-            //   sys::Memory::InvalidateInstructionCache
-            //   llvm::SectionMemoryManager
-            return false;
-        }
+        bool applyPermissions(std::string *ErrMsg) { return false; }
         
         //------------------------------------------------------------------
         /// Passthrough interface stub
@@ -352,6 +346,38 @@ private:
         //------------------------------------------------------------------
         /// Passthrough interface stub
         //------------------------------------------------------------------
+        virtual uint8_t* startExceptionTable(const llvm::Function* F,
+                                             uintptr_t &ActualSize);
+        
+        //------------------------------------------------------------------
+        /// Complete the exception table for a function, and add it to the
+        /// m_exception_tables map
+        ///
+        /// @param[in] F
+        ///     The function whose exception table is being written.
+        ///
+        /// @param[in] TableStart
+        ///     The first byte of the exception table.
+        ///
+        /// @param[in] TableEnd
+        ///     The last byte of the exception table.
+        ///
+        /// @param[in] FrameRegister
+        ///     I don't know what this does, but it's passed through.
+        //------------------------------------------------------------------
+        virtual void endExceptionTable(const llvm::Function *F,
+                                       uint8_t *TableStart,
+                                       uint8_t *TableEnd,
+                                       uint8_t* FrameRegister);
+        
+        //------------------------------------------------------------------
+        /// Passthrough interface stub
+        //------------------------------------------------------------------
+        virtual void deallocateExceptionTable(void *ET);
+        
+        //------------------------------------------------------------------
+        /// Passthrough interface stub
+        //------------------------------------------------------------------
         virtual size_t GetDefaultCodeSlabSize() {
             return m_default_mm_ap->GetDefaultCodeSlabSize();
         }

Modified: projects/camlock/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp
==============================================================================
--- projects/camlock/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp	Sat Aug 24 14:41:49 2013	(r254787)
+++ projects/camlock/contrib/llvm/tools/lldb/source/Expression/ClangExpressionParser.cpp	Sat Aug 24 14:49:51 2013	(r254788)
@@ -52,7 +52,7 @@
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ExecutionEngine/ExecutionEngine.h"
 #include "llvm/Support/Debug.h"
-#include "llvm/Support/FileSystem.h"
+#include "llvm/Support/PathV1.h"
 #include "llvm/Support/TargetSelect.h"
 
 #if defined(__FreeBSD__)
@@ -81,16 +81,19 @@ using namespace lldb_private;
 //===----------------------------------------------------------------------===//
 
 std::string GetBuiltinIncludePath(const char *Argv0) {
-    SmallString<128> P(llvm::sys::fs::getMainExecutable(
-        Argv0, (void *)(intptr_t) GetBuiltinIncludePath));
-
-    if (!P.empty()) {
-        llvm::sys::path::remove_filename(P); // Remove /clang from foo/bin/clang
-        llvm::sys::path::remove_filename(P); // Remove /bin   from foo/bin
-
+    llvm::sys::Path P =
+    llvm::sys::Path::GetMainExecutable(Argv0,
+                                       (void*)(intptr_t) GetBuiltinIncludePath);
+    
+    if (!P.isEmpty()) {
+        P.eraseComponent();  // Remove /clang from foo/bin/clang
+        P.eraseComponent();  // Remove /bin   from foo/bin
+        
         // Get foo/lib/clang//include
-        llvm::sys::path::append(P, "lib", "clang", CLANG_VERSION_STRING,
-                                "include");
+        P.appendComponent("lib");
+        P.appendComponent("clang");
+        P.appendComponent(CLANG_VERSION_STRING);
+        P.appendComponent("include");
     }
     
     return P.str();

Modified: projects/camlock/contrib/llvm/tools/lldb/source/Expression/IRExecutionUnit.cpp
==============================================================================
--- projects/camlock/contrib/llvm/tools/lldb/source/Expression/IRExecutionUnit.cpp	Sat Aug 24 14:41:49 2013	(r254787)
+++ projects/camlock/contrib/llvm/tools/lldb/source/Expression/IRExecutionUnit.cpp	Sat Aug 24 14:49:51 2013	(r254788)
@@ -563,6 +563,28 @@ IRExecutionUnit::MemoryManager::dealloca
     m_default_mm_ap->deallocateFunctionBody(Body);
 }
 
+uint8_t*
+IRExecutionUnit::MemoryManager::startExceptionTable(const llvm::Function* F,
+                                                    uintptr_t &ActualSize)
+{
+    return m_default_mm_ap->startExceptionTable(F, ActualSize);
+}
+
+void
+IRExecutionUnit::MemoryManager::endExceptionTable(const llvm::Function *F,
+                                                  uint8_t *TableStart,
+                                                  uint8_t *TableEnd,
+                                                  uint8_t* FrameRegister)
+{
+    m_default_mm_ap->endExceptionTable(F, TableStart, TableEnd, FrameRegister);
+}
+
+void
+IRExecutionUnit::MemoryManager::deallocateExceptionTable(void *ET)
+{
+    m_default_mm_ap->deallocateExceptionTable (ET);
+}
+
 lldb::addr_t
 IRExecutionUnit::GetRemoteAddressForLocal (lldb::addr_t local_address)
 {

Modified: projects/camlock/contrib/llvm/tools/lldb/source/Host/common/FileSpec.cpp
==============================================================================
--- projects/camlock/contrib/llvm/tools/lldb/source/Host/common/FileSpec.cpp	Sat Aug 24 14:41:49 2013	(r254787)
+++ projects/camlock/contrib/llvm/tools/lldb/source/Host/common/FileSpec.cpp	Sat Aug 24 14:49:51 2013	(r254788)
@@ -553,8 +553,9 @@ FileSpec::ResolveExecutableLocation ()
         if (file_cstr)
         {
             const std::string file_str (file_cstr);
-            std::string path = llvm::sys::FindProgramByName (file_str);
-            llvm::StringRef dir_ref = llvm::sys::path::parent_path(path);
+            llvm::sys::Path path = llvm::sys::Program::FindProgramByName (file_str);
+            const std::string &path_str = path.str();
+            llvm::StringRef dir_ref = llvm::sys::path::parent_path(path_str);
             //llvm::StringRef dir_ref = path.getDirname();
             if (! dir_ref.empty())
             {

Modified: projects/camlock/contrib/llvm/tools/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp
==============================================================================
--- projects/camlock/contrib/llvm/tools/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp	Sat Aug 24 14:41:49 2013	(r254787)
+++ projects/camlock/contrib/llvm/tools/lldb/source/Plugins/Disassembler/llvm/DisassemblerLLVMC.cpp	Sat Aug 24 14:49:51 2013	(r254788)
@@ -10,7 +10,6 @@
 #include "DisassemblerLLVMC.h"
 
 #include "llvm-c/Disassembler.h"
-#include "llvm/ADT/OwningPtr.h"
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCDisassembler.h"
@@ -18,7 +17,6 @@
 #include "llvm/MC/MCInstPrinter.h"
 #include "llvm/MC/MCInstrInfo.h"
 #include "llvm/MC/MCRegisterInfo.h"
-#include "llvm/MC/MCRelocationInfo.h"
 #include "llvm/MC/MCSubtargetInfo.h"
 #include "llvm/Support/ErrorHandling.h"
 #include "llvm/Support/MemoryObject.h"
@@ -442,30 +440,23 @@ DisassemblerLLVMC::LLVMCDisassembler::LL
     m_subtarget_info_ap.reset(curr_target->createMCSubtargetInfo(triple, "",
                                                                 features_str));
     
-    m_asm_info_ap.reset(curr_target->createMCAsmInfo(*curr_target->createMCRegInfo(triple), triple));
-
+    m_asm_info_ap.reset(curr_target->createMCAsmInfo(triple));
+    
     if (m_instr_info_ap.get() == NULL || m_reg_info_ap.get() == NULL || m_subtarget_info_ap.get() == NULL || m_asm_info_ap.get() == NULL)
     {
         m_is_valid = false;
         return;
     }
     
-    m_context_ap.reset(new llvm::MCContext(m_asm_info_ap.get(), m_reg_info_ap.get(), 0));
+    m_context_ap.reset(new llvm::MCContext(*m_asm_info_ap.get(), *(m_reg_info_ap.get()), 0));
     
     m_disasm_ap.reset(curr_target->createMCDisassembler(*m_subtarget_info_ap.get()));
-    if (m_disasm_ap.get() && m_context_ap.get())
+    if (m_disasm_ap.get())
     {
-        llvm::OwningPtr RelInfo(curr_target->createMCRelocationInfo(triple, *m_context_ap.get()));
-        if (!RelInfo)
-        {
-            m_is_valid = false;
-            return;
-        }
         m_disasm_ap->setupForSymbolicDisassembly(NULL,
-                                                 DisassemblerLLVMC::SymbolLookupCallback,
-                                                 (void *) &owner,
-                                                 m_context_ap.get(),
-                                                 RelInfo);
+                                                  DisassemblerLLVMC::SymbolLookupCallback,
+                                                  (void *) &owner,
+                                                  m_context_ap.get());
         
         unsigned asm_printer_variant;
         if (flavor == ~0U)

Modified: projects/camlock/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp
==============================================================================
--- projects/camlock/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp	Sat Aug 24 14:41:49 2013	(r254787)
+++ projects/camlock/contrib/llvm/tools/lldb/source/Plugins/Instruction/ARM/EmulateInstructionARM.cpp	Sat Aug 24 14:49:51 2013	(r254788)
@@ -25,7 +25,7 @@
 #include "Utility/ARM_DWARF_Registers.h"
 
 #include "llvm/Support/MathExtras.h" // for SignExtend32 template function
-                                     // and countTrailingZeros function
+                                     // and CountTrailingZeros_32 function
 
 using namespace lldb;
 using namespace lldb_private;
@@ -47,7 +47,7 @@ using namespace lldb_private;
 static uint32_t
 CountITSize (uint32_t ITMask) {
     // First count the trailing zeros of the IT mask.
-    uint32_t TZ = llvm::countTrailingZeros(ITMask);
+    uint32_t TZ = llvm::CountTrailingZeros_32(ITMask);
     if (TZ > 3)
     {
 #ifdef LLDB_CONFIGURATION_DEBUG

Modified: projects/camlock/etc/network.subr
==============================================================================
--- projects/camlock/etc/network.subr	Sat Aug 24 14:41:49 2013	(r254787)
+++ projects/camlock/etc/network.subr	Sat Aug 24 14:49:51 2013	(r254788)
@@ -661,9 +661,9 @@ ipv4_down()
 	for _inet in $inetList ; do
 		# get rid of extraneous line
 		case $_inet in
-		"")		break ;;
-		inet\ *)	;;
-		*)		continue ;;
+		"")				break ;;
+		\	inet\ *|inet\ *)	;;
+		*)				continue ;;
 		esac
 		[ -z "$_inet" ] && break
 

Modified: projects/camlock/share/man/man4/sa.4
==============================================================================
--- projects/camlock/share/man/man4/sa.4	Sat Aug 24 14:41:49 2013	(r254787)
+++ projects/camlock/share/man/man4/sa.4	Sat Aug 24 14:49:51 2013	(r254788)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 6, 1999
+.Dd August 23, 2013
 .Dt SA 4
 .Os
 .Sh NAME
@@ -159,6 +159,70 @@ of 0.
 (As above, if the file mark is never read, it remains for the next
 process to read if in no-rewind mode.)
 .El
+.Sh BLOCK SIZES
+By default, the driver will NOT accept reads or writes to a tape device that
+are larger than may be written to or read from the mounted tape using a single
+write or read request.
+Because of this, the application author may have confidence that his wishes
+are respected in terms of the block size written to tape.
+For example, if the user tries to write a 256KB block to the tape, but the
+controller can handle no more than 128KB, the write will fail.
+The previous
+.Fx
+behavior, prior to
+.Fx
+10.0,
+was to break up large reads or writes into smaller blocks when going to the
+tape.
+The problem with that behavior, though, is that it hides the actual on-tape
+block size from the application writer, at least in variable block mode.
+.Pp
+If the user would like his large reads and writes broken up into separate
+pieces, he may set the following loader tunables.
+Note that these tunables WILL GO AWAY in
+.Fx 11.0 .
+They are provided for transition purposes only.
+.Bl -tag -width 12
+.It kern.cam.sa.allow_io_split
+.Pp
+This variable, when set to 1, will configure all
+.Nm
+devices to split large buffers into smaller pieces when needed.
+.It kern.cam.sa.%d.allow_io_split
+.Pp
+This variable, when set to 1, will configure the given
+.Nm
+unit to split large buffers into multiple pieces.
+This will override the global setting, if it exists.
+.El
+.Pp
+There are several
+.Xr sysctl 8
+variables available to view block handling parameters:
+.Bl -tag -width 12
+.It kern.cam.sa.%d.allow_io_split
+.Pp
+This variable allows the user to see, but not modify, the current I/O split
+setting.
+The user is not permitted to modify this setting so that there is no chance
+of behavior changing for the application while a tape is mounted.
+.It kern.cam.sa.%d.maxio
+.Pp
+This variable shows the maximum I/O size in bytes that is allowed by the
+combination of kernel tuning parameters (MAXPHYS, DFLTPHYS) and the
+capabilities of the controller that is attached to the tape drive.
+Applications may look at this value for a guide on how large an I/O may be
+permitted, but should keep in mind that the actual maximum may be
+restricted further by the tape drive via the
+.Tn SCSI
+READ BLOCK LIMITS command.
+.It kern.cam.sa.%d.cpi_maxio
+.Pp
+This variable shows the maximum I/O size supported by the controller, in
+bytes, that is reported via the CAM Path Inquiry CCB (XPT_PATH_INQ).
+If this is 0, that means that the controller has not reported a maximum I/O
+size.
+.El
 .Sh FILE MARK HANDLING
 The handling of file marks on write is automatic.
 If the user has

Modified: projects/camlock/share/man/man9/pfil.9
==============================================================================
--- projects/camlock/share/man/man9/pfil.9	Sat Aug 24 14:41:49 2013	(r254787)
+++ projects/camlock/share/man/man9/pfil.9	Sat Aug 24 14:49:51 2013	(r254788)
@@ -28,7 +28,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 22, 2012
+.Dd August 23, 2013
 .Dt PFIL 9
 .Os
 .Sh NAME
@@ -36,7 +36,6 @@
 .Nm pfil_head_register ,
 .Nm pfil_head_unregister ,
 .Nm pfil_head_get ,
-.Nm pfil_hook_get ,
 .Nm pfil_add_hook ,
 .Nm pfil_remove_hook ,
 .Nm pfil_run_hooks ,
@@ -50,20 +49,18 @@
 .In sys/mbuf.h
 .In net/if.h
 .In net/pfil.h
+.Bd -literal
+typedef int (*pfil_func_t)(void *arg, struct mbuf **mp, struct ifnet *, int dir, struct inpcb);
 .Ft int
 .Fn pfil_head_register "struct pfil_head *head"
 .Ft int
 .Fn pfil_head_unregister "struct pfil_head *head"
 .Ft "struct pfil_head *"
 .Fn pfil_head_get "int af" "u_long dlt"
-.Ft "struct packet_filter_hook *"
-.Fn pfil_hook_get "int dir" "struct pfil_head *head"
 .Ft void
-.Fn pfil_add_hook "int (*func)()" "void *arg" "int flags" "struct pfil_head *"
+.Fn pfil_add_hook "pfil_func_t" "void *arg" "int flags" "struct pfil_head *"
 .Ft void
-.Fn pfil_remove_hook "int (*func)()" "void *arg" "int flags" "struct pfil_head *"
-.Ft int
-.Fn (*func) "void *arg" "struct mbuf **mp" "struct ifnet *" "int dir" "struct inpcb *"
+.Fn pfil_remove_hook "pfil_func_t" "void *arg" "int flags" "struct pfil_head *"
 .Ft int
 .Fn pfil_run_hooks "struct pfil_head *head" "struct mbuf **mp" "struct ifnet *" "int dir" "struct inpcb *"
 .Ft void
@@ -245,11 +242,7 @@ lock export was added in
 .Fx 10.0 .

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

From owner-svn-src-projects@FreeBSD.ORG  Sat Aug 24 22:42:20 2013
Return-Path: 
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id 4D3D05E8;
 Sat, 24 Aug 2013 22:42:20 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 2B1C32870;
 Sat, 24 Aug 2013 22:42:20 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r7OMgKYV021793;
 Sat, 24 Aug 2013 22:42:20 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r7OMgJrH021790;
 Sat, 24 Aug 2013 22:42:19 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201308242242.r7OMgJrH021790@svn.freebsd.org>
From: Alexander Motin 
Date: Sat, 24 Aug 2013 22:42:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject: svn commit: r254816 - in projects/camlock/sys/cddl:
 compat/opensolaris/kern contrib/opensolaris/uts/common/sys
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the src " projects"
 tree" 
List-Unsubscribe: , 
 
List-Archive: 
List-Post: 
List-Help: 
List-Subscribe: , 
 
X-List-Received-Date: Sat, 24 Aug 2013 22:42:20 -0000

Author: mav
Date: Sat Aug 24 22:42:19 2013
New Revision: 254816
URL: http://svnweb.freebsd.org/changeset/base/254816

Log:
  Make taskqueue wrapper used for ZFS more SMP-scalable.
  
  For some purposes ZFS requests to create taskqueues with number of threads
  equal to number of CPUs.  As result, on 24-core system we may get situation
  when interoperation between 5 CAM completion threads and 24 ZFS taskqueue
  threads protected with single global lock.  When number of IOPS reaches
  hundreds of thousands, that causes significant lock congestion.
  
  To workaround that, create several FreeBSD taskqueues to emulate single
  Solaris taskqueue and distribute tasks between them in round-robin fashion.
  Using 4 taskqueues of 6 threads for the 24-core system almost completely
  removed spinning on these locks.

Modified:
  projects/camlock/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c
  projects/camlock/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h

Modified: projects/camlock/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c
==============================================================================
--- projects/camlock/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c	Sat Aug 24 21:30:35 2013	(r254815)
+++ projects/camlock/sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c	Sat Aug 24 22:42:19 2013	(r254816)
@@ -66,14 +66,26 @@ taskq_create(const char *name, int nthre
     int maxalloc __unused, uint_t flags)
 {
 	taskq_t *tq;
+	int i, nqueues;
 
 	if ((flags & TASKQ_THREADS_CPU_PCT) != 0)
 		nthreads = MAX((mp_ncpus * nthreads) / 100, 1);
+	nqueues = MAX((nthreads + 4) / 6, 1);
+	nthreads = MAX((nthreads + nqueues / 2) / nqueues, 1);
 
-	tq = kmem_alloc(sizeof(*tq), KM_SLEEP);
-	tq->tq_queue = taskqueue_create(name, M_WAITOK, taskqueue_thread_enqueue,
-	    &tq->tq_queue);
-	(void) taskqueue_start_threads(&tq->tq_queue, nthreads, pri, "%s", name);
+	tq = kmem_alloc(sizeof(*tq) + sizeof(tq->tq_queue[0]) * nqueues, KM_SLEEP);
+	tq->tq_num = nqueues;
+	tq->tq_last = 0;
+	for (i = 0; i < nqueues; i++) {
+		tq->tq_queue[i] = taskqueue_create(name, M_WAITOK,
+		    taskqueue_thread_enqueue, &tq->tq_queue[i]);
+		if (nqueues == 1)
+			(void) taskqueue_start_threads(&tq->tq_queue[i],
+			    nthreads, pri, "%s", name);
+		else
+			(void) taskqueue_start_threads(&tq->tq_queue[i],
+			    nthreads, pri, "%s_%d", name, i);
+	}
 
 	return ((taskq_t *)tq);
 }
@@ -89,16 +101,22 @@ taskq_create_proc(const char *name, int 
 void
 taskq_destroy(taskq_t *tq)
 {
+	int i;
 
-	taskqueue_free(tq->tq_queue);
-	kmem_free(tq, sizeof(*tq));
+	for (i = 0; i < tq->tq_num; i++)
+		taskqueue_free(tq->tq_queue[i]);
+	kmem_free(tq, sizeof(*tq) + sizeof(tq->tq_queue[0]) * tq->tq_num);
 }
 
 int
 taskq_member(taskq_t *tq, kthread_t *thread)
 {
+	int i, j;
 
-	return (taskqueue_member(tq->tq_queue, thread));
+	for (i = 0; i < tq->tq_num; i++)
+		if (taskqueue_member(tq->tq_queue[i], thread))
+			return (1);
+	return (0);
 }
 
 static void
@@ -115,7 +133,7 @@ taskqid_t
 taskq_dispatch(taskq_t *tq, task_func_t func, void *arg, uint_t flags)
 {
 	struct ostask *task;
-	int mflag, prio;
+	int i, mflag, prio;
 
 	if ((flags & (TQ_SLEEP | TQ_NOQUEUE)) == TQ_SLEEP)
 		mflag = M_WAITOK;
@@ -135,7 +153,11 @@ taskq_dispatch(taskq_t *tq, task_func_t 
 	task->ost_arg = arg;
 
 	TASK_INIT(&task->ost_task, prio, taskq_run, task);
-	taskqueue_enqueue(tq->tq_queue, &task->ost_task);
+	if (tq->tq_num > 1)
+		i = atomic_fetchadd_int(&tq->tq_last, 1) % tq->tq_num;
+	else
+		i = 0;
+	taskqueue_enqueue(tq->tq_queue[i], &task->ost_task);
 
 	return ((taskqid_t)(void *)task);
 }
@@ -154,7 +176,7 @@ taskqid_t
 taskq_dispatch_safe(taskq_t *tq, task_func_t func, void *arg, u_int flags,
     struct ostask *task)
 {
-	int prio;
+	int i, prio;
 
 	/* 
 	 * If TQ_FRONT is given, we want higher priority for this task, so it
@@ -166,7 +188,11 @@ taskq_dispatch_safe(taskq_t *tq, task_fu
 	task->ost_arg = arg;
 
 	TASK_INIT(&task->ost_task, prio, taskq_run_safe, task);
-	taskqueue_enqueue(tq->tq_queue, &task->ost_task);
+	if (tq->tq_num > 1)
+		i = atomic_fetchadd_int(&tq->tq_last, 1) % tq->tq_num;
+	else
+		i = 0;
+	taskqueue_enqueue(tq->tq_queue[i], &task->ost_task);
 
 	return ((taskqid_t)(void *)task);
 }

Modified: projects/camlock/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h
==============================================================================
--- projects/camlock/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h	Sat Aug 24 21:30:35 2013	(r254815)
+++ projects/camlock/sys/cddl/contrib/opensolaris/uts/common/sys/taskq.h	Sat Aug 24 22:42:19 2013	(r254816)
@@ -38,7 +38,9 @@ extern "C" {
 
 struct taskqueue;
 struct taskq {
-	struct taskqueue	*tq_queue;
+	int			 tq_num;
+	int			 tq_last;
+	struct taskqueue	*tq_queue[];
 };
 
 typedef struct taskq taskq_t;