From owner-svn-src-user@FreeBSD.ORG  Mon Feb 16 17:08:38 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D38771065674;
	Mon, 16 Feb 2009 17:08:38 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C05788FC20;
	Mon, 16 Feb 2009 17:08:38 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1GH8ccG070716;
	Mon, 16 Feb 2009 17:08:38 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1GH8cL5070714;
	Mon, 16 Feb 2009 17:08:38 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200902161708.n1GH8cL5070714@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Mon, 16 Feb 2009 17:08:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188681 - user/dfr/xenhvm/7/sys/xen/xenbus
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Feb 2009 17:08:39 -0000

Author: dfr
Date: Mon Feb 16 17:08:38 2009
New Revision: 188681
URL: http://svn.freebsd.org/changeset/base/188681

Log:
  Diff reduction with user/dfr/xenhvm/6.

Modified:
  user/dfr/xenhvm/7/sys/xen/xenbus/xenbus_if.m   (contents, props changed)
  user/dfr/xenhvm/7/sys/xen/xenbus/xenbus_xs.c
  user/dfr/xenhvm/7/sys/xen/xenbus/xenbusvar.h

Modified: user/dfr/xenhvm/7/sys/xen/xenbus/xenbus_if.m
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/xenbus/xenbus_if.m	Mon Feb 16 16:48:49 2009	(r188680)
+++ user/dfr/xenhvm/7/sys/xen/xenbus/xenbus_if.m	Mon Feb 16 17:08:38 2009	(r188681)
@@ -23,7 +23,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 #
-# $FreeBSD: user/dfr/xenhvm/6/sys/kern/device_if.m 139804 2005-01-06 23:35:40Z imp $
+# $FreeBSD$
 #
 
 #include <sys/bus.h>

Modified: user/dfr/xenhvm/7/sys/xen/xenbus/xenbus_xs.c
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/xenbus/xenbus_xs.c	Mon Feb 16 16:48:49 2009	(r188680)
+++ user/dfr/xenhvm/7/sys/xen/xenbus/xenbus_xs.c	Mon Feb 16 17:08:38 2009	(r188681)
@@ -142,21 +142,17 @@ xs_read_reply(enum xsd_sockmsg_type *typ
 	mtx_lock(&xs_state.reply_lock);
 
 	while (TAILQ_EMPTY(&xs_state.reply_list)) {
-			while (TAILQ_EMPTY(&xs_state.reply_list)) {
-				error = mtx_sleep(&xs_state.reply_waitq,
-				    &xs_state.reply_lock,
-				    PCATCH, "xswait", hz/10);
-				if (error && error != EWOULDBLOCK) {
-					mtx_unlock(&xs_state.reply_lock);
-					return (error);
-				}
-				
+		while (TAILQ_EMPTY(&xs_state.reply_list)) {
+			error = mtx_sleep(&xs_state.reply_waitq,
+			    &xs_state.reply_lock,
+			    PCATCH, "xswait", hz/10);
+			if (error && error != EWOULDBLOCK) {
+				mtx_unlock(&xs_state.reply_lock);
+				return (error);
 			}
-				
-			
 		}
+	}
 
-		
 	msg = TAILQ_FIRST(&xs_state.reply_list);
 	TAILQ_REMOVE(&xs_state.reply_list, msg, list);
 
@@ -202,7 +198,8 @@ xenbus_dev_request_and_reply(struct xsd_
 
 	sx_xlock(&xs_state.request_mutex);
 
-	error = xb_write(msg, sizeof(*msg) + msg->len, &xs_state.request_mutex.lock_object);
+	error = xb_write(msg, sizeof(*msg) + msg->len,
+	    &xs_state.request_mutex.lock_object);
 	if (error) {
 		msg->type = XS_ERROR;
 	} else {
@@ -243,7 +240,8 @@ xs_talkv(struct xenbus_transaction t, en
 
 	sx_xlock(&xs_state.request_mutex);
 
-	error = xb_write(&msg, sizeof(msg), &xs_state.request_mutex.lock_object);
+	error = xb_write(&msg, sizeof(msg),
+	    &xs_state.request_mutex.lock_object);
 	if (error) {
 		sx_xunlock(&xs_state.request_mutex);
 		printf("xs_talkv failed %d\n", error);
@@ -251,7 +249,8 @@ xs_talkv(struct xenbus_transaction t, en
 	}
 
 	for (i = 0; i < num_vecs; i++) {
-		error = xb_write(iovec[i].iov_base, iovec[i].iov_len, &xs_state.request_mutex.lock_object);
+		error = xb_write(iovec[i].iov_base, iovec[i].iov_len,
+		    &xs_state.request_mutex.lock_object);
 		if (error) {		
 			sx_xunlock(&xs_state.request_mutex);
 			printf("xs_talkv failed %d\n", error);
@@ -791,7 +790,8 @@ xs_process_msg(enum xsd_sockmsg_type *ty
 		
 	msg = malloc(sizeof(*msg), M_DEVBUF, M_WAITOK);
 	mtx_lock(&xs_state.reply_lock);
-	error = xb_read(&msg->hdr, sizeof(msg->hdr), &xs_state.reply_lock.lock_object);
+	error = xb_read(&msg->hdr, sizeof(msg->hdr),
+	    &xs_state.reply_lock.mtx_object);
 	mtx_unlock(&xs_state.reply_lock);
 	if (error) {
 		free(msg, M_DEVBUF);
@@ -800,7 +800,8 @@ xs_process_msg(enum xsd_sockmsg_type *ty
 
 	body = malloc(msg->hdr.len + 1, M_DEVBUF, M_WAITOK);
 	mtx_lock(&xs_state.reply_lock);
-	error = xb_read(body, msg->hdr.len, &xs_state.reply_lock.lock_object); 
+	error = xb_read(body, msg->hdr.len,
+	    &xs_state.reply_lock.mtx_object); 
 	mtx_unlock(&xs_state.reply_lock);
 	if (error) {
 		free(body, M_DEVBUF);

Modified: user/dfr/xenhvm/7/sys/xen/xenbus/xenbusvar.h
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/xenbus/xenbusvar.h	Mon Feb 16 16:48:49 2009	(r188680)
+++ user/dfr/xenhvm/7/sys/xen/xenbus/xenbusvar.h	Mon Feb 16 17:08:38 2009	(r188681)
@@ -26,6 +26,8 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
+ *
+ * $FreeBSD$
  */
 
 #ifndef _XEN_XENBUS_XENBUSVAR_H

From owner-svn-src-user@FreeBSD.ORG  Mon Feb 16 17:11:34 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7CA4D106564A;
	Mon, 16 Feb 2009 17:11:34 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6B0D18FC08;
	Mon, 16 Feb 2009 17:11:34 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1GHBYi9071116;
	Mon, 16 Feb 2009 17:11:34 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1GHBYA7071114;
	Mon, 16 Feb 2009 17:11:34 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200902161711.n1GHBYA7071114@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Mon, 16 Feb 2009 17:11:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188682 - user/dfr/xenhvm/7/sys/xen/evtchn
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Feb 2009 17:11:34 -0000

Author: dfr
Date: Mon Feb 16 17:11:34 2009
New Revision: 188682
URL: http://svn.freebsd.org/changeset/base/188682

Log:
  Diff reduction with user/dfr/xenhvm/6.

Modified:
  user/dfr/xenhvm/7/sys/xen/evtchn/evtchn.c
  user/dfr/xenhvm/7/sys/xen/evtchn/evtchn_dev.c

Modified: user/dfr/xenhvm/7/sys/xen/evtchn/evtchn.c
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/evtchn/evtchn.c	Mon Feb 16 17:08:38 2009	(r188681)
+++ user/dfr/xenhvm/7/sys/xen/evtchn/evtchn.c	Mon Feb 16 17:11:34 2009	(r188682)
@@ -13,56 +13,28 @@ __FBSDID("$FreeBSD$");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
+#include <sys/limits.h>
 #include <sys/malloc.h>
 #include <sys/kernel.h>
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/interrupt.h>
 #include <sys/pcpu.h>
+#include <sys/smp.h>
 
 #include <machine/cpufunc.h>
 #include <machine/intr_machdep.h>
+
 #include <machine/xen/xen-os.h>
+#include <machine/xen/xenvar.h>
 #include <xen/xen_intr.h>
 #include <machine/xen/synch_bitops.h>
 #include <xen/evtchn.h>
 #include <xen/hypervisor.h>
 #include <sys/smp.h>
 
-
-
-/* linux helper functions that got sucked in 
- * rename and move XXX
- */
-
-
-static inline int find_first_bit(const unsigned long *addr, unsigned size)
-{
-	int d0, d1;
-	int res;
-
-	/* This looks at memory. Mark it volatile to tell gcc not to move it around */
-	__asm__ __volatile__(
-		"xorl %%eax,%%eax\n\t"
-		"repe; scasl\n\t"
-		"jz 1f\n\t"
-		"leal -4(%%edi),%%edi\n\t"
-		"bsfl (%%edi),%%eax\n"
-		"1:\tsubl %%ebx,%%edi\n\t"
-		"shll $3,%%edi\n\t"
-		"addl %%edi,%%eax"
-		:"=a" (res), "=&c" (d0), "=&D" (d1)
-		:"1" ((size + 31) >> 5), "2" (addr), "b" (addr) : "memory");
-	return res;
-}
-
-#define min_t(type,x,y) \
-	({ type __x = (x); type __y = (y); __x < __y ? __x: __y; })
-#define first_cpu(src) __first_cpu(&(src), NR_CPUS)
-static inline int __first_cpu(const xen_cpumask_t *srcp, int nbits)
-{
-	return min_t(int, nbits, find_first_bit(srcp->bits, nbits));
-}
+#include <xen/xen_intr.h>
+#include <xen/evtchn.h>
 
 static inline unsigned long __ffs(unsigned long word)
 {
@@ -166,7 +138,7 @@ static int irq_bindcount[NR_IRQS];
 #ifdef SMP
 
 static uint8_t cpu_evtchn[NR_EVENT_CHANNELS];
-static unsigned long cpu_evtchn_mask[NR_CPUS][NR_EVENT_CHANNELS/BITS_PER_LONG];
+static unsigned long cpu_evtchn_mask[MAX_VIRT_CPUS][NR_EVENT_CHANNELS/LONG_BIT];
 
 #define active_evtchns(cpu,sh,idx)		\
 	((sh)->evtchn_pending[idx] &		\
@@ -212,7 +184,7 @@ void force_evtchn_callback(void)
 }
 
 void 
-evtchn_do_upcall(struct trapframe *frame) 
+evtchn_do_upcall(struct intrframe *frame) 
 {
 	unsigned long  l1, l2;
 	unsigned int   l1i, l2i, port;
@@ -220,7 +192,7 @@ evtchn_do_upcall(struct trapframe *frame
 	shared_info_t *s;
 	vcpu_info_t   *vcpu_info;
 	
-	cpu = smp_processor_id();
+	cpu = PCPU_GET(cpuid);
 	s = HYPERVISOR_shared_info;
 	vcpu_info = &s->vcpu_info[cpu];
 
@@ -236,7 +208,7 @@ evtchn_do_upcall(struct trapframe *frame
 		while ((l2 = active_evtchns(cpu, s, l1i)) != 0) {
 			l2i = __ffs(l2);
 
-			port = (l1i * BITS_PER_LONG) + l2i;
+			port = (l1i * LONG_BIT) + l2i;
 			if ((irq = evtchn_to_irq[port]) != -1) {
 				struct intsrc *isrc = intr_lookup_source(irq);
 				/* 
@@ -258,7 +230,7 @@ ipi_pcpu(unsigned int cpu, int vector) 
 { 
         int irq;
 
-	irq = per_cpu(ipi_to_irq, cpu)[vector]; 
+	irq = PCPU_GET(ipi_to_irq[vector]);
 	
         notify_remote_via_irq(irq); 
 } 
@@ -310,11 +282,12 @@ bind_local_port_to_irq(unsigned int loca
 
         mtx_lock_spin(&irq_mapping_update_lock);
 
-        PANIC_IF(evtchn_to_irq[local_port] != -1);
-
+        KASSERT(evtchn_to_irq[local_port] == -1,
+	    ("evtchn_to_irq inconsistent"));
+	
         if ((irq = find_unbound_irq()) < 0) {
                 struct evtchn_close close = { .port = local_port };
-                PANIC_IF(HYPERVISOR_event_channel_op(EVTCHNOP_close, &close));
+                HYPERVISOR_event_channel_op(EVTCHNOP_close, &close);
 		
                 goto out;
         }
@@ -368,21 +341,20 @@ bind_virq_to_irq(unsigned int virq, unsi
 
 	mtx_lock_spin(&irq_mapping_update_lock);
 
-	if ((irq = per_cpu(virq_to_irq, cpu)[virq]) == -1) {
+	if ((irq = pcpu_find(cpu)->pc_virq_to_irq[virq]) == -1) {
 		if ((irq = find_unbound_irq()) < 0)
 			goto out;
 
 		bind_virq.virq = virq;
 		bind_virq.vcpu = cpu;
-		PANIC_IF(HYPERVISOR_event_channel_op(EVTCHNOP_bind_virq,
-			&bind_virq) != 0);
+		HYPERVISOR_event_channel_op(EVTCHNOP_bind_virq, &bind_virq);
 
 		evtchn = bind_virq.port;
 
 		evtchn_to_irq[evtchn] = irq;
 		irq_info[irq] = mk_irq_info(IRQT_VIRQ, virq, evtchn);
 
-		per_cpu(virq_to_irq, cpu)[virq] = irq;
+		pcpu_find(cpu)->pc_virq_to_irq[virq] = irq;
 
 		bind_evtchn_to_cpu(evtchn, cpu);
 	}
@@ -407,18 +379,18 @@ bind_ipi_to_irq(unsigned int ipi, unsign
 
 	mtx_lock_spin(&irq_mapping_update_lock);
 	
-	if ((irq = per_cpu(ipi_to_irq, cpu)[ipi]) == -1) {
+	if ((irq = pcpu_find(cpu)->pc_ipi_to_irq[ipi]) == -1) {
 		if ((irq = find_unbound_irq()) < 0)
 			goto out;
 
 		bind_ipi.vcpu = cpu;
-		PANIC_IF(HYPERVISOR_event_channel_op(EVTCHNOP_bind_ipi, &bind_ipi) != 0);
+		HYPERVISOR_event_channel_op(EVTCHNOP_bind_ipi, &bind_ipi);
 		evtchn = bind_ipi.port;
 
 		evtchn_to_irq[evtchn] = irq;
 		irq_info[irq] = mk_irq_info(IRQT_IPI, ipi, evtchn);
 
-		per_cpu(ipi_to_irq, cpu)[ipi] = irq;
+		pcpu_find(cpu)->pc_ipi_to_irq[ipi] = irq;
 
 		bind_evtchn_to_cpu(evtchn, cpu);
 	}
@@ -432,24 +404,27 @@ out:
 }
 
 
-void 
+static void 
 unbind_from_irq(int irq)
 {
 	struct evtchn_close close;
 	int evtchn = evtchn_from_irq(irq);
+	int cpu;
 
 	mtx_lock_spin(&irq_mapping_update_lock);
 
 	if ((--irq_bindcount[irq] == 0) && VALID_EVTCHN(evtchn)) {
 		close.port = evtchn;
-		PANIC_IF(HYPERVISOR_event_channel_op(EVTCHNOP_close, &close) != 0);
+		HYPERVISOR_event_channel_op(EVTCHNOP_close, &close);
 
 		switch (type_from_irq(irq)) {
 		case IRQT_VIRQ:
-			per_cpu(virq_to_irq, cpu_from_evtchn(evtchn))[index_from_irq(irq)] = -1;
+			cpu = cpu_from_evtchn(evtchn);
+			pcpu_find(cpu)->pc_virq_to_irq[index_from_irq(irq)] = -1;
 			break;
 		case IRQT_IPI:
-			per_cpu(ipi_to_irq, cpu_from_evtchn(evtchn))[index_from_irq(irq)] = -1;
+			cpu = cpu_from_evtchn(evtchn);
+			pcpu_find(cpu)->pc_ipi_to_irq[index_from_irq(irq)] = -1;
 			break;
 		default:
 			break;
@@ -467,18 +442,15 @@ unbind_from_irq(int irq)
 
 int 
 bind_caller_port_to_irqhandler(unsigned int caller_port,
-			  const char *devname,
-			  driver_intr_t handler,
-			  void *arg,
-			  unsigned long irqflags,
-                          unsigned int *irqp)
+    const char *devname, driver_intr_t handler, void *arg,
+    unsigned long irqflags, unsigned int *irqp)
 {
 	unsigned int irq;
 	int error;
 
 	irq = bind_caller_port_to_irq(caller_port);
 	intr_register_source(&xp->xp_pins[irq].xp_intsrc);
-	error = intr_add_handler(devname, irq, NULL, handler, arg, irqflags,
+	error = intr_add_handler(devname, irq, handler, arg, irqflags,
 	    &xp->xp_pins[irq].xp_cookie);
 
 	if (error) {
@@ -493,20 +465,16 @@ bind_caller_port_to_irqhandler(unsigned 
 }
 
 int 
-bind_listening_port_to_irqhandler(
-	                  unsigned int remote_domain,
-			  const char *devname,
-			  driver_intr_t handler,
-			  void *arg,
-			  unsigned long irqflags,
-                          unsigned int *irqp)
+bind_listening_port_to_irqhandler(unsigned int remote_domain,
+    const char *devname, driver_intr_t handler, void *arg,
+    unsigned long irqflags, unsigned int *irqp)
 {
 	unsigned int irq;
 	int error;
 
 	irq = bind_listening_port_to_irq(remote_domain);
 	intr_register_source(&xp->xp_pins[irq].xp_intsrc);
-	error = intr_add_handler(devname, irq, NULL, handler, arg, irqflags,
+	error = intr_add_handler(devname, irq, handler, arg, irqflags,
 	    &xp->xp_pins[irq].xp_cookie);
 	if (error) {
 		unbind_from_irq(irq);
@@ -519,21 +487,16 @@ bind_listening_port_to_irqhandler(
 }
 
 int 
-bind_interdomain_evtchn_to_irqhandler(
-	                    unsigned int remote_domain,
-			    unsigned int remote_port,
-			    const char *devname,
-			    driver_filter_t filter,
-			    driver_intr_t handler,
-			    unsigned long irqflags,
-			    unsigned int *irqp)
+bind_interdomain_evtchn_to_irqhandler(unsigned int remote_domain,
+    unsigned int remote_port, const char *devname, driver_intr_t handler,
+    unsigned long irqflags, unsigned int *irqp)
 {
 	unsigned int irq;
 	int error;
 
 	irq = bind_interdomain_evtchn_to_irq(remote_domain, remote_port);
 	intr_register_source(&xp->xp_pins[irq].xp_intsrc);
-	error = intr_add_handler(devname, irq, filter, handler, NULL,
+	error = intr_add_handler(devname, irq, handler, NULL,
 	    irqflags, &xp->xp_pins[irq].xp_cookie);
 	if (error) {
 		unbind_from_irq(irq);
@@ -546,20 +509,16 @@ bind_interdomain_evtchn_to_irqhandler(
 }
 
 int 
-bind_virq_to_irqhandler(unsigned int virq,
-			unsigned int cpu,
-			const char *devname,
-			driver_filter_t filter,
-			driver_intr_t handler,
-                        unsigned long irqflags,
-                        unsigned int *irqp)
+bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu,
+    const char *devname, driver_intr_t handler,
+    unsigned long irqflags, unsigned int *irqp)
 {
 	unsigned int irq;
 	int error;
 
 	irq = bind_virq_to_irq(virq, cpu);
 	intr_register_source(&xp->xp_pins[irq].xp_intsrc);
-	error = intr_add_handler(devname, irq, filter, handler,
+	error = intr_add_handler(devname, irq, handler,
 	    NULL, irqflags, &xp->xp_pins[irq].xp_cookie);
 	if (error) {
 		unbind_from_irq(irq);
@@ -572,19 +531,16 @@ bind_virq_to_irqhandler(unsigned int vir
 }
 
 int 
-bind_ipi_to_irqhandler(unsigned int ipi,
-		       unsigned int cpu,
-		       const char *devname,
-		       driver_filter_t filter,
-                       unsigned long irqflags,
-                       unsigned int *irqp)
+bind_ipi_to_irqhandler(unsigned int ipi, unsigned int cpu,
+    const char *devname, driver_intr_t handler,
+    unsigned long irqflags, unsigned int *irqp)
 {
 	unsigned int irq;
 	int error;
 	
 	irq = bind_ipi_to_irq(ipi, cpu);
 	intr_register_source(&xp->xp_pins[irq].xp_intsrc);
-	error = intr_add_handler(devname, irq, filter, NULL,
+	error = intr_add_handler(devname, irq, handler,
 	    NULL, irqflags, &xp->xp_pins[irq].xp_cookie);
 	if (error) {
 		unbind_from_irq(irq);
@@ -635,9 +591,9 @@ rebind_irq_to_cpu(unsigned irq, unsigned
 
 }
 
-static void set_affinity_irq(unsigned irq, xen_cpumask_t dest)
+static void set_affinity_irq(unsigned irq, cpumask_t dest)
 {
-	unsigned tcpu = first_cpu(dest);
+	unsigned tcpu = ffs(dest) - 1;
 	rebind_irq_to_cpu(irq, tcpu);
 }
 #endif
@@ -655,13 +611,11 @@ static void     xenpic_dynirq_enable_sou
 static void     xenpic_dynirq_disable_source(struct intsrc *isrc, int); 
 static void     xenpic_dynirq_eoi_source(struct intsrc *isrc); 
 static void     xenpic_dynirq_enable_intr(struct intsrc *isrc); 
-static void     xenpic_dynirq_disable_intr(struct intsrc *isrc); 
 
 static void     xenpic_pirq_enable_source(struct intsrc *isrc); 
 static void     xenpic_pirq_disable_source(struct intsrc *isrc, int); 
 static void     xenpic_pirq_eoi_source(struct intsrc *isrc); 
 static void     xenpic_pirq_enable_intr(struct intsrc *isrc); 
-static void     xenpic_pirq_disable_intr(struct intsrc *isrc); 
 
 
 static int      xenpic_vector(struct intsrc *isrc); 
@@ -676,7 +630,6 @@ struct pic xenpic_dynirq_template  =  { 
 	.pic_disable_source	=	xenpic_dynirq_disable_source,
 	.pic_eoi_source		=	xenpic_dynirq_eoi_source, 
 	.pic_enable_intr	=	xenpic_dynirq_enable_intr, 
-	.pic_disable_intr	=	xenpic_dynirq_disable_intr, 
 	.pic_vector		=	xenpic_vector, 
 	.pic_source_pending	=	xenpic_source_pending,
 	.pic_suspend		=	xenpic_suspend, 
@@ -688,7 +641,6 @@ struct pic xenpic_pirq_template  =  { 
 	.pic_disable_source	=	xenpic_pirq_disable_source,
 	.pic_eoi_source		=	xenpic_pirq_eoi_source, 
 	.pic_enable_intr	=	xenpic_pirq_enable_intr, 
-	.pic_disable_intr	=	xenpic_pirq_disable_intr, 
 	.pic_vector		=	xenpic_vector, 
 	.pic_source_pending	=	xenpic_source_pending,
 	.pic_suspend		=	xenpic_suspend, 
@@ -747,20 +699,6 @@ xenpic_dynirq_enable_intr(struct intsrc 
 }
 
 static void 
-xenpic_dynirq_disable_intr(struct intsrc *isrc)
-{
-	unsigned int irq;
-	struct xenpic_intsrc *xp;
-	
-	xp = (struct xenpic_intsrc *)isrc;	
-	mtx_lock_spin(&irq_mapping_update_lock);
-	xp->xp_masked = 1;
-	irq = xenpic_vector(isrc);
-	mask_evtchn(evtchn_from_irq(irq));
-	mtx_unlock_spin(&irq_mapping_update_lock);
-}
-
-static void 
 xenpic_dynirq_eoi_source(struct intsrc *isrc)
 {
 	unsigned int irq;
@@ -824,7 +762,7 @@ notify_remote_via_irq(int irq)
 	if (VALID_EVTCHN(evtchn))
 		notify_remote_via_evtchn(evtchn);
 	else
-		panic("invalid evtchn");
+		panic("invalid evtchn %d", irq);
 }
 
 /* required for support of physical devices */
@@ -898,32 +836,6 @@ xenpic_pirq_enable_intr(struct intsrc *i
 }
 
 static void 
-xenpic_pirq_disable_intr(struct intsrc *isrc)
-{
-	unsigned int irq;
-	int evtchn;
-	struct evtchn_close close;
-			
-	mtx_lock_spin(&irq_mapping_update_lock);
-	irq = xenpic_vector(isrc);
-	evtchn = evtchn_from_irq(irq);
-
-	if (!VALID_EVTCHN(evtchn)) 
-		goto done;
-	
-	mask_evtchn(evtchn);
-
-	close.port = evtchn;
-	PANIC_IF(HYPERVISOR_event_channel_op(EVTCHNOP_close, &close) != 0);
-
-	bind_evtchn_to_cpu(evtchn, 0);
-	evtchn_to_irq[evtchn] = -1;
-	irq_info[irq] = IRQ_UNBOUND;
- done:
-	mtx_unlock_spin(&irq_mapping_update_lock);
-}
-
-static void 
 xenpic_pirq_enable_source(struct intsrc *isrc)
 {
 	int evtchn;
@@ -997,7 +909,7 @@ void 
 unmask_evtchn(int port)
 {
 	shared_info_t *s = HYPERVISOR_shared_info;
-	unsigned int cpu = smp_processor_id();
+	unsigned int cpu = PCPU_GET(cpuid);
 	vcpu_info_t *vcpu_info = &s->vcpu_info[cpu];
 
 	/* Slow path (hypercall) if this is a non-local port. */
@@ -1015,7 +927,7 @@ unmask_evtchn(int port)
 	 * masked.
 	 */
 	if (synch_test_bit(port, &s->evtchn_pending) && 
-	    !synch_test_and_set_bit(port / BITS_PER_LONG,
+	    !synch_test_and_set_bit(port / LONG_BIT,
 				    &vcpu_info->evtchn_pending_sel)) {
 		vcpu_info->evtchn_upcall_pending = 1;
 		if (!vcpu_info->evtchn_upcall_mask)
@@ -1038,15 +950,21 @@ void irq_resume(void)
 		mask_evtchn(evtchn);
 
 	/* Check that no PIRQs are still bound. */
-	for (pirq = 0; pirq < NR_PIRQS; pirq++)
-		PANIC_IF(irq_info[pirq_to_irq(pirq)] != IRQ_UNBOUND);
+	for (pirq = 0; pirq < NR_PIRQS; pirq++) {
+		KASSERT(irq_info[pirq_to_irq(pirq)] == IRQ_UNBOUND,
+		    ("pirq_to_irq inconsistent"));
+	}
 
 	/* Secondary CPUs must have no VIRQ or IPI bindings. */
-	for (cpu = 1; cpu < NR_CPUS; cpu++) {
-		for (virq = 0; virq < NR_VIRQS; virq++)
-			PANIC_IF(per_cpu(virq_to_irq, cpu)[virq] != -1);
-		for (ipi = 0; ipi < NR_IPIS; ipi++)
-			PANIC_IF(per_cpu(ipi_to_irq, cpu)[ipi] != -1);
+	for (cpu = 1; cpu < MAX_VIRT_CPUS; cpu++) {
+		for (virq = 0; virq < NR_VIRQS; virq++) {
+			KASSERT(pcpu_find(cpu)->pc_virq_to_irq[virq] == -1,
+			    ("virq_to_irq inconsistent"));
+		}
+		for (ipi = 0; ipi < NR_IPIS; ipi++) {
+			KASSERT(pcpu_find(cpu)->pc_ipi_to_irq[ipi] == -1,
+			    ("ipi_to_irq inconsistent"));
+		}
 	}
 
 	/* No IRQ <-> event-channel mappings. */
@@ -1057,15 +975,16 @@ void irq_resume(void)
 
 	/* Primary CPU: rebind VIRQs automatically. */
 	for (virq = 0; virq < NR_VIRQS; virq++) {
-		if ((irq = per_cpu(virq_to_irq, 0)[virq]) == -1)
+		if ((irq = pcpu_find(0)->pc_virq_to_irq[virq]) == -1)
 			continue;
 
-		PANIC_IF(irq_info[irq] != mk_irq_info(IRQT_VIRQ, virq, 0));
+		KASSERT(irq_info[irq] == mk_irq_info(IRQT_VIRQ, virq, 0),
+		    ("irq_info inconsistent"));
 
 		/* Get a new binding from Xen. */
 		bind_virq.virq = virq;
 		bind_virq.vcpu = 0;
-		PANIC_IF(HYPERVISOR_event_channel_op(EVTCHNOP_bind_virq, &bind_virq) != 0);
+		HYPERVISOR_event_channel_op(EVTCHNOP_bind_virq, &bind_virq);
 		evtchn = bind_virq.port;
         
 		/* Record the new mapping. */
@@ -1078,15 +997,16 @@ void irq_resume(void)
 
 	/* Primary CPU: rebind IPIs automatically. */
 	for (ipi = 0; ipi < NR_IPIS; ipi++) {
-		if ((irq = per_cpu(ipi_to_irq, 0)[ipi]) == -1)
+		if ((irq = pcpu_find(0)->pc_ipi_to_irq[ipi]) == -1)
 			continue;
 
-		PANIC_IF(irq_info[irq] != mk_irq_info(IRQT_IPI, ipi, 0));
+		KASSERT(irq_info[irq] == mk_irq_info(IRQT_IPI, ipi, 0),
+		    ("irq_info inconsistent"));
 
 		/* Get a new binding from Xen. */
 		memset(&op, 0, sizeof(op));
 		bind_ipi.vcpu = 0;
-		PANIC_IF(HYPERVISOR_event_channel_op(EVTCHNOP_bind_ipi, &bind_ipi) != 0);
+		HYPERVISOR_event_channel_op(EVTCHNOP_bind_ipi, &bind_ipi);
 		evtchn = bind_ipi.port;
         
 		/* Record the new mapping. */
@@ -1110,9 +1030,9 @@ evtchn_init(void *dummy __unused)
          /* No VIRQ or IPI bindings. */
 	for (cpu = 0; cpu < mp_ncpus; cpu++) {
 		for (i = 0; i < NR_VIRQS; i++)
-			per_cpu(virq_to_irq, cpu)[i] = -1;
+			pcpu_find(cpu)->pc_virq_to_irq[i] = -1;
 		for (i = 0; i < NR_IPIS; i++)
-			per_cpu(ipi_to_irq, cpu)[i] = -1;
+			pcpu_find(cpu)->pc_ipi_to_irq[i] = -1;
 	}
 
 	/* No event-channel -> IRQ mappings. */

Modified: user/dfr/xenhvm/7/sys/xen/evtchn/evtchn_dev.c
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/evtchn/evtchn_dev.c	Mon Feb 16 17:08:38 2009	(r188681)
+++ user/dfr/xenhvm/7/sys/xen/evtchn/evtchn_dev.c	Mon Feb 16 17:11:34 2009	(r188682)
@@ -23,8 +23,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/fcntl.h>
 #include <sys/ioccom.h>
 
-#include <machine/cpufunc.h>
-#include <machine/intr_machdep.h>
 #include <machine/xen/xen-os.h>
 #include <xen/xen_intr.h>
 #include <machine/bus.h>
@@ -234,14 +232,14 @@ evtchn_ioctl(struct cdev *dev, unsigned 
 		__evtchn_reset_buffer_ring();
 		break;
 	case EVTCHN_BIND:
-		if ( !synch_test_and_set_bit((int)arg, &bound_ports[0]) )
-			unmask_evtchn((int)arg);
+		if ( !synch_test_and_set_bit((uintptr_t)arg, &bound_ports[0]) )
+			unmask_evtchn((uintptr_t)arg);
 		else
 			rc = EINVAL;
 		break;
 	case EVTCHN_UNBIND:
-		if ( synch_test_and_clear_bit((int)arg, &bound_ports[0]) )
-			mask_evtchn((int)arg);
+		if ( synch_test_and_clear_bit((uintptr_t)arg, &bound_ports[0]) )
+			mask_evtchn((uintptr_t)arg);
 		else
 			rc = EINVAL;
 		break;
@@ -383,12 +381,12 @@ evtchn_dev_init(void *dummy __unused)
 	/* (DEVFS) automatically destroy the symlink with its destination. */
 	devfs_auto_unregister(evtchn_miscdev.devfs_handle, symlink_handle);
 #endif
-	printk("Event-channel device installed.\n");
+	if (bootverbose)
+		printf("Event-channel device installed.\n");
 
 	return 0;
 }
 
-
 SYSINIT(evtchn_dev_init, SI_SUB_DRIVERS, SI_ORDER_FIRST, evtchn_dev_init, NULL);
 
 

From owner-svn-src-user@FreeBSD.ORG  Mon Feb 16 17:13:00 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ADA9C1065673;
	Mon, 16 Feb 2009 17:13:00 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9CD898FC0A;
	Mon, 16 Feb 2009 17:13:00 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1GHD0qE071317;
	Mon, 16 Feb 2009 17:13:00 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1GHD0Ck071315;
	Mon, 16 Feb 2009 17:13:00 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200902161713.n1GHD0Ck071315@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Mon, 16 Feb 2009 17:13:00 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188683 - in user/dfr/xenhvm/7/sys/xen/interface:
	arch-x86 hvm
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Feb 2009 17:13:01 -0000

Author: dfr
Date: Mon Feb 16 17:13:00 2009
New Revision: 188683
URL: http://svn.freebsd.org/changeset/base/188683

Log:
  Diff reduction with user/dfr/xenhvm/6

Modified:
  user/dfr/xenhvm/7/sys/xen/interface/arch-x86/xen.h
  user/dfr/xenhvm/7/sys/xen/interface/hvm/params.h

Modified: user/dfr/xenhvm/7/sys/xen/interface/arch-x86/xen.h
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/interface/arch-x86/xen.h	Mon Feb 16 17:11:34 2009	(r188682)
+++ user/dfr/xenhvm/7/sys/xen/interface/arch-x86/xen.h	Mon Feb 16 17:13:00 2009	(r188683)
@@ -32,7 +32,8 @@
 #define ___DEFINE_XEN_GUEST_HANDLE(name, type) \
     typedef struct { type *p; } __guest_handle_ ## name
 #else
-#define ___DEFINE_XEN_GUEST_HANDLE(name, type) \
+#error "using old handle"
+#define ___DEFINE_XEN_GUEST_HANDLE(name, type)  \
     typedef type * __guest_handle_ ## name
 #endif
 
@@ -50,7 +51,7 @@
 #if defined(__i386__)
 #include <xen/interface/arch-x86/xen-x86_32.h>
 #elif defined(__x86_64__)
-#include "xen-x86_64.h"
+#include <xen/interface/arch-x86/xen-x86_64.h>
 #endif
 
 #ifndef __ASSEMBLY__

Modified: user/dfr/xenhvm/7/sys/xen/interface/hvm/params.h
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/interface/hvm/params.h	Mon Feb 16 17:11:34 2009	(r188682)
+++ user/dfr/xenhvm/7/sys/xen/interface/hvm/params.h	Mon Feb 16 17:13:00 2009	(r188683)
@@ -21,7 +21,7 @@
 #ifndef __XEN_PUBLIC_HVM_PARAMS_H__
 #define __XEN_PUBLIC_HVM_PARAMS_H__
 
-#include "hvm_op.h"
+#include <xen/interface/hvm/hvm_op.h>
 
 /*
  * Parameter space for HVMOP_{set,get}_param.

From owner-svn-src-user@FreeBSD.ORG  Mon Feb 16 17:16:27 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7BB0B106564A;
	Mon, 16 Feb 2009 17:16:27 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 697898FC0A;
	Mon, 16 Feb 2009 17:16:27 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1GHGRRK071750;
	Mon, 16 Feb 2009 17:16:27 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1GHGQro071742;
	Mon, 16 Feb 2009 17:16:26 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200902161716.n1GHGQro071742@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Mon, 16 Feb 2009 17:16:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188684 - user/dfr/xenhvm/7/sys/xen
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Feb 2009 17:16:27 -0000

Author: dfr
Date: Mon Feb 16 17:16:26 2009
New Revision: 188684
URL: http://svn.freebsd.org/changeset/base/188684

Log:
  Diff reduction with user/dfr/xenhvm/6.

Added:
  user/dfr/xenhvm/7/sys/xen/features.h
  user/dfr/xenhvm/7/sys/xen/reboot.c
Modified:
  user/dfr/xenhvm/7/sys/xen/evtchn.h
  user/dfr/xenhvm/7/sys/xen/features.c
  user/dfr/xenhvm/7/sys/xen/gnttab.c
  user/dfr/xenhvm/7/sys/xen/gnttab.h
  user/dfr/xenhvm/7/sys/xen/hypervisor.h
  user/dfr/xenhvm/7/sys/xen/xen_intr.h

Modified: user/dfr/xenhvm/7/sys/xen/evtchn.h
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/evtchn.h	Mon Feb 16 17:13:00 2009	(r188683)
+++ user/dfr/xenhvm/7/sys/xen/evtchn.h	Mon Feb 16 17:16:26 2009	(r188684)
@@ -28,7 +28,7 @@ void notify_remote_via_irq(int irq);
 
 
 /* Entry point for notifications into Linux subsystems. */
-void evtchn_do_upcall(struct trapframe *frame);
+void evtchn_do_upcall(struct intrframe *frame);
 
 /* Entry point for notifications into the userland character device. */
 void evtchn_device_upcall(int port);

Modified: user/dfr/xenhvm/7/sys/xen/features.c
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/features.c	Mon Feb 16 17:13:00 2009	(r188683)
+++ user/dfr/xenhvm/7/sys/xen/features.c	Mon Feb 16 17:16:26 2009	(r188684)
@@ -1,10 +1,12 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+
 #include <machine/xen/xen-os.h>
 #include <xen/hypervisor.h>
-#include <machine/xen/features.h>
+#include <xen/features.h>
 
 uint8_t xen_features[XENFEAT_NR_SUBMAPS * 32] /* __read_mostly */;
 

Added: user/dfr/xenhvm/7/sys/xen/features.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/dfr/xenhvm/7/sys/xen/features.h	Mon Feb 16 17:16:26 2009	(r188684)
@@ -0,0 +1,20 @@
+/******************************************************************************
+ * features.h
+ *
+ * Query the features reported by Xen.
+ *
+ * Copyright (c) 2006, Ian Campbell
+ */
+
+#ifndef __ASM_XEN_FEATURES_H__
+#define __ASM_XEN_FEATURES_H__
+
+#include <xen/interface/version.h>
+
+extern void setup_xen_features(void);
+
+extern uint8_t xen_features[XENFEAT_NR_SUBMAPS * 32];
+
+#define xen_feature(flag)	(xen_features[flag])
+
+#endif /* __ASM_XEN_FEATURES_H__ */

Modified: user/dfr/xenhvm/7/sys/xen/gnttab.c
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/gnttab.c	Mon Feb 16 17:13:00 2009	(r188683)
+++ user/dfr/xenhvm/7/sys/xen/gnttab.c	Mon Feb 16 17:16:26 2009	(r188684)
@@ -25,28 +25,20 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/mman.h>
-#include <vm/vm.h>
-#include <vm/vm_extern.h>
-
-#include <vm/vm_page.h>
-#include <vm/vm_kern.h>
 
+#include <machine/xen/xen-os.h>
 #include <xen/hypervisor.h>
 #include <machine/xen/synch_bitops.h>
-#include <xen/gnttab.h>
 
-#define cmpxchg(a, b, c) atomic_cmpset_int((volatile u_int *)(a),(b),(c))
+#include <xen/hypervisor.h>
+#include <xen/gnttab.h>
 
-#if 1
-#define ASSERT(_p) \
-    if ( !(_p) ) { printk("Assertion '%s': line %d, file %s\n", \
-    #_p , __LINE__, __FILE__); *(int*)0=0; }
-#else
-#define ASSERT(_p) ((void)0)
-#endif
+#include <vm/vm.h>
+#include <vm/vm_kern.h>
+#include <vm/vm_extern.h>
+#include <vm/pmap.h>
 
-#define WPRINTK(fmt, args...) \
-    printk("xen_grant: " fmt, ##args)
+#define cmpxchg(a, b, c) atomic_cmpset_int((volatile u_int *)(a),(b),(c))
 
 /* External tools reserve first few grant table entries. */
 #define NR_RESERVED_ENTRIES 8
@@ -72,14 +64,14 @@ static int gnttab_expand(unsigned int re
 static int
 get_free_entries(int count, int *entries)
 {
-	int ref, rc;
+	int ref, error;
 	grant_ref_t head;
 	
 	mtx_lock(&gnttab_list_lock);
 	if ((gnttab_free_count < count) &&
-	    ((rc = gnttab_expand(count - gnttab_free_count)) != 0)) {
+	    ((error = gnttab_expand(count - gnttab_free_count)) != 0)) {
 		mtx_unlock(&gnttab_list_lock);
-		return (rc);
+		return (error);
 	}
 	ref = head = gnttab_free_head;
 	gnttab_free_count -= count;
@@ -163,6 +155,7 @@ void
 gnttab_grant_foreign_access_ref(grant_ref_t ref, domid_t domid,
 				unsigned long frame, int readonly)
 {
+
 	shared[ref].frame = frame;
 	shared[ref].domid = domid;
 	wmb();
@@ -213,7 +206,8 @@ gnttab_end_foreign_access(grant_ref_t re
 }
 
 int
-gnttab_grant_foreign_transfer(domid_t domid, unsigned long pfn)
+gnttab_grant_foreign_transfer(domid_t domid, unsigned long pfn,
+    grant_ref_t *result)
 {
 	int error, ref;
 
@@ -223,7 +217,8 @@ gnttab_grant_foreign_transfer(domid_t do
 
 	gnttab_grant_foreign_transfer_ref(ref, domid, pfn);
 	
-	return (ref);
+	*result = ref;
+	return (0);
 }
 
 void
@@ -261,7 +256,7 @@ gnttab_end_foreign_transfer_ref(grant_re
 	/* Read the frame number /after/ reading completion status. */
 	rmb();
 	frame = shared[ref].frame;
-	PANIC_IF(frame == 0);
+	KASSERT(frame != 0, ("grant table inconsistent"));
 
 	return (frame);
 }
@@ -320,6 +315,7 @@ gnttab_alloc_grant_references(uint16_t c
 int
 gnttab_empty_grant_references(const grant_ref_t *private_head)
 {
+
 	return (*private_head == GNTTAB_LIST_END);
 }
 
@@ -331,20 +327,20 @@ gnttab_claim_grant_reference(grant_ref_t
 	if (unlikely(g == GNTTAB_LIST_END))
 		return (ENOSPC);
 	*private_head = gnttab_entry(g);
-
 	return (g);
 }
 
 void
 gnttab_release_grant_reference(grant_ref_t *private_head, grant_ref_t  release)
 {
+
 	gnttab_entry(release) = *private_head;
 	*private_head = release;
 }
 
 void
 gnttab_request_free_callback(struct gnttab_free_callback *callback,
-			     void (*fn)(void *), void *arg, uint16_t count)
+    void (*fn)(void *), void *arg, uint16_t count)
 {
 
 	mtx_lock(&gnttab_list_lock);
@@ -387,7 +383,8 @@ grow_gnttab_list(unsigned int more_frame
 
 	for (i = nr_grant_frames; i < new_nr_grant_frames; i++)
 	{
-		gnttab_list[i] = (grant_ref_t *)malloc(PAGE_SIZE, M_DEVBUF, M_NOWAIT);
+		gnttab_list[i] = (grant_ref_t *)
+			malloc(PAGE_SIZE, M_DEVBUF, M_NOWAIT);
 
 		if (!gnttab_list[i])
 			goto grow_nomem;
@@ -405,12 +402,12 @@ grow_gnttab_list(unsigned int more_frame
 
 	check_free_callbacks();
 
-	return 0;
+	return (0);
 	
 grow_nomem:
 	for ( ; i >= nr_grant_frames; i--)
 		free(gnttab_list[i], M_DEVBUF);
-	return (-ENOMEM);
+	return (ENOMEM);
 }
 
 static unsigned int
@@ -464,6 +461,8 @@ unmap_pte_fn(pte_t *pte, struct page *pm
 }
 #endif
 
+#ifndef XENHVM
+
 static int
 gnttab_map(unsigned int start_idx, unsigned int end_idx)
 {
@@ -486,50 +485,117 @@ gnttab_map(unsigned int start_idx, unsig
 		free(frames, M_DEVBUF);
 		return (ENOSYS);
 	}
-	PANIC_IF(rc || setup.status);
+	KASSERT(!(rc || setup.status),
+	    ("unexpected result from grant_table_op"));
 
 	if (shared == NULL) {
 		vm_offset_t area;
 		
 		area = kmem_alloc_nofault(kernel_map,
 		    PAGE_SIZE * max_nr_grant_frames());
-		PANIC_IF(area == 0);
+		KASSERT(area, ("can't allocate VM space for grant table"));
 		shared = (grant_entry_t *)area;
 	}
+
 	for (i = 0; i < nr_gframes; i++)
 		PT_SET_MA(((caddr_t)shared) + i*PAGE_SIZE, 
 		    ((vm_paddr_t)frames[i]) << PAGE_SHIFT | PG_RW | PG_V);
 
 	free(frames, M_DEVBUF);
 	
-	return 0;
+	return (0);
 }
 
 int
 gnttab_resume(void)
 {
+
 	if (max_nr_grant_frames() < nr_grant_frames)
-		return -ENOSYS;
-	return gnttab_map(0, nr_grant_frames - 1);
+		return (ENOSYS);
+	return (gnttab_map(0, nr_grant_frames - 1));
 }
 
 int
 gnttab_suspend(void)
 {	
-	int i, pages;
+	int i;
+
+	for (i = 0; i < nr_grant_frames; i++)
+		pmap_kremove((vm_offset_t) shared + i * PAGE_SIZE);
+
+	return (0);
+}
+
+#else /* XENHVM */
 
-	pages = (PAGE_SIZE*nr_grant_frames) >> PAGE_SHIFT;
+#include <dev/xen/xenpci/xenpcivar.h>
 
-	for (i = 0; i < pages; i++)
-		PT_SET_MA(shared + (i*PAGE_SIZE), (vm_paddr_t)0);
+static vm_paddr_t resume_frames;
+
+static int gnttab_map(unsigned int start_idx, unsigned int end_idx)
+{
+	struct xen_add_to_physmap xatp;
+	unsigned int i = end_idx;
+
+	/*
+	 * Loop backwards, so that the first hypercall has the largest index,
+	 * ensuring that the table will grow only once.
+	 */
+	do {
+		xatp.domid = DOMID_SELF;
+		xatp.idx = i;
+		xatp.space = XENMAPSPACE_grant_table;
+		xatp.gpfn = (resume_frames >> PAGE_SHIFT) + i;
+		if (HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp))
+			panic("HYPERVISOR_memory_op failed to map gnttab");
+	} while (i-- > start_idx);
+
+	if (shared == NULL) {
+		vm_offset_t area;
+		
+		area = kmem_alloc_nofault(kernel_map,
+		    PAGE_SIZE * max_nr_grant_frames());
+		KASSERT(area, ("can't allocate VM space for grant table"));
+		shared = (grant_entry_t *)area;
+	}
+
+	for (i = start_idx; i <= end_idx; i++) {
+		pmap_kenter((vm_offset_t) shared + i * PAGE_SIZE,
+		    resume_frames + i * PAGE_SIZE);
+	}
 
 	return (0);
 }
 
+int
+gnttab_resume(void)
+{
+	int error;
+	unsigned int max_nr_gframes, nr_gframes;
+
+	nr_gframes = nr_grant_frames;
+	max_nr_gframes = max_nr_grant_frames();
+	if (max_nr_gframes < nr_gframes)
+		return (ENOSYS);
+
+	if (!resume_frames) {
+		error = xenpci_alloc_space(PAGE_SIZE * max_nr_gframes,
+		    &resume_frames);
+		if (error) {
+			printf("error mapping gnttab share frames\n");
+			return (error);
+		}
+	}
+
+	return (gnttab_map(0, nr_gframes - 1));
+}
+
+#endif
+
 static int
 gnttab_expand(unsigned int req_entries)
 {
-	int rc;
+	int error;
 	unsigned int cur, extra;
 
 	cur = nr_grant_frames;
@@ -538,10 +604,11 @@ gnttab_expand(unsigned int req_entries)
 	if (cur + extra > max_nr_grant_frames())
 		return (ENOSPC);
 
-	if ((rc = gnttab_map(cur, cur + extra - 1)) == 0)
-		rc = grow_gnttab_list(extra);
+	error = gnttab_map(cur, cur + extra - 1);
+	if (!error)
+		error = grow_gnttab_list(extra);
 
-	return rc;
+	return (error);
 }
 
 int 
@@ -552,7 +619,7 @@ gnttab_init()
 	unsigned int nr_init_grefs;
 
 	if (!is_running_on_xen())
-		return -ENODEV;
+		return (ENODEV);
 
 	nr_grant_frames = 1;
 	boot_max_nr_grant_frames = __max_nr_grant_frames();
@@ -571,7 +638,8 @@ gnttab_init()
 		return (ENOMEM);
 
 	for (i = 0; i < nr_grant_frames; i++) {
-		gnttab_list[i] = (grant_ref_t *)malloc(PAGE_SIZE, M_DEVBUF, M_NOWAIT);
+		gnttab_list[i] = (grant_ref_t *)
+			malloc(PAGE_SIZE, M_DEVBUF, M_NOWAIT);
 		if (gnttab_list[i] == NULL)
 			goto ini_nomem;
 	}
@@ -588,8 +656,10 @@ gnttab_init()
 	gnttab_free_count = nr_init_grefs - NR_RESERVED_ENTRIES;
 	gnttab_free_head  = NR_RESERVED_ENTRIES;
 
-	printk("Grant table initialized\n");
-	return 0;
+	if (bootverbose)
+		printf("Grant table initialized\n");
+
+	return (0);
 
 ini_nomem:
 	for (i--; i >= 0; i--)

Modified: user/dfr/xenhvm/7/sys/xen/gnttab.h
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/gnttab.h	Mon Feb 16 17:13:00 2009	(r188683)
+++ user/dfr/xenhvm/7/sys/xen/gnttab.h	Mon Feb 16 17:16:26 2009	(r188684)
@@ -36,10 +36,12 @@
 
 #ifndef __ASM_GNTTAB_H__
 
+#include <xen/interface/grant_table.h>
+
 #include <xen/hypervisor.h>
 #include <xen/interface/grant_table.h>
 #include <machine/xen/xen-os.h>
-#include <machine/xen/features.h>
+#include <xen/features.h>
 
 struct gnttab_free_callback {
 	struct gnttab_free_callback *next;
@@ -50,6 +52,10 @@ struct gnttab_free_callback {
 
 int gnttab_init(void);
 
+/*
+ * Allocate a grant table reference and return it in *result. Returns
+ * zero on success or errno on error.
+ */
 int gnttab_grant_foreign_access(domid_t domid, unsigned long frame,
     int flags, grant_ref_t *result);
 
@@ -68,7 +74,7 @@ int gnttab_end_foreign_access_ref(grant_
  */
 void gnttab_end_foreign_access(grant_ref_t ref, void *page);
 
-int gnttab_grant_foreign_transfer(domid_t domid, unsigned long pfn);
+int gnttab_grant_foreign_transfer(domid_t domid, unsigned long pfn, grant_ref_t *result);
 
 unsigned long gnttab_end_foreign_transfer_ref(grant_ref_t ref);
 unsigned long gnttab_end_foreign_transfer(grant_ref_t ref);
@@ -104,6 +110,10 @@ void gnttab_grant_foreign_transfer_ref(g
 int gnttab_suspend(void);
 int gnttab_resume(void);
 
+#if 0
+
+#include <xen/features.h>
+
 static inline void
 gnttab_set_map_op(struct gnttab_map_grant_ref *map, vm_paddr_t addr,
 		  uint32_t flags, grant_ref_t ref, domid_t domid)
@@ -149,5 +159,6 @@ gnttab_set_replace_op(struct gnttab_unma
 
 	unmap->handle = handle;
 }
+#endif
 
 #endif /* __ASM_GNTTAB_H__ */

Modified: user/dfr/xenhvm/7/sys/xen/hypervisor.h
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/hypervisor.h	Mon Feb 16 17:13:00 2009	(r188683)
+++ user/dfr/xenhvm/7/sys/xen/hypervisor.h	Mon Feb 16 17:16:26 2009	(r188684)
@@ -6,11 +6,19 @@
  * Copyright (c) 2002, K A Fraser
  */
 
-#ifndef __HYPERVISOR_H__
-#define __HYPERVISOR_H__
+#ifndef __XEN_HYPERVISOR_H__
+#define __XEN_HYPERVISOR_H__
+
+#ifdef XENHVM
+
+#define is_running_on_xen()	(HYPERVISOR_shared_info != NULL)
+
+#else
 
 #define is_running_on_xen() 1
 
+#endif
+
 #ifdef PAE
 #ifndef CONFIG_X86_PAE
 #define CONFIG_X86_PAE
@@ -25,6 +33,7 @@
 #include <xen/interface/physdev.h>
 #include <xen/interface/sched.h>
 #include <xen/interface/callback.h>
+#include <xen/interface/memory.h>
 #include <machine/xen/hypercall.h>
 
 #if defined(__amd64__)
@@ -129,7 +138,7 @@ MULTI_update_va_mapping(
     mcl->op = __HYPERVISOR_update_va_mapping;
     mcl->args[0] = va;
 #if defined(__amd64__)
-    mcl->args[1] = new_val.pte;
+    mcl->args[1] = new_val;
 #elif defined(PAE)
     mcl->args[1] = (uint32_t)(new_val & 0xffffffff) ;
     mcl->args[2] = (uint32_t)(new_val >> 32);
@@ -140,4 +149,4 @@ MULTI_update_va_mapping(
     mcl->args[MULTI_UVMFLAGS_INDEX] = flags;
 }
 
-#endif /* __HYPERVISOR_H__ */
+#endif /* __XEN_HYPERVISOR_H__ */

Added: user/dfr/xenhvm/7/sys/xen/reboot.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/dfr/xenhvm/7/sys/xen/reboot.c	Mon Feb 16 17:16:26 2009	(r188684)
@@ -0,0 +1,262 @@
+/*
+ *
+ * Copyright (c) 2004 Christian Limpach.
+ * Copyright (c) 2004-2006,2008 Kip Macy
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *      This product includes software developed by Christian Limpach.
+ * 4. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/bus.h>
+#include <sys/malloc.h>
+#include <sys/kernel.h>
+#include <sys/proc.h>
+#include <sys/reboot.h>
+#include <sys/sched.h>
+#include <sys/smp.h>
+#include <sys/systm.h>
+
+#include <machine/xen/xen-os.h>
+#include <xen/hypervisor.h>
+#include <xen/gnttab.h>
+#include <xen/xen_intr.h>
+#include <xen/xenbus/xenbusvar.h>
+
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
+#ifdef XENHVM
+
+#include <dev/xen/xenpci/xenpcivar.h>
+
+#else
+
+static void xen_suspend(void);
+
+#endif
+
+static void 
+shutdown_handler(struct xenbus_watch *watch,
+		 const char **vec, unsigned int len)
+{
+	char *str;
+	struct xenbus_transaction xbt;
+	int error, howto;
+	
+	howto = 0;
+
+ again:
+	error = xenbus_transaction_start(&xbt);
+	if (error)
+		return;
+
+	error = xenbus_read(xbt, "control", "shutdown", NULL, (void **) &str);
+
+	/* Ignore read errors and empty reads. */
+	if (error || strlen(str) == 0) {
+		xenbus_transaction_end(xbt, 1);
+		return;
+	}
+
+	xenbus_write(xbt, "control", "shutdown", "");
+
+	error = xenbus_transaction_end(xbt, 0);
+	if (error == EAGAIN) {
+		free(str, M_DEVBUF);
+		goto again;
+	}
+
+	if (strcmp(str, "reboot") == 0)
+		howto = 0;
+	else if (strcmp(str, "poweroff") == 0)
+		howto |= (RB_POWEROFF | RB_HALT);
+	else if (strcmp(str, "halt") == 0)
+#ifdef XENHVM
+		/*
+		 * We rely on acpi powerdown to halt the VM.
+		 */
+		howto |= (RB_POWEROFF | RB_HALT);
+#else
+		howto |= RB_HALT;
+#endif
+	else if (strcmp(str, "suspend") == 0)
+		howto = -1;
+	else {
+		printf("Ignoring shutdown request: %s\n", str);
+		goto done;
+	}
+
+	if (howto == -1) {
+		xen_suspend();
+		goto done;
+	}
+
+	shutdown_nice(howto);
+ done:
+	free(str, M_DEVBUF);
+}
+
+#ifndef XENHVM
+
+/*
+ * In HV mode, we let acpi take care of halts and reboots.
+ */
+
+static void
+xen_shutdown_final(void *arg, int howto)
+{
+
+	if (howto & (RB_HALT | RB_POWEROFF))
+		HYPERVISOR_shutdown(SHUTDOWN_poweroff);
+	else
+		HYPERVISOR_shutdown(SHUTDOWN_reboot);
+}
+
+#endif
+
+static struct xenbus_watch shutdown_watch = {
+	.node = "control/shutdown",
+	.callback = shutdown_handler
+};
+
+static void
+setup_shutdown_watcher(void *unused)
+{
+
+	if (register_xenbus_watch(&shutdown_watch))
+		printf("Failed to set shutdown watcher\n");
+#ifndef XENHVM
+	EVENTHANDLER_REGISTER(shutdown_final, xen_shutdown_final, NULL,
+	    SHUTDOWN_PRI_LAST);
+#endif
+}
+
+SYSINIT(shutdown, SI_SUB_PSEUDO, SI_ORDER_ANY, setup_shutdown_watcher, NULL);
+
+#ifndef XENHVM
+
+extern void xencons_suspend(void);
+extern void xencons_resume(void);
+
+static void 
+xen_suspend()
+{
+	int i, j, k, fpp;
+	unsigned long max_pfn, start_info_mfn;
+
+#ifdef SMP
+	cpumask_t map;
+	/*
+	 * Bind us to CPU 0 and stop any other VCPUs.
+	 */
+	mtx_lock_spin(&sched_lock);
+	sched_bind(curthread, 0);
+	mtx_unlock_spin(&sched_lock);
+	KASSERT(PCPU_GET(cpuid) == 0, ("xen_suspend: not running on cpu 0"));
+
+	map = PCPU_GET(other_cpus) & ~stopped_cpus;
+	if (map)
+		stop_cpus(map);
+#endif
+
+	if (DEVICE_SUSPEND(root_bus) != 0) {
+		printf("xen_suspend: device_suspend failed\n");
+		if (map)
+			restart_cpus(map);
+		return;
+	}
+
+	local_irq_disable();
+
+	xencons_suspend();
+	gnttab_suspend();
+
+	max_pfn = HYPERVISOR_shared_info->arch.max_pfn;
+
+	void *shared_info = HYPERVISOR_shared_info;
+	HYPERVISOR_shared_info = NULL;
+	pmap_kremove((vm_offset_t) shared_info);
+	PT_UPDATES_FLUSH();
+
+	xen_start_info->store_mfn = MFNTOPFN(xen_start_info->store_mfn);
+	xen_start_info->console.domU.mfn = MFNTOPFN(xen_start_info->console.domU.mfn);
+
+	/*
+	 * We'll stop somewhere inside this hypercall. When it returns,
+	 * we'll start resuming after the restore.
+	 */
+	start_info_mfn = VTOMFN(xen_start_info);
+	pmap_suspend();
+	HYPERVISOR_suspend(start_info_mfn);
+	pmap_resume();
+
+	pmap_kenter_ma((vm_offset_t) shared_info, xen_start_info->shared_info);
+	HYPERVISOR_shared_info = shared_info;
+
+	HYPERVISOR_shared_info->arch.pfn_to_mfn_frame_list_list =
+		VTOMFN(xen_pfn_to_mfn_frame_list_list);
+  
+	fpp = PAGE_SIZE/sizeof(unsigned long);
+	for (i = 0, j = 0, k = -1; i < max_pfn; i += fpp, j++) {
+		if ((j % fpp) == 0) {
+			k++;
+			xen_pfn_to_mfn_frame_list_list[k] = 
+				VTOMFN(xen_pfn_to_mfn_frame_list[k]);
+			j = 0;
+		}
+		xen_pfn_to_mfn_frame_list[k][j] = 
+			VTOMFN(&xen_phys_machine[i]);
+	}
+	HYPERVISOR_shared_info->arch.max_pfn = max_pfn;
+
+	gnttab_resume();
+	irq_resume();
+	local_irq_enable();
+	xencons_resume();
+
+#ifdef CONFIG_SMP
+	for_each_cpu(i)
+		vcpu_prepare(i);
+
+#endif
+	/* 
+	 * Only resume xenbus /after/ we've prepared our VCPUs; otherwise
+	 * the VCPU hotplug callback can race with our vcpu_prepare
+	 */
+	DEVICE_RESUME(root_bus);
+
+#ifdef SMP
+	sched_unbind(curthread);
+	if (map)
+		restart_cpus(map);
+#endif
+}
+
+#endif

Modified: user/dfr/xenhvm/7/sys/xen/xen_intr.h
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/xen_intr.h	Mon Feb 16 17:13:00 2009	(r188683)
+++ user/dfr/xenhvm/7/sys/xen/xen_intr.h	Mon Feb 16 17:16:26 2009	(r188684)
@@ -29,37 +29,62 @@
 #define dynirq_to_irq(_x) ((_x) + DYNIRQ_BASE)
 #define irq_to_dynirq(_x) ((_x) - DYNIRQ_BASE)
 
-/* Dynamic binding of event channels and VIRQ sources to Linux IRQ space. */
-extern void unbind_from_irq(int irq);
-
+/* 
+ * Dynamic binding of event channels and VIRQ sources to guest IRQ space.
+ */
+
+/*
+ * Bind a caller port event channel to an interrupt handler. If
+ * successful, the guest IRQ number is returned in *irqp. Return zero
+ * on success or errno otherwise.
+ */
 extern int bind_caller_port_to_irqhandler(unsigned int caller_port,
 	const char *devname, driver_intr_t handler, void *arg,
 	unsigned long irqflags, unsigned int *irqp);
+
+/*
+ * Bind a listening port to an interrupt handler. If successful, the
+ * guest IRQ number is returned in *irqp. Return zero on success or
+ * errno otherwise.
+ */
 extern int bind_listening_port_to_irqhandler(unsigned int remote_domain,
-	const char *devname, driver_intr_t handler, void *arg, unsigned long irqflags,
-	unsigned int *irqp);
+	const char *devname, driver_intr_t handler, void *arg,
+	unsigned long irqflags, unsigned int *irqp);
+
+/*
+ * Bind a VIRQ to an interrupt handler. If successful, the guest IRQ
+ * number is returned in *irqp. Return zero on success or errno
+ * otherwise.
+ */
 extern int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu,
-	const char *devname, driver_filter_t filter, driver_intr_t handler,
+	const char *devname, driver_intr_t handler,
 	unsigned long irqflags,	unsigned int *irqp);
-extern int bind_ipi_to_irqhandler(unsigned int ipi,
-	unsigned int cpu,
-	const char *devname,
-	driver_filter_t handler,
-	unsigned long irqflags,
-	unsigned int *irqp);
 
-extern int bind_interdomain_evtchn_to_irqhandler(unsigned int remote_domain,
-	                                             unsigned int remote_port,
-	                                             const char *devname,
-	                                             driver_filter_t filter,
-	                                             driver_intr_t handler,
-	                                             unsigned long irqflags,
-	                                             unsigned int *irqp);
+/*
+ * Bind an IPI to an interrupt handler. If successful, the guest
+ * IRQ number is returned in *irqp. Return zero on success or errno
+ * otherwise.
+ */
+extern int bind_ipi_to_irqhandler(unsigned int ipi, unsigned int cpu,
+	const char *devname, driver_intr_t handler,
+	unsigned long irqflags, unsigned int *irqp);
 
+/*
+ * Bind an interdomain event channel to an interrupt handler. If
+ * successful, the guest IRQ number is returned in *irqp. Return zero
+ * on success or errno otherwise.
+ */
+extern int bind_interdomain_evtchn_to_irqhandler(unsigned int remote_domain,
+	unsigned int remote_port, const char *devname, driver_intr_t handler,
+	unsigned long irqflags, unsigned int *irqp);
 
+/*
+ * Unbind an interrupt handler using the guest IRQ number returned
+ * when it was bound.
+ */
+extern void unbind_from_irqhandler(unsigned int irq);
 
-extern void unbind_from_irqhandler(unsigned int evtchn);
-static __inline__ int irq_cannonicalize(int irq)
+static __inline__ int irq_cannonicalize(unsigned int irq)
 {
     return (irq == 2) ? 9 : irq;
 }

From owner-svn-src-user@FreeBSD.ORG  Mon Feb 16 17:19:39 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4DF3810656F6;
	Mon, 16 Feb 2009 17:19:39 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 22F7B8FC17;
	Mon, 16 Feb 2009 17:19:39 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1GHJdLP072137;
	Mon, 16 Feb 2009 17:19:39 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1GHJdaR072136;
	Mon, 16 Feb 2009 17:19:39 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200902161719.n1GHJdaR072136@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Mon, 16 Feb 2009 17:19:39 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188685 - user/dfr/xenhvm/7/sys/dev/xen/xenpci
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Feb 2009 17:19:40 -0000

Author: dfr
Date: Mon Feb 16 17:19:38 2009
New Revision: 188685
URL: http://svn.freebsd.org/changeset/base/188685

Log:
  Copy the Xen HVM platform device driver from user/dfr/xenhvm/6.

Added:
  user/dfr/xenhvm/7/sys/dev/xen/xenpci/   (props changed)
     - copied from r188684, user/dfr/xenhvm/6/sys/dev/xen/xenpci/

From owner-svn-src-user@FreeBSD.ORG  Mon Feb 16 17:43:46 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0DBBB1065676;
	Mon, 16 Feb 2009 17:43:46 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EFEB78FC20;
	Mon, 16 Feb 2009 17:43:45 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1GHhj5U074809;
	Mon, 16 Feb 2009 17:43:45 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1GHhjT3074806;
	Mon, 16 Feb 2009 17:43:45 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200902161743.n1GHhjT3074806@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Mon, 16 Feb 2009 17:43:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188686 - in user/dfr/xenhvm/7/sys/xen: . evtchn xenbus
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Feb 2009 17:43:46 -0000

Author: dfr
Date: Mon Feb 16 17:43:45 2009
New Revision: 188686
URL: http://svn.freebsd.org/changeset/base/188686

Log:
  Fix build.

Modified:
  user/dfr/xenhvm/7/sys/xen/evtchn.h
  user/dfr/xenhvm/7/sys/xen/evtchn/evtchn.c
  user/dfr/xenhvm/7/sys/xen/xen_intr.h
  user/dfr/xenhvm/7/sys/xen/xenbus/xenbus_xs.c

Modified: user/dfr/xenhvm/7/sys/xen/evtchn.h
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/evtchn.h	Mon Feb 16 17:19:38 2009	(r188685)
+++ user/dfr/xenhvm/7/sys/xen/evtchn.h	Mon Feb 16 17:43:45 2009	(r188686)
@@ -28,7 +28,7 @@ void notify_remote_via_irq(int irq);
 
 
 /* Entry point for notifications into Linux subsystems. */
-void evtchn_do_upcall(struct intrframe *frame);
+void evtchn_do_upcall(struct trapframe *frame);
 
 /* Entry point for notifications into the userland character device. */
 void evtchn_device_upcall(int port);

Modified: user/dfr/xenhvm/7/sys/xen/evtchn/evtchn.c
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/evtchn/evtchn.c	Mon Feb 16 17:19:38 2009	(r188685)
+++ user/dfr/xenhvm/7/sys/xen/evtchn/evtchn.c	Mon Feb 16 17:43:45 2009	(r188686)
@@ -184,7 +184,7 @@ void force_evtchn_callback(void)
 }
 
 void 
-evtchn_do_upcall(struct intrframe *frame) 
+evtchn_do_upcall(struct trapframe *frame) 
 {
 	unsigned long  l1, l2;
 	unsigned int   l1i, l2i, port;
@@ -450,7 +450,7 @@ bind_caller_port_to_irqhandler(unsigned 
 
 	irq = bind_caller_port_to_irq(caller_port);
 	intr_register_source(&xp->xp_pins[irq].xp_intsrc);
-	error = intr_add_handler(devname, irq, handler, arg, irqflags,
+	error = intr_add_handler(devname, irq, NULL, handler, arg, irqflags,
 	    &xp->xp_pins[irq].xp_cookie);
 
 	if (error) {
@@ -474,7 +474,7 @@ bind_listening_port_to_irqhandler(unsign
 
 	irq = bind_listening_port_to_irq(remote_domain);
 	intr_register_source(&xp->xp_pins[irq].xp_intsrc);
-	error = intr_add_handler(devname, irq, handler, arg, irqflags,
+	error = intr_add_handler(devname, irq, NULL, handler, arg, irqflags,
 	    &xp->xp_pins[irq].xp_cookie);
 	if (error) {
 		unbind_from_irq(irq);
@@ -488,7 +488,8 @@ bind_listening_port_to_irqhandler(unsign
 
 int 
 bind_interdomain_evtchn_to_irqhandler(unsigned int remote_domain,
-    unsigned int remote_port, const char *devname, driver_intr_t handler,
+    unsigned int remote_port, const char *devname,
+    driver_filter_t filter, driver_intr_t handler,
     unsigned long irqflags, unsigned int *irqp)
 {
 	unsigned int irq;
@@ -496,7 +497,7 @@ bind_interdomain_evtchn_to_irqhandler(un
 
 	irq = bind_interdomain_evtchn_to_irq(remote_domain, remote_port);
 	intr_register_source(&xp->xp_pins[irq].xp_intsrc);
-	error = intr_add_handler(devname, irq, handler, NULL,
+	error = intr_add_handler(devname, irq, filter, handler, NULL,
 	    irqflags, &xp->xp_pins[irq].xp_cookie);
 	if (error) {
 		unbind_from_irq(irq);
@@ -510,7 +511,7 @@ bind_interdomain_evtchn_to_irqhandler(un
 
 int 
 bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu,
-    const char *devname, driver_intr_t handler,
+    const char *devname, driver_filter_t filter, driver_intr_t handler,
     unsigned long irqflags, unsigned int *irqp)
 {
 	unsigned int irq;
@@ -518,7 +519,7 @@ bind_virq_to_irqhandler(unsigned int vir
 
 	irq = bind_virq_to_irq(virq, cpu);
 	intr_register_source(&xp->xp_pins[irq].xp_intsrc);
-	error = intr_add_handler(devname, irq, handler,
+	error = intr_add_handler(devname, irq, filter, handler,
 	    NULL, irqflags, &xp->xp_pins[irq].xp_cookie);
 	if (error) {
 		unbind_from_irq(irq);
@@ -532,7 +533,7 @@ bind_virq_to_irqhandler(unsigned int vir
 
 int 
 bind_ipi_to_irqhandler(unsigned int ipi, unsigned int cpu,
-    const char *devname, driver_intr_t handler,
+    const char *devname, driver_filter_t filter,
     unsigned long irqflags, unsigned int *irqp)
 {
 	unsigned int irq;
@@ -540,7 +541,7 @@ bind_ipi_to_irqhandler(unsigned int ipi,
 	
 	irq = bind_ipi_to_irq(ipi, cpu);
 	intr_register_source(&xp->xp_pins[irq].xp_intsrc);
-	error = intr_add_handler(devname, irq, handler,
+	error = intr_add_handler(devname, irq, filter, NULL,
 	    NULL, irqflags, &xp->xp_pins[irq].xp_cookie);
 	if (error) {
 		unbind_from_irq(irq);

Modified: user/dfr/xenhvm/7/sys/xen/xen_intr.h
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/xen_intr.h	Mon Feb 16 17:19:38 2009	(r188685)
+++ user/dfr/xenhvm/7/sys/xen/xen_intr.h	Mon Feb 16 17:43:45 2009	(r188686)
@@ -57,7 +57,7 @@ extern int bind_listening_port_to_irqhan
  * otherwise.
  */
 extern int bind_virq_to_irqhandler(unsigned int virq, unsigned int cpu,
-	const char *devname, driver_intr_t handler,
+	const char *devname, driver_filter_t filter, driver_intr_t handler,
 	unsigned long irqflags,	unsigned int *irqp);
 
 /*
@@ -66,7 +66,7 @@ extern int bind_virq_to_irqhandler(unsig
  * otherwise.
  */
 extern int bind_ipi_to_irqhandler(unsigned int ipi, unsigned int cpu,
-	const char *devname, driver_intr_t handler,
+	const char *devname, driver_filter_t filter,
 	unsigned long irqflags, unsigned int *irqp);
 
 /*
@@ -75,7 +75,8 @@ extern int bind_ipi_to_irqhandler(unsign
  * on success or errno otherwise.
  */
 extern int bind_interdomain_evtchn_to_irqhandler(unsigned int remote_domain,
-	unsigned int remote_port, const char *devname, driver_intr_t handler,
+	unsigned int remote_port, const char *devname,
+	driver_filter_t filter, driver_intr_t handler,
 	unsigned long irqflags, unsigned int *irqp);
 
 /*

Modified: user/dfr/xenhvm/7/sys/xen/xenbus/xenbus_xs.c
==============================================================================
--- user/dfr/xenhvm/7/sys/xen/xenbus/xenbus_xs.c	Mon Feb 16 17:19:38 2009	(r188685)
+++ user/dfr/xenhvm/7/sys/xen/xenbus/xenbus_xs.c	Mon Feb 16 17:43:45 2009	(r188686)
@@ -791,7 +791,7 @@ xs_process_msg(enum xsd_sockmsg_type *ty
 	msg = malloc(sizeof(*msg), M_DEVBUF, M_WAITOK);
 	mtx_lock(&xs_state.reply_lock);
 	error = xb_read(&msg->hdr, sizeof(msg->hdr),
-	    &xs_state.reply_lock.mtx_object);
+	    &xs_state.reply_lock.lock_object);
 	mtx_unlock(&xs_state.reply_lock);
 	if (error) {
 		free(msg, M_DEVBUF);
@@ -801,7 +801,7 @@ xs_process_msg(enum xsd_sockmsg_type *ty
 	body = malloc(msg->hdr.len + 1, M_DEVBUF, M_WAITOK);
 	mtx_lock(&xs_state.reply_lock);
 	error = xb_read(body, msg->hdr.len,
-	    &xs_state.reply_lock.mtx_object); 
+	    &xs_state.reply_lock.lock_object); 
 	mtx_unlock(&xs_state.reply_lock);
 	if (error) {
 		free(body, M_DEVBUF);

From owner-svn-src-user@FreeBSD.ORG  Mon Feb 16 17:45:30 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5FE2F106567D;
	Mon, 16 Feb 2009 17:45:30 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 4D0688FC1D;
	Mon, 16 Feb 2009 17:45:30 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1GHjUFP075053;
	Mon, 16 Feb 2009 17:45:30 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1GHjUJ8075049;
	Mon, 16 Feb 2009 17:45:30 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200902161745.n1GHjUJ8075049@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Mon, 16 Feb 2009 17:45:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188687 - in user/dfr/xenhvm/7/sys/dev/xen: blkfront
	console netfront
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Feb 2009 17:45:31 -0000

Author: dfr
Date: Mon Feb 16 17:45:29 2009
New Revision: 188687
URL: http://svn.freebsd.org/changeset/base/188687

Log:
  Diff reduction with user/dfr/xenhvm/6.

Modified:
  user/dfr/xenhvm/7/sys/dev/xen/blkfront/blkfront.c
  user/dfr/xenhvm/7/sys/dev/xen/console/console.c
  user/dfr/xenhvm/7/sys/dev/xen/console/xencons_ring.c
  user/dfr/xenhvm/7/sys/dev/xen/netfront/netfront.c

Modified: user/dfr/xenhvm/7/sys/dev/xen/blkfront/blkfront.c
==============================================================================
--- user/dfr/xenhvm/7/sys/dev/xen/blkfront/blkfront.c	Mon Feb 16 17:43:45 2009	(r188686)
+++ user/dfr/xenhvm/7/sys/dev/xen/blkfront/blkfront.c	Mon Feb 16 17:45:29 2009	(r188687)
@@ -40,17 +40,17 @@ __FBSDID("$FreeBSD$");
 #include <machine/intr_machdep.h>
 #include <machine/vmparam.h>
 
-#include <xen/hypervisor.h>
 #include <machine/xen/xen-os.h>
+#include <machine/xen/xenfunc.h>
+#include <xen/hypervisor.h>
 #include <xen/xen_intr.h>
 #include <xen/evtchn.h>
+#include <xen/gnttab.h>
 #include <xen/interface/grant_table.h>
 #include <xen/interface/io/protocols.h>
 #include <xen/xenbus/xenbusvar.h>
 
 #include <geom/geom_disk.h>
-#include <machine/xen/xenfunc.h>
-#include <xen/gnttab.h>
 
 #include <dev/xen/blkfront/block.h>
 
@@ -106,7 +106,7 @@ static char * blkif_status_name[] = {
 #endif
 #define WPRINTK(fmt, args...) printf("[XEN] " fmt, ##args)
 #if 0
-#define DPRINTK(fmt, args...) printf("[XEN] %s:%d" fmt ".\n", __FUNCTION__, __LINE__,##args)
+#define DPRINTK(fmt, args...) printf("[XEN] %s:%d: " fmt ".\n", __func__, __LINE__, ##args)
 #else
 #define DPRINTK(fmt, args...) 
 #endif
@@ -138,7 +138,6 @@ pfn_to_mfn(vm_paddr_t pfn)
 	return (phystomach(pfn << PAGE_SHIFT) >> PAGE_SHIFT);
 }
 
-
 /*
  * Translate Linux major/minor to an appropriate name and unit
  * number. For HVM guests, this allows us to use the same drive names
@@ -323,17 +322,17 @@ blkfront_probe(device_t dev)
 static int
 blkfront_attach(device_t dev)
 {
-	int err, vdevice, i, unit;
+	int error, vdevice, i, unit;
 	struct blkfront_info *info;
 	const char *name;
 
 	/* FIXME: Use dynamic device id if this is not set. */
-	err = xenbus_scanf(XBT_NIL, xenbus_get_node(dev),
+	error = xenbus_scanf(XBT_NIL, xenbus_get_node(dev),
 	    "virtual-device", NULL, "%i", &vdevice);
-	if (err) {
-		xenbus_dev_fatal(dev, err, "reading virtual-device");
+	if (error) {
+		xenbus_dev_fatal(dev, error, "reading virtual-device");
 		printf("couldn't find virtual device");
-		return (err);
+		return (error);
 	}
 
 	blkfront_vdevice_to_unit(vdevice, &unit, &name);
@@ -362,9 +361,22 @@ blkfront_attach(device_t dev)
 	/* Front end dir is a number, which is used as the id. */
 	info->handle = strtoul(strrchr(xenbus_get_node(dev),'/')+1, NULL, 0);
 
-	err = talk_to_backend(dev, info);
-	if (err)
-		return (err);
+	error = talk_to_backend(dev, info);
+	if (error)
+		return (error);
+
+	return (0);
+}
+
+static int
+blkfront_suspend(device_t dev)
+{
+	struct blkfront_info *info = device_get_softc(dev);
+
+	/* Prevent new requests being issued until we fix things up. */
+	mtx_lock(&blkif_io_lock);
+	info->connected = BLKIF_STATE_SUSPENDED;
+	mtx_unlock(&blkif_io_lock);
 
 	return (0);
 }
@@ -375,16 +387,14 @@ blkfront_resume(device_t dev)
 	struct blkfront_info *info = device_get_softc(dev);
 	int err;
 
-	DPRINTK("blkfront_resume: %s\n", dev->nodename);
+	DPRINTK("blkfront_resume: %s\n", xenbus_get_node(dev));
 
 	blkif_free(info, 1);
-
 	err = talk_to_backend(dev, info);
-
 	if (info->connected == BLKIF_STATE_SUSPENDED && !err)
 		blkif_recover(info);
 
-	return err;
+	return (err);
 }
 
 /* Common code used when first setting up, and when resuming. */
@@ -425,6 +435,7 @@ talk_to_backend(device_t dev, struct blk
 		message = "writing protocol";
 		goto abort_transaction;
 	}
+
 	err = xenbus_transaction_end(xbt, 0);
 	if (err) {
 		if (err == EAGAIN)
@@ -462,8 +473,8 @@ setup_blkring(device_t dev, struct blkfr
 	SHARED_RING_INIT(sring);
 	FRONT_RING_INIT(&info->ring, sring, PAGE_SIZE);
 
-	error = xenbus_grant_ring(dev, (vtomach(info->ring.sring) >> PAGE_SHIFT),
-		&info->ring_ref);
+	error = xenbus_grant_ring(dev,
+	    (vtomach(info->ring.sring) >> PAGE_SHIFT), &info->ring_ref);
 	if (error) {
 		free(sring, M_DEVBUF);
 		info->ring.sring = NULL;
@@ -471,11 +482,11 @@ setup_blkring(device_t dev, struct blkfr
 	}
 	
 	error = bind_listening_port_to_irqhandler(xenbus_get_otherend_id(dev),
-		"xbd", (driver_intr_t *)blkif_int, info,
-					INTR_TYPE_BIO | INTR_MPSAFE, &info->irq);
+	    "xbd", (driver_intr_t *)blkif_int, info,
+	    INTR_TYPE_BIO | INTR_MPSAFE, &info->irq);
 	if (error) {
 		xenbus_dev_fatal(dev, error,
-				 "bind_evtchn_to_irqhandler failed");
+		    "bind_evtchn_to_irqhandler failed");
 		goto fail;
 	}
 
@@ -494,7 +505,7 @@ blkfront_backend_changed(device_t dev, X
 {
 	struct blkfront_info *info = device_get_softc(dev);
 
-	DPRINTK("blkfront:backend_changed.\n");
+	DPRINTK("backend_state=%d\n", backend_state);
 
 	switch (backend_state) {
 	case XenbusStateUnknown:
@@ -707,7 +718,7 @@ blkif_open(struct disk *dp)
 	struct xb_softc	*sc = (struct xb_softc *)dp->d_drv1;
 
 	if (sc == NULL) {
-		printk("xb%d: not found", sc->xb_unit);
+		printf("xb%d: not found", sc->xb_unit);
 		return (ENXIO);
 	}
 
@@ -1019,9 +1030,11 @@ blkif_recover(struct blkfront_info *info
 	blkif_request_t *req;
 	struct blk_shadow *copy;
 
+	if (!info->sc)
+		return;
+
 	/* Stage 1: Make a safe copy of the shadow state. */
 	copy = (struct blk_shadow *)malloc(sizeof(info->shadow), M_DEVBUF, M_NOWAIT|M_ZERO);
-	PANIC_IF(copy == NULL);
 	memcpy(copy, info->shadow, sizeof(info->shadow));
 
 	/* Stage 2: Set up free list. */
@@ -1084,7 +1097,7 @@ static device_method_t blkfront_methods[
 	DEVMETHOD(device_attach,        blkfront_attach), 
 	DEVMETHOD(device_detach,        blkfront_detach), 
 	DEVMETHOD(device_shutdown,      bus_generic_shutdown), 
-	DEVMETHOD(device_suspend,       bus_generic_suspend), 
+	DEVMETHOD(device_suspend,       blkfront_suspend), 
 	DEVMETHOD(device_resume,        blkfront_resume), 
  
 	/* Xenbus interface */

Modified: user/dfr/xenhvm/7/sys/dev/xen/console/console.c
==============================================================================
--- user/dfr/xenhvm/7/sys/dev/xen/console/console.c	Mon Feb 16 17:43:45 2009	(r188686)
+++ user/dfr/xenhvm/7/sys/dev/xen/console/console.c	Mon Feb 16 17:45:29 2009	(r188687)
@@ -5,6 +5,7 @@
 #include <sys/module.h>
 #include <sys/systm.h>
 #include <sys/consio.h>
+#include <sys/priv.h>
 #include <sys/proc.h>
 #include <sys/uio.h>
 #include <sys/tty.h>
@@ -19,7 +20,7 @@
 #include <xen/xen_intr.h>
 #include <sys/cons.h>
 #include <sys/proc.h>
-#include <sys/priv.h>
+#include <sys/kdb.h>
 
 #include <dev/xen/console/xencons_ring.h>
 #include <xen/interface/io/console.h>
@@ -44,7 +45,7 @@ static void xc_shutdown(void *arg, int h
 static int xc_mute;
 
 static void xcons_force_flush(void);
-static int xencons_priv_interrupt(void *);
+static void xencons_priv_interrupt(void *);
 
 static cn_probe_t       xccnprobe;
 static cn_init_t        xccninit;
@@ -141,12 +142,17 @@ xccngetc(struct consdev *dev)
 	    	return 0;
 	do {
 		if ((c = xccncheckc(dev)) == -1) {
-			/* polling without sleeping in Xen doesn't work well. 
-			 * Sleeping gives other things like clock a chance to 
-			 * run
-			 */
-			tsleep(&cn_mtx, PWAIT | PCATCH, "console sleep", 
-			       XC_POLLTIME);
+#ifdef KDB
+			if (!kdb_active)
+#endif
+				/*
+				 * Polling without sleeping in Xen
+				 * doesn't work well.  Sleeping gives
+				 * other things like clock a chance to
+				 * run
+				 */
+				tsleep(&cn_mtx, PWAIT | PCATCH,
+				    "console sleep", XC_POLLTIME);
 		}
 	} while(c == -1);
 	return c;
@@ -156,11 +162,13 @@ int
 xccncheckc(struct consdev *dev)
 {
 	int ret = (xc_mute ? 0 : -1);
-	if (xencons_has_input()) 
-			xencons_handle_input(NULL);
+
+	if (xencons_has_input())
+		xencons_handle_input(NULL);
 	
 	CN_LOCK(cn_mtx);
 	if ((rp - rc)) {
+		if (kdb_active) printf("%s:%d\n", __func__, __LINE__);
 		/* we need to return only one char */
 		ret = (int)rbuf[RBUF_MASK(rc)];
 		rc++;
@@ -237,7 +245,6 @@ xc_attach(device_t dev) 
 	int error;
 	struct xc_softc *sc = (struct xc_softc *)device_get_softc(dev);
 
-
 	if (xen_start_info->flags & SIF_INITDOMAIN) {
 		xc_consdev.cn_putc = xccnputc_dom0;
 	} 
@@ -265,13 +272,13 @@ xc_attach(device_t dev) 
 				 VIRQ_CONSOLE,
 				 0,
 				 "console",
+				 NULL,
 				 xencons_priv_interrupt,
-					 NULL, INTR_TYPE_TTY, NULL);
+				 INTR_TYPE_TTY, NULL);
 		
 				KASSERT(error >= 0, ("can't register console interrupt"));
 	}
 
-
 	/* register handler to flush console on shutdown */
 	if ((EVENTHANDLER_REGISTER(shutdown_post_sync, xc_shutdown,
 				   NULL, SHUTDOWN_PRI_DEFAULT)) == NULL)
@@ -303,7 +310,11 @@ xencons_rx(char *buf, unsigned len)
 				HYPERVISOR_shared_info->evtchn_mask[0]);
 #endif
 	for (i = 0; i < len; i++) {
-		if (xen_console_up) 
+		if (xen_console_up
+#ifdef DDB
+			&& !kdb_active
+#endif
+			) 
 			(*linesw[tp->t_line]->l_rint)(buf[i], tp);
 		else
 			rbuf[RBUF_MASK(rp++)] = buf[i];
@@ -348,7 +359,7 @@ xencons_tx(void)
 	__xencons_tx_flush();
 }
 
-static int
+static void
 xencons_priv_interrupt(void *arg)
 {
 
@@ -359,7 +370,6 @@ xencons_priv_interrupt(void *arg)
 		xencons_rx(rbuf, l);
 
 	xencons_tx();
-	return (FILTER_HANDLED);
 }
 
 int
@@ -387,7 +397,7 @@ xcopen(struct cdev *dev, int flag, int m
 		tp->t_ispeed = tp->t_ospeed = TTYDEF_SPEED;
 		xcparam(tp, &tp->t_termios);
 		ttsetwater(tp);
-	} else if (tp->t_state & TS_XCLUDE && suser(td)) {
+	} else if (tp->t_state & TS_XCLUDE && priv_check(td, PRIV_TTY_EXCLUSIVE)) {
 		splx(s);
 		return (EBUSY);
 	}
@@ -558,12 +568,3 @@ xcons_force_flush(void)
 }
 
 DRIVER_MODULE(xc, nexus, xc_driver, xc_devclass, 0, 0);
-/*
- * Local variables:
- * mode: C
- * c-set-style: "BSD"
- * c-basic-offset: 8
- * tab-width: 4
- * indent-tabs-mode: t
- * End:
- */

Modified: user/dfr/xenhvm/7/sys/dev/xen/console/xencons_ring.c
==============================================================================
--- user/dfr/xenhvm/7/sys/dev/xen/console/xencons_ring.c	Mon Feb 16 17:43:45 2009	(r188686)
+++ user/dfr/xenhvm/7/sys/dev/xen/console/xencons_ring.c	Mon Feb 16 17:45:29 2009	(r188687)
@@ -13,19 +13,24 @@ __FBSDID("$FreeBSD$");
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/bus.h>
+#include <sys/cons.h>
+
 #include <machine/stdarg.h>
 #include <machine/xen/xen-os.h>
 #include <xen/hypervisor.h>
 #include <xen/xen_intr.h>
 #include <sys/cons.h>
 
+#include <xen/xen_intr.h>
+#include <xen/evtchn.h>
+#include <xen/interface/io/console.h>
 
 #include <dev/xen/console/xencons_ring.h>
 #include <xen/evtchn.h>
 #include <xen/interface/io/console.h>
 
-
 #define console_evtchn	console.domU.evtchn
+static unsigned int console_irq;
 extern char *console_page;
 extern struct mtx              cn_mtx;
 
@@ -60,7 +65,8 @@ xencons_ring_send(const char *data, unsi
 	sent = 0;
 
 	mb();
-	PANIC_IF((prod - cons) > sizeof(intf->out));
+	KASSERT((prod - cons) <= sizeof(intf->out),
+		("console send ring inconsistent"));
 	
 	while ((sent < len) && ((prod - cons) < sizeof(intf->out)))
 		intf->out[MASK_XENCONS_IDX(prod++, intf->out)] = data[sent++];
@@ -119,15 +125,18 @@ xencons_ring_init(void)
 		return 0;
 
 	err = bind_caller_port_to_irqhandler(xen_start_info->console_evtchn,
-					"xencons", xencons_handle_input, NULL,
-					INTR_TYPE_MISC | INTR_MPSAFE, NULL);
+		"xencons", xencons_handle_input, NULL,
+		INTR_TYPE_MISC | INTR_MPSAFE, &console_irq);
 	if (err) {
 		return err;
 	}
 
 	return 0;
 }
-#ifdef notyet
+
+extern void xencons_suspend(void);
+extern void xencons_resume(void);
+
 void 
 xencons_suspend(void)
 {
@@ -135,7 +144,7 @@ xencons_suspend(void)
 	if (!xen_start_info->console_evtchn)
 		return;
 
-	unbind_evtchn_from_irqhandler(xen_start_info->console_evtchn, NULL);
+	unbind_from_irqhandler(console_irq);
 }
 
 void 
@@ -144,7 +153,7 @@ xencons_resume(void)
 
 	(void)xencons_ring_init();
 }
-#endif
+
 /*
  * Local variables:
  * mode: C

Modified: user/dfr/xenhvm/7/sys/dev/xen/netfront/netfront.c
==============================================================================
--- user/dfr/xenhvm/7/sys/dev/xen/netfront/netfront.c	Mon Feb 16 17:43:45 2009	(r188686)
+++ user/dfr/xenhvm/7/sys/dev/xen/netfront/netfront.c	Mon Feb 16 17:45:29 2009	(r188687)
@@ -24,7 +24,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
-#include <sys/lock.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <sys/kernel.h>
@@ -64,18 +63,21 @@ __FBSDID("$FreeBSD$");
 #include <machine/intr_machdep.h>
 
 #include <machine/xen/xen-os.h>
+#include <machine/xen/xenfunc.h>
 #include <xen/hypervisor.h>
 #include <xen/xen_intr.h>
 #include <xen/evtchn.h>
 #include <xen/gnttab.h>
 #include <xen/interface/memory.h>
-#include <dev/xen/netfront/mbufq.h>
-#include <machine/xen/features.h>
 #include <xen/interface/io/netif.h>
 #include <xen/xenbus/xenbusvar.h>
 
+#include <dev/xen/netfront/mbufq.h>
+
 #include "xenbus_if.h"
 
+#define XN_CSUM_FEATURES	(CSUM_TCP | CSUM_UDP)
+
 #define GRANT_INVALID_REF	0
 
 #define NET_TX_RING_SIZE __RING_SIZE((netif_tx_sring_t *)0, PAGE_SIZE)
@@ -330,9 +332,12 @@ xennet_get_rx_ref(struct netfront_info *
     printf("[XEN] " fmt, ##args)
 #define WPRINTK(fmt, args...) \
     printf("[XEN] " fmt, ##args)
+#if 0
 #define DPRINTK(fmt, args...) \
     printf("[XEN] %s: " fmt, __func__, ##args)
-
+#else
+#define DPRINTK(fmt, args...)
+#endif
 
 static __inline struct mbuf* 
 makembuf (struct mbuf *buf)
@@ -352,7 +357,7 @@ makembuf (struct mbuf *buf)
 	m_copydata(buf, 0, buf->m_pkthdr.len, mtod(m,caddr_t) );
 
 	m->m_ext.ext_args = (caddr_t *)(uintptr_t)(vtophys(mtod(m,caddr_t)) >> PAGE_SHIFT);
-	
+
        	return m;
 }
 
@@ -490,11 +495,6 @@ talk_to_backend(device_t dev, struct net
 		message = "writing feature-rx-notify";
 		goto abort_transaction;
 	}
-	err = xenbus_printf(xbt, node, "feature-no-csum-offload", "%d", 1);
-	if (err) {
-		message = "writing feature-no-csum-offload";
-		goto abort_transaction;
-	}
 	err = xenbus_printf(xbt, node, "feature-sg", "%d", 1);
 	if (err) {
 		message = "writing feature-sg";
@@ -570,7 +570,7 @@ setup_device(device_t dev, struct netfro
 		goto fail;
 
 	error = bind_listening_port_to_irqhandler(xenbus_get_otherend_id(dev),
-	         "xn", xn_intr, info, INTR_TYPE_NET | INTR_MPSAFE, &info->irq);
+	    "xn", xn_intr, info, INTR_TYPE_NET | INTR_MPSAFE, &info->irq);
 
 	if (error) {
 		xenbus_dev_fatal(dev, error,
@@ -588,6 +588,24 @@ setup_device(device_t dev, struct netfro
 }
 
 /**
+ * If this interface has an ipv4 address, send an arp for it. This
+ * helps to get the network going again after migrating hosts.
+ */
+static void
+netfront_send_fake_arp(device_t dev, struct netfront_info *info)
+{
+	struct ifnet *ifp;
+	struct ifaddr *ifa;
+	
+	ifp = info->xn_ifp;
+	TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) {
+		if (ifa->ifa_addr->sa_family == AF_INET) {
+			arp_ifinit(ifp, ifa);
+		}
+	}
+}
+
+/**
  * Callback received when the backend's state changes.
  */
 static void
@@ -612,9 +630,7 @@ netfront_backend_changed(device_t dev, X
 		if (network_connect(sc) != 0)
 			break;
 		xenbus_set_state(dev, XenbusStateConnected);
-#ifdef notyet		
-		(void)send_fake_arp(netdev);
-#endif		
+		netfront_send_fake_arp(dev, sc);
 		break;
 	case XenbusStateClosing:
 		xenbus_set_state(dev, XenbusStateClosed);
@@ -1236,12 +1252,11 @@ xennet_get_responses(struct netfront_inf
 		gnttab_release_grant_reference(&np->gref_rx_head, ref);
 
 next:
-		if (m == NULL)
-			break;
-		
-		m->m_len = rx->status;
-		m->m_data += rx->offset;
-		m0->m_pkthdr.len += rx->status;
+		if (m != NULL) {
+				m->m_len = rx->status;
+				m->m_data += rx->offset;
+				m0->m_pkthdr.len += rx->status;
+		}
 		
 		if (!(rx->flags & NETRXF_more_data))
 			break;
@@ -1348,10 +1363,10 @@ xn_start_locked(struct ifnet *ifp) 
 		    mfn, GNTMAP_readonly);
 		tx->gref = sc->grant_tx_ref[id] = ref;
 		tx->size = new_m->m_pkthdr.len;
-#if 0
-		tx->flags = (skb->ip_summed == CHECKSUM_HW) ? NETTXF_csum_blank : 0;
-#endif
-		tx->flags = 0;
+		if (new_m->m_pkthdr.csum_flags & CSUM_DELAY_DATA)
+			tx->flags = NETTXF_csum_blank | NETTXF_data_validated;
+		else
+			tx->flags = 0;
 		new_m->m_next = NULL;
 		new_m->m_nextpkt = NULL;
 
@@ -1446,9 +1461,9 @@ xn_ioctl(struct ifnet *ifp, u_long cmd, 
 			if (!(ifp->if_drv_flags & IFF_DRV_RUNNING)) 
 				xn_ifinit_locked(sc);
 			arp_ifinit(ifp, ifa);
-			XN_UNLOCK(sc);
+			XN_UNLOCK(sc);	
 		} else {
-			XN_UNLOCK(sc);
+			XN_UNLOCK(sc);	
 			error = ether_ioctl(ifp, cmd, data);
 		}
 		break;
@@ -1716,11 +1731,9 @@ create_netdev(device_t dev)
     	ifp->if_mtu = ETHERMTU;
     	ifp->if_snd.ifq_maxlen = NET_TX_RING_SIZE - 1;
 	
-#ifdef notyet
     	ifp->if_hwassist = XN_CSUM_FEATURES;
     	ifp->if_capabilities = IFCAP_HWCSUM;
     	ifp->if_capenable = ifp->if_capabilities;
-#endif    
 	
     	ether_ifattach(ifp, np->mac);
     	callout_init(&np->xn_stat_ch, CALLOUT_MPSAFE);

From owner-svn-src-user@FreeBSD.ORG  Mon Feb 16 18:07:23 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8351F106566B;
	Mon, 16 Feb 2009 18:07:23 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 58DEA8FC15;
	Mon, 16 Feb 2009 18:07:23 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1GI7N4W077529;
	Mon, 16 Feb 2009 18:07:23 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1GI7NAr077528;
	Mon, 16 Feb 2009 18:07:23 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200902161807.n1GI7NAr077528@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Mon, 16 Feb 2009 18:07:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188689 - user/alc/pmap
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Feb 2009 18:07:23 -0000

Author: alc
Date: Mon Feb 16 18:07:23 2009
New Revision: 188689
URL: http://svn.freebsd.org/changeset/base/188689

Log:
  Add a directory for experimental pmap changes.

Added:
  user/alc/pmap/

From owner-svn-src-user@FreeBSD.ORG  Mon Feb 16 19:18:15 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2BCCB106566B;
	Mon, 16 Feb 2009 19:18:15 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 184728FC1B;
	Mon, 16 Feb 2009 19:18:15 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1GJIFhU085582;
	Mon, 16 Feb 2009 19:18:15 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1GJIEaF085569;
	Mon, 16 Feb 2009 19:18:14 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200902161918.n1GJIEaF085569@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Mon, 16 Feb 2009 19:18:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188695 - in user/alc/pmap/sys: . amd64/amd64 ddb kern
	security/mac vm
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Feb 2009 19:18:15 -0000

Author: alc
Date: Mon Feb 16 19:18:14 2009
New Revision: 188695
URL: http://svn.freebsd.org/changeset/base/188695

Log:
  Experimental locking changes to the pmap: Synchronize access to the page's
  pv list and dirty mask using the containing object's lock.

Added:
  user/alc/pmap/sys/
     - copied from r188693, head/sys/
Modified:
  user/alc/pmap/sys/amd64/amd64/pmap.c
  user/alc/pmap/sys/ddb/db_watch.c
  user/alc/pmap/sys/kern/kern_subr.c
  user/alc/pmap/sys/kern/uipc_shm.c
  user/alc/pmap/sys/kern/vfs_bio.c
  user/alc/pmap/sys/security/mac/mac_process.c
  user/alc/pmap/sys/vm/vm_fault.c
  user/alc/pmap/sys/vm/vm_map.c
  user/alc/pmap/sys/vm/vm_object.c
  user/alc/pmap/sys/vm/vm_object.h
  user/alc/pmap/sys/vm/vm_page.c
  user/alc/pmap/sys/vm/vm_pageout.c
  user/alc/pmap/sys/vm/vnode_pager.c

Modified: user/alc/pmap/sys/amd64/amd64/pmap.c
==============================================================================
--- head/sys/amd64/amd64/pmap.c	Mon Feb 16 18:59:18 2009	(r188693)
+++ user/alc/pmap/sys/amd64/amd64/pmap.c	Mon Feb 16 19:18:14 2009	(r188695)
@@ -252,10 +252,13 @@ static void pmap_insert_entry(pmap_t pma
 static boolean_t pmap_try_insert_pv_entry(pmap_t pmap, vm_offset_t va,
     vm_page_t m);
 
-static vm_page_t pmap_allocpde(pmap_t pmap, vm_offset_t va, int flags);
-static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags);
+static vm_page_t pmap_allocpde(pmap_t pmap, vm_offset_t va, vm_object_t object,
+    int flags);
+static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, vm_object_t object,
+    int flags);
 
-static vm_page_t _pmap_allocpte(pmap_t pmap, vm_pindex_t ptepindex, int flags);
+static vm_page_t _pmap_allocpte(pmap_t pmap, vm_pindex_t ptepindex,
+    vm_object_t object, int flags);
 static int _pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m,
                 vm_page_t* free);
 static int pmap_unuse_pt(pmap_t, vm_offset_t, pd_entry_t, vm_page_t *);
@@ -1452,7 +1455,8 @@ pmap_pinit(pmap_t pmap)
  * race conditions.
  */
 static vm_page_t
-_pmap_allocpte(pmap_t pmap, vm_pindex_t ptepindex, int flags)
+_pmap_allocpte(pmap_t pmap, vm_pindex_t ptepindex, vm_object_t object,
+    int flags)
 {
 	vm_page_t m, pdppg, pdpg;
 
@@ -1468,7 +1472,9 @@ _pmap_allocpte(pmap_t pmap, vm_pindex_t 
 		if (flags & M_WAITOK) {
 			PMAP_UNLOCK(pmap);
 			vm_page_unlock_queues();
+			vm_object_unlock_all(object);
 			VM_WAIT;
+			vm_object_lock_all(object);
 			vm_page_lock_queues();
 			PMAP_LOCK(pmap);
 		}
@@ -1512,7 +1518,7 @@ _pmap_allocpte(pmap_t pmap, vm_pindex_t 
 		if ((*pml4 & PG_V) == 0) {
 			/* Have to allocate a new pdp, recurse */
 			if (_pmap_allocpte(pmap, NUPDE + NUPDPE + pml4index,
-			    flags) == NULL) {
+			    object, flags) == NULL) {
 				--m->wire_count;
 				vm_page_free(m);
 				return (NULL);
@@ -1544,7 +1550,7 @@ _pmap_allocpte(pmap_t pmap, vm_pindex_t 
 		if ((*pml4 & PG_V) == 0) {
 			/* Have to allocate a new pd, recurse */
 			if (_pmap_allocpte(pmap, NUPDE + pdpindex,
-			    flags) == NULL) {
+			    object, flags) == NULL) {
 				--m->wire_count;
 				vm_page_free(m);
 				return (NULL);
@@ -1557,7 +1563,7 @@ _pmap_allocpte(pmap_t pmap, vm_pindex_t 
 			if ((*pdp & PG_V) == 0) {
 				/* Have to allocate a new pd, recurse */
 				if (_pmap_allocpte(pmap, NUPDE + pdpindex,
-				    flags) == NULL) {
+				    object, flags) == NULL) {
 					--m->wire_count;
 					vm_page_free(m);
 					return (NULL);
@@ -1579,7 +1585,7 @@ _pmap_allocpte(pmap_t pmap, vm_pindex_t 
 }
 
 static vm_page_t
-pmap_allocpde(pmap_t pmap, vm_offset_t va, int flags)
+pmap_allocpde(pmap_t pmap, vm_offset_t va, vm_object_t object, int flags)
 {
 	vm_pindex_t pdpindex, ptepindex;
 	pdp_entry_t *pdpe;
@@ -1598,7 +1604,7 @@ retry:
 		/* Allocate a pd page. */
 		ptepindex = pmap_pde_pindex(va);
 		pdpindex = ptepindex >> NPDPEPGSHIFT;
-		pdpg = _pmap_allocpte(pmap, NUPDE + pdpindex, flags);
+		pdpg = _pmap_allocpte(pmap, NUPDE + pdpindex, object, flags);
 		if (pdpg == NULL && (flags & M_WAITOK))
 			goto retry;
 	}
@@ -1606,7 +1612,7 @@ retry:
 }
 
 static vm_page_t
-pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags)
+pmap_allocpte(pmap_t pmap, vm_offset_t va, vm_object_t object, int flags)
 {
 	vm_pindex_t ptepindex;
 	pd_entry_t *pd;
@@ -1652,7 +1658,7 @@ retry:
 		 * Here if the pte page isn't mapped, or if it has been
 		 * deallocated.
 		 */
-		m = _pmap_allocpte(pmap, ptepindex, flags);
+		m = _pmap_allocpte(pmap, ptepindex, object, flags);
 		if (m == NULL && (flags & M_WAITOK))
 			goto retry;
 	}
@@ -1869,6 +1875,7 @@ pmap_collect(pmap_t locked_pmap, struct 
 	vm_offset_t va;
 	vm_page_t m, free;
 
+	mtx_assert(&vm_page_queue_mtx, MA_OWNED);	/* XXX */
 	TAILQ_FOREACH(m, &vpq->pl, pageq) {
 		if (m->hold_count || m->busy)
 			continue;
@@ -1920,11 +1927,10 @@ free_pv_entry(pmap_t pmap, pv_entry_t pv
 	struct pv_chunk *pc;
 	int idx, field, bit;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
 	PV_STAT(pv_entry_frees++);
 	PV_STAT(pv_entry_spare++);
-	pv_entry_count--;
+	atomic_subtract_int(&pv_entry_count, 1);
 	pc = pv_to_chunk(pv);
 	idx = pv - &pc->pc_pventry[0];
 	field = idx / 64;
@@ -1964,9 +1970,8 @@ get_pv_entry(pmap_t pmap, int try)
 	vm_page_t m;
 
 	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	PV_STAT(pv_entry_allocs++);
-	pv_entry_count++;
+	atomic_add_int(&pv_entry_count, 1);
 	if (pv_entry_count > pv_entry_high_water)
 		if (ratecheck(&lastprint, &printinterval))
 			printf("Approaching the limit on PV entries, consider "
@@ -2001,7 +2006,7 @@ retry:
 	    VM_ALLOC_WIRED);
 	if (m == NULL) {
 		if (try) {
-			pv_entry_count--;
+			atomic_subtract_int(&pv_entry_count, 1);
 			PV_STAT(pc_chunk_tryfail++);
 			return (NULL);
 		}
@@ -2047,7 +2052,6 @@ pmap_pvh_remove(struct md_page *pvh, pma
 {
 	pv_entry_t pv;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	TAILQ_FOREACH(pv, &pvh->pv_list, pv_list) {
 		if (pmap == PV_PMAP(pv) && va == pv->pv_va) {
 			TAILQ_REMOVE(&pvh->pv_list, pv, pv_list);
@@ -2070,7 +2074,6 @@ pmap_pv_demote_pde(pmap_t pmap, vm_offse
 	vm_offset_t va_last;
 	vm_page_t m;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	KASSERT((pa & PDRMASK) == 0,
 	    ("pmap_pv_demote_pde: pa is not 2mpage aligned"));
 
@@ -2083,6 +2086,7 @@ pmap_pv_demote_pde(pmap_t pmap, vm_offse
 	pv = pmap_pvh_remove(pvh, pmap, va);
 	KASSERT(pv != NULL, ("pmap_pv_demote_pde: pv not found"));
 	m = PHYS_TO_VM_PAGE(pa);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list);
 	/* Instantiate the remaining NPTEPG - 1 pv entries. */
 	va_last = va + NBPDR - PAGE_SIZE;
@@ -2108,7 +2112,6 @@ pmap_pv_promote_pde(pmap_t pmap, vm_offs
 	vm_offset_t va_last;
 	vm_page_t m;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	KASSERT((pa & PDRMASK) == 0,
 	    ("pmap_pv_promote_pde: pa is not 2mpage aligned"));
 
@@ -2121,6 +2124,7 @@ pmap_pv_promote_pde(pmap_t pmap, vm_offs
 	 */
 	m = PHYS_TO_VM_PAGE(pa);
 	va = trunc_2mpage(va);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	pv = pmap_pvh_remove(&m->md, pmap, va);
 	KASSERT(pv != NULL, ("pmap_pv_promote_pde: pv not found"));
 	pvh = pa_to_pvh(pa);
@@ -2130,6 +2134,7 @@ pmap_pv_promote_pde(pmap_t pmap, vm_offs
 	do {
 		m++;
 		va += PAGE_SIZE;
+		VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 		pmap_pvh_free(&m->md, pmap, va);
 	} while (va < va_last);
 }
@@ -2154,7 +2159,7 @@ pmap_remove_entry(pmap_t pmap, vm_page_t
 {
 	struct md_page *pvh;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	pmap_pvh_free(&m->md, pmap, va);
 	if (TAILQ_EMPTY(&m->md.pv_list)) {
 		pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
@@ -2172,8 +2177,7 @@ pmap_insert_entry(pmap_t pmap, vm_offset
 {
 	pv_entry_t pv;
 
-	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	pv = get_pv_entry(pmap, FALSE);
 	pv->pv_va = va;
 	TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list);
@@ -2187,8 +2191,7 @@ pmap_try_insert_pv_entry(pmap_t pmap, vm
 {
 	pv_entry_t pv;
 
-	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	if (pv_entry_count < pv_entry_high_water && 
 	    (pv = get_pv_entry(pmap, TRUE)) != NULL) {
 		pv->pv_va = va;
@@ -2207,7 +2210,6 @@ pmap_pv_insert_pde(pmap_t pmap, vm_offse
 	struct md_page *pvh;
 	pv_entry_t pv;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	if (pv_entry_count < pv_entry_high_water && 
 	    (pv = get_pv_entry(pmap, TRUE)) != NULL) {
 		pv->pv_va = va;
@@ -2601,7 +2603,7 @@ pmap_remove_all(vm_page_t m)
 
 	KASSERT((m->flags & PG_FICTITIOUS) == 0,
 	    ("pmap_remove_all: page %p is fictitious", m));
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
 	while ((pv = TAILQ_FIRST(&pvh->pv_list)) != NULL) {
 		va = pv->pv_va;
@@ -2969,7 +2971,7 @@ pmap_enter(pmap_t pmap, vm_offset_t va, 
 	 * resident, we are creating it here.
 	 */
 	if (va < VM_MAXUSER_ADDRESS) {
-		mpte = pmap_allocpte(pmap, va, M_WAITOK);
+		mpte = pmap_allocpte(pmap, va, m->object, M_WAITOK);
 	}
 
 	pde = pmap_pde(pmap, va);
@@ -3124,9 +3126,9 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t 
 	pd_entry_t *pde, newpde;
 	vm_page_t free, mpde;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
-	if ((mpde = pmap_allocpde(pmap, va, M_NOWAIT)) == NULL) {
+	if ((mpde = pmap_allocpde(pmap, va, NULL, M_NOWAIT)) == NULL) {
 		CTR2(KTR_PMAP, "pmap_enter_pde: failure for va %#lx"
 		    " in pmap %p", va, pmap);
 		return (FALSE);
@@ -3249,7 +3251,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_
 	KASSERT(va < kmi.clean_sva || va >= kmi.clean_eva ||
 	    (m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0,
 	    ("pmap_enter_quick_locked: managed mapping within the clean submap"));
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
 
 	/*
@@ -3283,7 +3285,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_
 				mpte->wire_count++;
 			} else {
 				mpte = _pmap_allocpte(pmap, ptepindex,
-				    M_NOWAIT);
+				    NULL, M_NOWAIT);
 				if (mpte == NULL)
 					return (mpte);
 			}
@@ -3412,7 +3414,7 @@ retry:
 		PMAP_LOCK(pmap);
 		for (va = addr; va < addr + size; va += NBPDR) {
 			while ((pdpg =
-			    pmap_allocpde(pmap, va, M_NOWAIT)) == NULL) {
+			    pmap_allocpde(pmap, va, NULL, M_NOWAIT)) == NULL) {
 				PMAP_UNLOCK(pmap);
 				vm_page_busy(p);
 				VM_OBJECT_UNLOCK(object);
@@ -3519,7 +3521,6 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pm
 	if (!pmap_is_current(src_pmap))
 		return;
 
-	vm_page_lock_queues();
 	if (dst_pmap < src_pmap) {
 		PMAP_LOCK(dst_pmap);
 		PMAP_LOCK(src_pmap);
@@ -3563,7 +3564,7 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pm
 			continue;
 			
 		if (srcptepaddr & PG_PS) {
-			dstmpde = pmap_allocpde(dst_pmap, addr, M_NOWAIT);
+			dstmpde = pmap_allocpde(dst_pmap, addr, NULL, M_NOWAIT);
 			if (dstmpde == NULL)
 				break;
 			pde = (pd_entry_t *)
@@ -3595,7 +3596,7 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pm
 			 * we only virtual copy managed pages
 			 */
 			if ((ptetemp & PG_MANAGED) != 0) {
-				dstmpte = pmap_allocpte(dst_pmap, addr,
+				dstmpte = pmap_allocpte(dst_pmap, addr, NULL,
 				    M_NOWAIT);
 				if (dstmpte == NULL)
 					break;
@@ -3629,7 +3630,6 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pm
 			src_pte++;
 		}
 	}
-	vm_page_unlock_queues();
 	PMAP_UNLOCK(src_pmap);
 	PMAP_UNLOCK(dst_pmap);
 }	
@@ -3709,7 +3709,7 @@ pmap_page_exists_quick(pmap_t pmap, vm_p
 	if (m->flags & PG_FICTITIOUS)
 		return FALSE;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) {
 		if (PV_PMAP(pv) == pmap) {
 			return TRUE;
@@ -3745,6 +3745,7 @@ pmap_page_wired_mappings(vm_page_t m)
 	count = 0;
 	if ((m->flags & PG_FICTITIOUS) != 0)
 		return (count);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	count = pmap_pvh_wired_mappings(&m->md, count);
 	return (pmap_pvh_wired_mappings(pa_to_pvh(VM_PAGE_TO_PHYS(m)), count));
 }
@@ -3761,7 +3762,6 @@ pmap_pvh_wired_mappings(struct md_page *
 	pt_entry_t *pte;
 	pv_entry_t pv;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	TAILQ_FOREACH(pv, &pvh->pv_list, pv_list) {
 		pmap = PV_PMAP(pv);
 		PMAP_LOCK(pmap);
@@ -3784,7 +3784,7 @@ pmap_page_is_mapped(vm_page_t m)
 
 	if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0)
 		return (FALSE);
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	if (TAILQ_EMPTY(&m->md.pv_list)) {
 		pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
 		return (!TAILQ_EMPTY(&pvh->pv_list));
@@ -3805,6 +3805,7 @@ pmap_remove_pages(pmap_t pmap)
 {
 	pd_entry_t *pde;
 	pt_entry_t *pte, tpte;
+	vm_object_t locked_object;
 	vm_page_t free = NULL;
 	vm_page_t m, mpte, mt;
 	pv_entry_t pv;
@@ -3819,6 +3820,8 @@ pmap_remove_pages(pmap_t pmap)
 		printf("warning: pmap_remove_pages called with non-current pmap\n");
 		return;
 	}
+	locked_object = NULL;
+restart:
 	vm_page_lock_queues();
 	PMAP_LOCK(pmap);
 	TAILQ_FOREACH_SAFE(pc, &pmap->pm_pvchunk, pc_list, npc) {
@@ -3865,6 +3868,18 @@ pmap_remove_pages(pmap_t pmap)
 				KASSERT(m < &vm_page_array[vm_page_array_size],
 					("pmap_remove_pages: bad tpte %#jx",
 					(uintmax_t)tpte));
+				if (m->object != locked_object) {
+					if (locked_object != NULL)
+						VM_OBJECT_UNLOCK(locked_object);
+					locked_object = m->object;
+					if (!VM_OBJECT_TRYLOCK(locked_object)) {
+						pmap_invalidate_all(pmap);
+						vm_page_unlock_queues();
+						PMAP_UNLOCK(pmap);
+						VM_OBJECT_LOCK(locked_object);
+						goto restart;
+					}
+				}
 
 				pte_clear(pte);
 
@@ -3882,7 +3897,7 @@ pmap_remove_pages(pmap_t pmap)
 				/* Mark free */
 				PV_STAT(pv_entry_frees++);
 				PV_STAT(pv_entry_spare++);
-				pv_entry_count--;
+				atomic_subtract_int(&pv_entry_count, 1);
 				pc->pc_map[field] |= bitmask;
 				if ((tpte & PG_PS) != 0) {
 					pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;
@@ -3916,6 +3931,10 @@ pmap_remove_pages(pmap_t pmap)
 				}
 			}
 		}
+		if (locked_object != NULL) {
+			VM_OBJECT_UNLOCK(locked_object);
+			locked_object = NULL;
+		}
 		if (allfree) {
 			PV_STAT(pv_entry_spare -= _NPCPV);
 			PV_STAT(pc_chunk_count--);
@@ -3945,6 +3964,7 @@ pmap_is_modified(vm_page_t m)
 
 	if (m->flags & PG_FICTITIOUS)
 		return (FALSE);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	if (pmap_is_modified_pvh(&m->md))
 		return (TRUE);
 	return (pmap_is_modified_pvh(pa_to_pvh(VM_PAGE_TO_PHYS(m))));
@@ -3963,7 +3983,6 @@ pmap_is_modified_pvh(struct md_page *pvh
 	pmap_t pmap;
 	boolean_t rv;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	rv = FALSE;
 	TAILQ_FOREACH(pv, &pvh->pv_list, pv_list) {
 		pmap = PV_PMAP(pv);
@@ -4017,7 +4036,7 @@ pmap_remove_write(vm_page_t m)
 	if ((m->flags & PG_FICTITIOUS) != 0 ||
 	    (m->flags & PG_WRITEABLE) == 0)
 		return;
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
 	TAILQ_FOREACH_SAFE(pv, &pvh->pv_list, pv_list, next_pv) {
 		va = pv->pv_va;
@@ -4075,7 +4094,7 @@ pmap_ts_referenced(vm_page_t m)
 
 	if (m->flags & PG_FICTITIOUS)
 		return (rtval);
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
 	TAILQ_FOREACH_SAFE(pv, &pvh->pv_list, pv_list, pvn) {
 		va = pv->pv_va;
@@ -4147,7 +4166,7 @@ pmap_clear_modify(vm_page_t m)
 
 	if ((m->flags & PG_FICTITIOUS) != 0)
 		return;
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
 	TAILQ_FOREACH_SAFE(pv, &pvh->pv_list, pv_list, next_pv) {
 		va = pv->pv_va;
@@ -4212,7 +4231,7 @@ pmap_clear_reference(vm_page_t m)
 
 	if ((m->flags & PG_FICTITIOUS) != 0)
 		return;
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
 	TAILQ_FOREACH_SAFE(pv, &pvh->pv_list, pv_list, next_pv) {
 		va = pv->pv_va;
@@ -4696,7 +4715,7 @@ pmap_mincore(pmap_t pmap, vm_offset_t ad
 			/*
 			 * Modified by someone else
 			 */
-			vm_page_lock_queues();
+			vm_page_lock_queues();	/* XXX */
 			if (m->dirty || pmap_is_modified(m))
 				val |= MINCORE_MODIFIED_OTHER;
 			vm_page_unlock_queues();
@@ -4710,7 +4729,7 @@ pmap_mincore(pmap_t pmap, vm_offset_t ad
 			/*
 			 * Referenced by someone else
 			 */
-			vm_page_lock_queues();
+			vm_page_lock_queues();	/* XXX */
 			if ((m->flags & PG_REFERENCED) ||
 			    pmap_ts_referenced(m)) {
 				val |= MINCORE_REFERENCED_OTHER;

Modified: user/alc/pmap/sys/ddb/db_watch.c
==============================================================================
--- head/sys/ddb/db_watch.c	Mon Feb 16 18:59:18 2009	(r188693)
+++ user/alc/pmap/sys/ddb/db_watch.c	Mon Feb 16 19:18:14 2009	(r188695)
@@ -238,7 +238,7 @@ db_set_watchpoints()
 	    for (watch = db_watchpoint_list;
 	         watch != 0;
 	         watch = watch->link)
-		pmap_protect(watch->map->pmap,
+		pmap_protect(watch->map->pmap,	/* XXX */
 			     trunc_page(watch->loaddr),
 			     round_page(watch->hiaddr),
 			     VM_PROT_READ);

Modified: user/alc/pmap/sys/kern/kern_subr.c
==============================================================================
--- head/sys/kern/kern_subr.c	Mon Feb 16 18:59:18 2009	(r188693)
+++ user/alc/pmap/sys/kern/kern_subr.c	Mon Feb 16 19:18:14 2009	(r188695)
@@ -116,8 +116,11 @@ retry:
 		 * object chain's first object, a physical page from a
 		 * backing object may be mapped read only.
 		 */
-		if (uobject->backing_object != NULL)
+		if (uobject->backing_object != NULL) {
+			vm_object_lock_all(uobject->backing_object);
 			pmap_remove(map->pmap, uaddr, uaddr + PAGE_SIZE);
+			vm_object_unlock_all(uobject->backing_object);
+		}
 		vm_page_lock_queues();
 	}
 	vm_page_insert(kern_pg, uobject, upindex);

Modified: user/alc/pmap/sys/kern/uipc_shm.c
==============================================================================
--- head/sys/kern/uipc_shm.c	Mon Feb 16 18:59:18 2009	(r188693)
+++ user/alc/pmap/sys/kern/uipc_shm.c	Mon Feb 16 19:18:14 2009	(r188695)
@@ -286,11 +286,9 @@ shm_dotruncate(struct shmfd *shmfd, off_
 			int size = PAGE_SIZE - base;
 
 			pmap_zero_page_area(m, base, size);
-			vm_page_lock_queues();
 			vm_page_set_validclean(m, base, size);
 			if (m->dirty != 0)
 				m->dirty = VM_PAGE_BITS_ALL;
-			vm_page_unlock_queues();
 		} else if ((length & PAGE_MASK) &&
 		    __predict_false(object->cache != NULL)) {
 			vm_page_cache_free(object, OFF_TO_IDX(length),

Modified: user/alc/pmap/sys/kern/vfs_bio.c
==============================================================================
--- head/sys/kern/vfs_bio.c	Mon Feb 16 18:59:18 2009	(r188693)
+++ user/alc/pmap/sys/kern/vfs_bio.c	Mon Feb 16 19:18:14 2009	(r188695)
@@ -2309,7 +2309,6 @@ vfs_setdirty_locked_object(struct buf *b
 		vm_offset_t boffset;
 		vm_offset_t eoffset;
 
-		vm_page_lock_queues();
 		/*
 		 * test the pages to see if they have been modified directly
 		 * by users through the VM system.
@@ -2335,7 +2334,6 @@ vfs_setdirty_locked_object(struct buf *b
 		}
 		eoffset = ((i + 1) << PAGE_SHIFT) - (bp->b_offset & PAGE_MASK);
 
-		vm_page_unlock_queues();
 		/*
 		 * Fit it to the buffer.
 		 */
@@ -3162,7 +3160,6 @@ bufdone_finish(struct buf *bp)
 		vm_object_t obj;
 		int iosize;
 		struct vnode *vp = bp->b_vp;
-		boolean_t are_queues_locked;
 
 		obj = bp->b_bufobj->bo_object;
 
@@ -3199,11 +3196,6 @@ bufdone_finish(struct buf *bp)
 		    !(bp->b_ioflags & BIO_ERROR)) {
 			bp->b_flags |= B_CACHE;
 		}
-		if (bp->b_iocmd == BIO_READ) {
-			vm_page_lock_queues();
-			are_queues_locked = TRUE;
-		} else
-			are_queues_locked = FALSE;
 		for (i = 0; i < bp->b_npages; i++) {
 			int bogusflag = 0;
 			int resid;
@@ -3272,8 +3264,6 @@ bufdone_finish(struct buf *bp)
 			foff = (foff + PAGE_SIZE) & ~(off_t)PAGE_MASK;
 			iosize -= resid;
 		}
-		if (are_queues_locked)
-			vm_page_unlock_queues();
 		vm_object_pip_wakeupn(obj, 0);
 		VM_OBJECT_UNLOCK(obj);
 	}
@@ -3341,7 +3331,6 @@ vfs_page_set_valid(struct buf *bp, vm_oo
 {
 	vm_ooffset_t soff, eoff;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	/*
 	 * Start and end offsets in buffer.  eoff - soff may not cross a
 	 * page boundry or cross the end of the buffer.  The end of the
@@ -3466,7 +3455,6 @@ vfs_clean_pages(struct buf *bp)
 	KASSERT(bp->b_offset != NOOFFSET,
 	    ("vfs_clean_pages: no buffer offset"));
 	VM_OBJECT_LOCK(bp->b_bufobj->bo_object);
-	vm_page_lock_queues();
 	for (i = 0; i < bp->b_npages; i++) {
 		m = bp->b_pages[i];
 		noff = (foff + PAGE_SIZE) & ~(off_t)PAGE_MASK;
@@ -3478,7 +3466,6 @@ vfs_clean_pages(struct buf *bp)
 		/* vm_page_clear_dirty(m, foff & PAGE_MASK, eoff - foff); */
 		foff = noff;
 	}
-	vm_page_unlock_queues();
 	VM_OBJECT_UNLOCK(bp->b_bufobj->bo_object);
 }
 
@@ -3509,7 +3496,6 @@ vfs_bio_set_validclean(struct buf *bp, i
 	n = PAGE_SIZE - (base & PAGE_MASK);
 
 	VM_OBJECT_LOCK(bp->b_bufobj->bo_object);
-	vm_page_lock_queues();
 	for (i = base / PAGE_SIZE; size > 0 && i < bp->b_npages; ++i) {
 		m = bp->b_pages[i];
 		if (n > size)
@@ -3519,7 +3505,6 @@ vfs_bio_set_validclean(struct buf *bp, i
 		size -= n;
 		n = PAGE_SIZE;
 	}
-	vm_page_unlock_queues();
 	VM_OBJECT_UNLOCK(bp->b_bufobj->bo_object);
 }
 

Modified: user/alc/pmap/sys/security/mac/mac_process.c
==============================================================================
--- head/sys/security/mac/mac_process.c	Mon Feb 16 18:59:18 2009	(r188693)
+++ user/alc/pmap/sys/security/mac/mac_process.c	Mon Feb 16 19:18:14 2009	(r188695)
@@ -364,8 +364,10 @@ mac_proc_vm_revoke_recurse(struct thread
 				vme->max_protection = 0;
 				vme->protection = 0;
 			}
+			vm_object_lock_all(vme->object.vm_object);
 			pmap_protect(map->pmap, vme->start, vme->end,
 			    vme->protection & ~revokeperms);
+			vm_object_unlock_all(vme->object.vm_object);
 			vm_map_simplify_entry(map, vme);
 		}
 		VFS_UNLOCK_GIANT(vfslocked);

Modified: user/alc/pmap/sys/vm/vm_fault.c
==============================================================================
--- head/sys/vm/vm_fault.c	Mon Feb 16 18:59:18 2009	(r188693)
+++ user/alc/pmap/sys/vm/vm_fault.c	Mon Feb 16 19:18:14 2009	(r188695)
@@ -919,7 +919,7 @@ vnode_locked:
 		vm_page_zero_invalid(fs.m, TRUE);
 		printf("Warning: page %p partially invalid on fault\n", fs.m);
 	}
-	VM_OBJECT_UNLOCK(fs.object);
+	vm_object_lock_all(fs.object->backing_object);
 
 	/*
 	 * Put this page into the physical map.  We had to do the unlock above
@@ -928,6 +928,7 @@ vnode_locked:
 	 * won't find it (yet).
 	 */
 	pmap_enter(fs.map->pmap, vaddr, fault_type, fs.m, prot, wired);
+	vm_object_unlock_all(fs.object);
 	if (((fault_flags & VM_FAULT_WIRE_MASK) == 0) && (wired == 0)) {
 		vm_fault_prefault(fs.map->pmap, vaddr, fs.entry);
 	}
@@ -1024,12 +1025,8 @@ vm_fault_prefault(pmap_t pmap, vm_offset
 		}
 		if (((m->valid & VM_PAGE_BITS_ALL) == VM_PAGE_BITS_ALL) &&
 			(m->busy == 0) &&
-		    (m->flags & PG_FICTITIOUS) == 0) {
-
-			vm_page_lock_queues();
+		    (m->flags & PG_FICTITIOUS) == 0)
 			pmap_enter_quick(pmap, addr, m, entry->protection);
-			vm_page_unlock_queues();
-		}
 		VM_OBJECT_UNLOCK(lobject);
 	}
 }

Modified: user/alc/pmap/sys/vm/vm_map.c
==============================================================================
--- head/sys/vm/vm_map.c	Mon Feb 16 18:59:18 2009	(r188693)
+++ user/alc/pmap/sys/vm/vm_map.c	Mon Feb 16 19:18:14 2009	(r188695)
@@ -1576,7 +1576,6 @@ vm_map_pmap_enter(vm_map_t map, vm_offse
 	vm_offset_t start;
 	vm_page_t p, p_start;
 	vm_pindex_t psize, tmpidx;
-	boolean_t are_queues_locked;
 
 	if ((prot & (VM_PROT_READ | VM_PROT_EXECUTE)) == 0 || object == NULL)
 		return;
@@ -1600,7 +1599,6 @@ vm_map_pmap_enter(vm_map_t map, vm_offse
 		psize = object->size - pindex;
 	}
 
-	are_queues_locked = FALSE;
 	start = 0;
 	p_start = NULL;
 
@@ -1635,25 +1633,15 @@ vm_map_pmap_enter(vm_map_t map, vm_offse
 				p_start = p;
 			}
 		} else if (p_start != NULL) {
-			if (!are_queues_locked) {
-				are_queues_locked = TRUE;
-				vm_page_lock_queues();
-			}
 			pmap_enter_object(map->pmap, start, addr +
 			    ptoa(tmpidx), p_start, prot);
 			p_start = NULL;
 		}
 	}
 	if (p_start != NULL) {
-		if (!are_queues_locked) {
-			are_queues_locked = TRUE;
-			vm_page_lock_queues();
-		}
 		pmap_enter_object(map->pmap, start, addr + ptoa(psize),
 		    p_start, prot);
 	}
-	if (are_queues_locked)
-		vm_page_unlock_queues();
 unlock_return:
 	VM_OBJECT_UNLOCK(object);
 }
@@ -1722,12 +1710,15 @@ vm_map_protect(vm_map_t map, vm_offset_t
 		 * here.
 		 */
 		if (current->protection != old_prot) {
+			vm_object_lock_all(current->object.vm_object);
+
 #define MASK(entry)	(((entry)->eflags & MAP_ENTRY_COW) ? ~VM_PROT_WRITE : \
 							VM_PROT_ALL)
 			pmap_protect(map->pmap, current->start,
 			    current->end,
 			    current->protection & MASK(current));
 #undef	MASK
+			vm_object_unlock_all(current->object.vm_object);
 		}
 		vm_map_simplify_entry(map, current);
 		current = current->next;
@@ -2335,9 +2326,6 @@ vm_map_sync(
 		}
 	}
 
-	if (invalidate)
-		pmap_remove(map->pmap, start, end);
-
 	/*
 	 * Make a second pass, cleaning/uncaching pages from the indicated
 	 * objects as we go.
@@ -2362,6 +2350,11 @@ vm_map_sync(
 		} else {
 			object = current->object.vm_object;
 		}
+		if (invalidate) {
+			vm_object_lock_all(object);
+			pmap_remove(map->pmap, start, start + size);
+			vm_object_unlock_all(object);
+		}
 		vm_object_reference(object);
 		last_timestamp = map->timestamp;
 		vm_map_unlock_read(map);
@@ -2524,7 +2517,12 @@ vm_map_delete(vm_map_t map, vm_offset_t 
 			vm_map_entry_unwire(map, entry);
 		}
 
-		pmap_remove(map->pmap, entry->start, entry->end);
+		if ((entry->eflags & MAP_ENTRY_IS_SUB_MAP) == 0) {
+			vm_object_lock_all(entry->object.vm_object);
+			pmap_remove(map->pmap, entry->start, entry->end);
+			vm_object_unlock_all(entry->object.vm_object);
+		} else
+			panic("vm_map_delete: submap");	/* XXX */
 
 		/*
 		 * Delete the entry (which may delete the object) only after
@@ -2631,10 +2629,14 @@ vm_map_copy_entry(
 		 * write-protected.
 		 */
 		if ((src_entry->eflags & MAP_ENTRY_NEEDS_COPY) == 0) {
+			vm_object_lock_all(src_entry->object.vm_object);
+
 			pmap_protect(src_map->pmap,
 			    src_entry->start,
 			    src_entry->end,
 			    src_entry->protection & ~VM_PROT_WRITE);
+
+			vm_object_unlock_all(src_entry->object.vm_object);
 		}
 
 		/*
@@ -2663,8 +2665,10 @@ vm_map_copy_entry(
 			dst_entry->offset = 0;
 		}
 
+		vm_object_lock_all(dst_entry->object.vm_object);
 		pmap_copy(dst_map->pmap, src_map->pmap, dst_entry->start,
 		    dst_entry->end - dst_entry->start, src_entry->start);
+		vm_object_unlock_all(dst_entry->object.vm_object);
 	} else {
 		/*
 		 * Of course, wired down pages can't be set copy-on-write.
@@ -2808,10 +2812,12 @@ vmspace_fork(struct vmspace *vm1)
 			/*
 			 * Update the physical map
 			 */
+			vm_object_lock_all(new_entry->object.vm_object);
 			pmap_copy(new_map->pmap, old_map->pmap,
 			    new_entry->start,
 			    (old_entry->end - old_entry->start),
 			    old_entry->start);
+			vm_object_unlock_all(new_entry->object.vm_object);
 			break;
 
 		case VM_INHERIT_COPY:

Modified: user/alc/pmap/sys/vm/vm_object.c
==============================================================================
--- head/sys/vm/vm_object.c	Mon Feb 16 18:59:18 2009	(r188693)
+++ user/alc/pmap/sys/vm/vm_object.c	Mon Feb 16 19:18:14 2009	(r188695)
@@ -2010,6 +2010,32 @@ vm_object_coalesce(vm_object_t prev_obje
 	return (TRUE);
 }
 
+/*
+ *
+ */
+void
+vm_object_lock_all(vm_object_t object)
+{
+
+	while (object != NULL) {
+		VM_OBJECT_LOCK(object);
+		object = object->backing_object;
+	}
+}
+
+/*
+ *
+ */
+void
+vm_object_unlock_all(vm_object_t object)
+{
+
+	while (object != NULL) {
+		VM_OBJECT_UNLOCK(object);
+		object = object->backing_object;
+	}
+}
+
 void
 vm_object_set_writeable_dirty(vm_object_t object)
 {

Modified: user/alc/pmap/sys/vm/vm_object.h
==============================================================================
--- head/sys/vm/vm_object.h	Mon Feb 16 18:59:18 2009	(r188693)
+++ user/alc/pmap/sys/vm/vm_object.h	Mon Feb 16 19:18:14 2009	(r188695)
@@ -205,6 +205,7 @@ void vm_object_destroy (vm_object_t);
 void vm_object_terminate (vm_object_t);
 void vm_object_set_writeable_dirty (vm_object_t);
 void vm_object_init (void);
+void vm_object_lock_all(vm_object_t);
 void vm_object_page_clean (vm_object_t, vm_pindex_t, vm_pindex_t, boolean_t);
 void vm_object_page_remove (vm_object_t, vm_pindex_t, vm_pindex_t, boolean_t);
 void vm_object_reference (vm_object_t);
@@ -213,6 +214,7 @@ void vm_object_shadow (vm_object_t *, vm
 void vm_object_split(vm_map_entry_t);
 void vm_object_sync(vm_object_t, vm_ooffset_t, vm_size_t, boolean_t,
     boolean_t);
+void vm_object_unlock_all(vm_object_t);
 void vm_object_madvise (vm_object_t, vm_pindex_t, int, int);
 #endif				/* _KERNEL */
 

Modified: user/alc/pmap/sys/vm/vm_page.c
==============================================================================
--- head/sys/vm/vm_page.c	Mon Feb 16 18:59:18 2009	(r188693)
+++ user/alc/pmap/sys/vm/vm_page.c	Mon Feb 16 19:18:14 2009	(r188695)
@@ -566,6 +566,8 @@ vm_page_sleep(vm_page_t m, const char *m
 void
 vm_page_dirty(vm_page_t m)
 {
+
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	KASSERT((m->flags & PG_CACHED) == 0,
 	    ("vm_page_dirty: page in cache!"));
 	KASSERT(!VM_PAGE_IS_FREE(m),
@@ -1594,7 +1596,7 @@ vm_page_try_to_free(vm_page_t m)
 	    (m->oflags & VPO_BUSY) || (m->flags & PG_UNMANAGED)) {
 		return (0);
 	}
-	pmap_remove_all(m);
+	pmap_remove_all(m);	/* XXX */
 	if (m->dirty)
 		return (0);
 	vm_page_free(m);
@@ -1741,6 +1743,7 @@ vm_page_dontneed(vm_page_t m)
 	int head;
 
 	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	dnw = ++dnweight;
 
 	/*
@@ -1870,7 +1873,6 @@ vm_page_set_validclean(vm_page_t m, int 
 	int frag;
 	int endoff;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	if (size == 0)	/* handle degenerate case */
 		return;
@@ -1929,6 +1931,7 @@ void
 vm_page_clear_dirty(vm_page_t m, int base, int size)
 {
 
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);	/* XXX */
 	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	m->dirty &= ~vm_page_bits(base, size);
 }
@@ -2028,6 +2031,8 @@ vm_page_is_valid(vm_page_t m, int base, 
 void
 vm_page_test_dirty(vm_page_t m)
 {
+
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	if ((m->dirty != VM_PAGE_BITS_ALL) && pmap_is_modified(m)) {
 		vm_page_dirty(m);
 	}
@@ -2118,6 +2123,7 @@ vm_page_cowsetup(vm_page_t m)
 {
 
 	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);	/* XXX */
 	if (m->cow == USHRT_MAX - 1)
 		return (EBUSY);
 	m->cow++;

Modified: user/alc/pmap/sys/vm/vm_pageout.c
==============================================================================
--- head/sys/vm/vm_pageout.c	Mon Feb 16 18:59:18 2009	(r188693)
+++ user/alc/pmap/sys/vm/vm_pageout.c	Mon Feb 16 19:18:14 2009	(r188695)
@@ -664,8 +664,7 @@ vm_pageout_map_deactivate_pages(map, des
 	 * table pages.
 	 */
 	if (desired == 0 && nothingwired) {
-		pmap_remove(vm_map_pmap(map), vm_map_min(map),
-		    vm_map_max(map));
+		pmap_remove_pages(vm_map_pmap(map));
 	}
 	vm_map_unlock(map);
 }

Modified: user/alc/pmap/sys/vm/vnode_pager.c
==============================================================================
--- head/sys/vm/vnode_pager.c	Mon Feb 16 18:59:18 2009	(r188693)
+++ user/alc/pmap/sys/vm/vnode_pager.c	Mon Feb 16 19:18:14 2009	(r188695)
@@ -415,11 +415,9 @@ vnode_pager_setsize(vp, nsize)
 			 * bits.  This would prevent bogus_page
 			 * replacement from working properly.
 			 */
-			vm_page_lock_queues();
 			vm_page_set_validclean(m, base, size);
 			if (m->dirty != 0)
 				m->dirty = VM_PAGE_BITS_ALL;
-			vm_page_unlock_queues();
 		} else if ((nsize & PAGE_MASK) &&
 		    __predict_false(object->cache != NULL)) {
 			vm_page_cache_free(object, OFF_TO_IDX(nsize),
@@ -545,23 +543,19 @@ vnode_pager_input_smlfs(object, m)
 				break;
 
 			VM_OBJECT_LOCK(object);
-			vm_page_lock_queues();
 			vm_page_set_validclean(m, (i * bsize) & PAGE_MASK, bsize);
-			vm_page_unlock_queues();
 			VM_OBJECT_UNLOCK(object);
 		} else {
 			VM_OBJECT_LOCK(object);
-			vm_page_lock_queues();
 			vm_page_set_validclean(m, (i * bsize) & PAGE_MASK, bsize);
-			vm_page_unlock_queues();
 			VM_OBJECT_UNLOCK(object);
 			bzero((caddr_t)sf_buf_kva(sf) + i * bsize, bsize);
 		}
 	}
 	sf_buf_free(sf);
-	vm_page_lock_queues();
+	VM_OBJECT_LOCK(object);
 	pmap_clear_modify(m);
-	vm_page_unlock_queues();
+	VM_OBJECT_UNLOCK(object);
 	if (error) {
 		return VM_PAGER_ERROR;
 	}
@@ -630,10 +624,8 @@ vnode_pager_input_old(object, m)
 
 		VM_OBJECT_LOCK(object);
 	}
-	vm_page_lock_queues();
 	pmap_clear_modify(m);
 	vm_page_undirty(m);
-	vm_page_unlock_queues();
 	if (!error)
 		m->valid = VM_PAGE_BITS_ALL;
 	return error ? VM_PAGER_ERROR : VM_PAGER_OK;

From owner-svn-src-user@FreeBSD.ORG  Tue Feb 17 03:06:40 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D5E03106566B;
	Tue, 17 Feb 2009 03:06:40 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AB61E8FC12;
	Tue, 17 Feb 2009 03:06:40 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1H36e2q001739;
	Tue, 17 Feb 2009 03:06:40 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1H36eGI001738;
	Tue, 17 Feb 2009 03:06:40 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200902170306.n1H36eGI001738@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Tue, 17 Feb 2009 03:06:40 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188702 - in user/alc/pagelock: . sys
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Feb 2009 03:06:41 -0000

Author: alc
Date: Tue Feb 17 03:06:40 2009
New Revision: 188702
URL: http://svn.freebsd.org/changeset/base/188702

Log:
  Sandbox for experimental locking changes

Added:
  user/alc/pagelock/
  user/alc/pagelock/sys/
     - copied from r188701, head/sys/

From owner-svn-src-user@FreeBSD.ORG  Tue Feb 17 03:58:16 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7320A106567A;
	Tue, 17 Feb 2009 03:58:16 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6013E8FC23;
	Tue, 17 Feb 2009 03:58:16 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1H3wG67002800;
	Tue, 17 Feb 2009 03:58:16 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1H3wFS5002787;
	Tue, 17 Feb 2009 03:58:15 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200902170358.n1H3wFS5002787@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Tue, 17 Feb 2009 03:58:15 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188703 - in user/alc/pagelock/sys: amd64/amd64 ddb
	kern security/mac vm
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Feb 2009 03:58:17 -0000

Author: alc
Date: Tue Feb 17 03:58:15 2009
New Revision: 188703
URL: http://svn.freebsd.org/changeset/base/188703

Log:
  Experimental pmap locking changes

Modified:
  user/alc/pagelock/sys/amd64/amd64/pmap.c
  user/alc/pagelock/sys/ddb/db_watch.c
  user/alc/pagelock/sys/kern/kern_subr.c
  user/alc/pagelock/sys/kern/uipc_shm.c
  user/alc/pagelock/sys/kern/vfs_bio.c
  user/alc/pagelock/sys/security/mac/mac_process.c
  user/alc/pagelock/sys/vm/vm_fault.c
  user/alc/pagelock/sys/vm/vm_map.c
  user/alc/pagelock/sys/vm/vm_object.c
  user/alc/pagelock/sys/vm/vm_object.h
  user/alc/pagelock/sys/vm/vm_page.c
  user/alc/pagelock/sys/vm/vm_pageout.c
  user/alc/pagelock/sys/vm/vnode_pager.c

Modified: user/alc/pagelock/sys/amd64/amd64/pmap.c
==============================================================================
--- user/alc/pagelock/sys/amd64/amd64/pmap.c	Tue Feb 17 03:06:40 2009	(r188702)
+++ user/alc/pagelock/sys/amd64/amd64/pmap.c	Tue Feb 17 03:58:15 2009	(r188703)
@@ -252,10 +252,13 @@ static void pmap_insert_entry(pmap_t pma
 static boolean_t pmap_try_insert_pv_entry(pmap_t pmap, vm_offset_t va,
     vm_page_t m);
 
-static vm_page_t pmap_allocpde(pmap_t pmap, vm_offset_t va, int flags);
-static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags);
+static vm_page_t pmap_allocpde(pmap_t pmap, vm_offset_t va, vm_object_t object,
+    int flags);
+static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va, vm_object_t object,
+    int flags);
 
-static vm_page_t _pmap_allocpte(pmap_t pmap, vm_pindex_t ptepindex, int flags);
+static vm_page_t _pmap_allocpte(pmap_t pmap, vm_pindex_t ptepindex,
+    vm_object_t object, int flags);
 static int _pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m,
                 vm_page_t* free);
 static int pmap_unuse_pt(pmap_t, vm_offset_t, pd_entry_t, vm_page_t *);
@@ -1452,7 +1455,8 @@ pmap_pinit(pmap_t pmap)
  * race conditions.
  */
 static vm_page_t
-_pmap_allocpte(pmap_t pmap, vm_pindex_t ptepindex, int flags)
+_pmap_allocpte(pmap_t pmap, vm_pindex_t ptepindex, vm_object_t object,
+    int flags)
 {
 	vm_page_t m, pdppg, pdpg;
 
@@ -1468,7 +1472,9 @@ _pmap_allocpte(pmap_t pmap, vm_pindex_t 
 		if (flags & M_WAITOK) {
 			PMAP_UNLOCK(pmap);
 			vm_page_unlock_queues();
+			vm_object_unlock_all(object);
 			VM_WAIT;
+			vm_object_lock_all(object);
 			vm_page_lock_queues();
 			PMAP_LOCK(pmap);
 		}
@@ -1512,7 +1518,7 @@ _pmap_allocpte(pmap_t pmap, vm_pindex_t 
 		if ((*pml4 & PG_V) == 0) {
 			/* Have to allocate a new pdp, recurse */
 			if (_pmap_allocpte(pmap, NUPDE + NUPDPE + pml4index,
-			    flags) == NULL) {
+			    object, flags) == NULL) {
 				--m->wire_count;
 				vm_page_free(m);
 				return (NULL);
@@ -1544,7 +1550,7 @@ _pmap_allocpte(pmap_t pmap, vm_pindex_t 
 		if ((*pml4 & PG_V) == 0) {
 			/* Have to allocate a new pd, recurse */
 			if (_pmap_allocpte(pmap, NUPDE + pdpindex,
-			    flags) == NULL) {
+			    object, flags) == NULL) {
 				--m->wire_count;
 				vm_page_free(m);
 				return (NULL);
@@ -1557,7 +1563,7 @@ _pmap_allocpte(pmap_t pmap, vm_pindex_t 
 			if ((*pdp & PG_V) == 0) {
 				/* Have to allocate a new pd, recurse */
 				if (_pmap_allocpte(pmap, NUPDE + pdpindex,
-				    flags) == NULL) {
+				    object, flags) == NULL) {
 					--m->wire_count;
 					vm_page_free(m);
 					return (NULL);
@@ -1579,7 +1585,7 @@ _pmap_allocpte(pmap_t pmap, vm_pindex_t 
 }
 
 static vm_page_t
-pmap_allocpde(pmap_t pmap, vm_offset_t va, int flags)
+pmap_allocpde(pmap_t pmap, vm_offset_t va, vm_object_t object, int flags)
 {
 	vm_pindex_t pdpindex, ptepindex;
 	pdp_entry_t *pdpe;
@@ -1598,7 +1604,7 @@ retry:
 		/* Allocate a pd page. */
 		ptepindex = pmap_pde_pindex(va);
 		pdpindex = ptepindex >> NPDPEPGSHIFT;
-		pdpg = _pmap_allocpte(pmap, NUPDE + pdpindex, flags);
+		pdpg = _pmap_allocpte(pmap, NUPDE + pdpindex, object, flags);
 		if (pdpg == NULL && (flags & M_WAITOK))
 			goto retry;
 	}
@@ -1606,7 +1612,7 @@ retry:
 }
 
 static vm_page_t
-pmap_allocpte(pmap_t pmap, vm_offset_t va, int flags)
+pmap_allocpte(pmap_t pmap, vm_offset_t va, vm_object_t object, int flags)
 {
 	vm_pindex_t ptepindex;
 	pd_entry_t *pd;
@@ -1652,7 +1658,7 @@ retry:
 		 * Here if the pte page isn't mapped, or if it has been
 		 * deallocated.
 		 */
-		m = _pmap_allocpte(pmap, ptepindex, flags);
+		m = _pmap_allocpte(pmap, ptepindex, object, flags);
 		if (m == NULL && (flags & M_WAITOK))
 			goto retry;
 	}
@@ -1869,6 +1875,7 @@ pmap_collect(pmap_t locked_pmap, struct 
 	vm_offset_t va;
 	vm_page_t m, free;
 
+	mtx_assert(&vm_page_queue_mtx, MA_OWNED);	/* XXX */
 	TAILQ_FOREACH(m, &vpq->pl, pageq) {
 		if (m->hold_count || m->busy)
 			continue;
@@ -1920,11 +1927,10 @@ free_pv_entry(pmap_t pmap, pv_entry_t pv
 	struct pv_chunk *pc;
 	int idx, field, bit;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
 	PV_STAT(pv_entry_frees++);
 	PV_STAT(pv_entry_spare++);
-	pv_entry_count--;
+	atomic_subtract_int(&pv_entry_count, 1);
 	pc = pv_to_chunk(pv);
 	idx = pv - &pc->pc_pventry[0];
 	field = idx / 64;
@@ -1964,9 +1970,8 @@ get_pv_entry(pmap_t pmap, int try)
 	vm_page_t m;
 
 	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	PV_STAT(pv_entry_allocs++);
-	pv_entry_count++;
+	atomic_add_int(&pv_entry_count, 1);
 	if (pv_entry_count > pv_entry_high_water)
 		if (ratecheck(&lastprint, &printinterval))
 			printf("Approaching the limit on PV entries, consider "
@@ -2001,7 +2006,7 @@ retry:
 	    VM_ALLOC_WIRED);
 	if (m == NULL) {
 		if (try) {
-			pv_entry_count--;
+			atomic_subtract_int(&pv_entry_count, 1);
 			PV_STAT(pc_chunk_tryfail++);
 			return (NULL);
 		}
@@ -2047,7 +2052,6 @@ pmap_pvh_remove(struct md_page *pvh, pma
 {
 	pv_entry_t pv;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	TAILQ_FOREACH(pv, &pvh->pv_list, pv_list) {
 		if (pmap == PV_PMAP(pv) && va == pv->pv_va) {
 			TAILQ_REMOVE(&pvh->pv_list, pv, pv_list);
@@ -2070,7 +2074,6 @@ pmap_pv_demote_pde(pmap_t pmap, vm_offse
 	vm_offset_t va_last;
 	vm_page_t m;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	KASSERT((pa & PDRMASK) == 0,
 	    ("pmap_pv_demote_pde: pa is not 2mpage aligned"));
 
@@ -2083,6 +2086,7 @@ pmap_pv_demote_pde(pmap_t pmap, vm_offse
 	pv = pmap_pvh_remove(pvh, pmap, va);
 	KASSERT(pv != NULL, ("pmap_pv_demote_pde: pv not found"));
 	m = PHYS_TO_VM_PAGE(pa);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list);
 	/* Instantiate the remaining NPTEPG - 1 pv entries. */
 	va_last = va + NBPDR - PAGE_SIZE;
@@ -2108,7 +2112,6 @@ pmap_pv_promote_pde(pmap_t pmap, vm_offs
 	vm_offset_t va_last;
 	vm_page_t m;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	KASSERT((pa & PDRMASK) == 0,
 	    ("pmap_pv_promote_pde: pa is not 2mpage aligned"));
 
@@ -2121,6 +2124,7 @@ pmap_pv_promote_pde(pmap_t pmap, vm_offs
 	 */
 	m = PHYS_TO_VM_PAGE(pa);
 	va = trunc_2mpage(va);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	pv = pmap_pvh_remove(&m->md, pmap, va);
 	KASSERT(pv != NULL, ("pmap_pv_promote_pde: pv not found"));
 	pvh = pa_to_pvh(pa);
@@ -2130,6 +2134,7 @@ pmap_pv_promote_pde(pmap_t pmap, vm_offs
 	do {
 		m++;
 		va += PAGE_SIZE;
+		VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 		pmap_pvh_free(&m->md, pmap, va);
 	} while (va < va_last);
 }
@@ -2154,7 +2159,7 @@ pmap_remove_entry(pmap_t pmap, vm_page_t
 {
 	struct md_page *pvh;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	pmap_pvh_free(&m->md, pmap, va);
 	if (TAILQ_EMPTY(&m->md.pv_list)) {
 		pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
@@ -2172,8 +2177,7 @@ pmap_insert_entry(pmap_t pmap, vm_offset
 {
 	pv_entry_t pv;
 
-	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	pv = get_pv_entry(pmap, FALSE);
 	pv->pv_va = va;
 	TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list);
@@ -2187,8 +2191,7 @@ pmap_try_insert_pv_entry(pmap_t pmap, vm
 {
 	pv_entry_t pv;
 
-	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	if (pv_entry_count < pv_entry_high_water && 
 	    (pv = get_pv_entry(pmap, TRUE)) != NULL) {
 		pv->pv_va = va;
@@ -2207,7 +2210,6 @@ pmap_pv_insert_pde(pmap_t pmap, vm_offse
 	struct md_page *pvh;
 	pv_entry_t pv;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	if (pv_entry_count < pv_entry_high_water && 
 	    (pv = get_pv_entry(pmap, TRUE)) != NULL) {
 		pv->pv_va = va;
@@ -2601,7 +2603,7 @@ pmap_remove_all(vm_page_t m)
 
 	KASSERT((m->flags & PG_FICTITIOUS) == 0,
 	    ("pmap_remove_all: page %p is fictitious", m));
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
 	while ((pv = TAILQ_FIRST(&pvh->pv_list)) != NULL) {
 		va = pv->pv_va;
@@ -2969,7 +2971,7 @@ pmap_enter(pmap_t pmap, vm_offset_t va, 
 	 * resident, we are creating it here.
 	 */
 	if (va < VM_MAXUSER_ADDRESS) {
-		mpte = pmap_allocpte(pmap, va, M_WAITOK);
+		mpte = pmap_allocpte(pmap, va, m->object, M_WAITOK);
 	}
 
 	pde = pmap_pde(pmap, va);
@@ -3124,9 +3126,9 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t 
 	pd_entry_t *pde, newpde;
 	vm_page_t free, mpde;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
-	if ((mpde = pmap_allocpde(pmap, va, M_NOWAIT)) == NULL) {
+	if ((mpde = pmap_allocpde(pmap, va, NULL, M_NOWAIT)) == NULL) {
 		CTR2(KTR_PMAP, "pmap_enter_pde: failure for va %#lx"
 		    " in pmap %p", va, pmap);
 		return (FALSE);
@@ -3249,7 +3251,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_
 	KASSERT(va < kmi.clean_sva || va >= kmi.clean_eva ||
 	    (m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0,
 	    ("pmap_enter_quick_locked: managed mapping within the clean submap"));
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	PMAP_LOCK_ASSERT(pmap, MA_OWNED);
 
 	/*
@@ -3283,7 +3285,7 @@ pmap_enter_quick_locked(pmap_t pmap, vm_
 				mpte->wire_count++;
 			} else {
 				mpte = _pmap_allocpte(pmap, ptepindex,
-				    M_NOWAIT);
+				    NULL, M_NOWAIT);
 				if (mpte == NULL)
 					return (mpte);
 			}
@@ -3412,7 +3414,7 @@ retry:
 		PMAP_LOCK(pmap);
 		for (va = addr; va < addr + size; va += NBPDR) {
 			while ((pdpg =
-			    pmap_allocpde(pmap, va, M_NOWAIT)) == NULL) {
+			    pmap_allocpde(pmap, va, NULL, M_NOWAIT)) == NULL) {
 				PMAP_UNLOCK(pmap);
 				vm_page_busy(p);
 				VM_OBJECT_UNLOCK(object);
@@ -3519,7 +3521,6 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pm
 	if (!pmap_is_current(src_pmap))
 		return;
 
-	vm_page_lock_queues();
 	if (dst_pmap < src_pmap) {
 		PMAP_LOCK(dst_pmap);
 		PMAP_LOCK(src_pmap);
@@ -3563,7 +3564,7 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pm
 			continue;
 			
 		if (srcptepaddr & PG_PS) {
-			dstmpde = pmap_allocpde(dst_pmap, addr, M_NOWAIT);
+			dstmpde = pmap_allocpde(dst_pmap, addr, NULL, M_NOWAIT);
 			if (dstmpde == NULL)
 				break;
 			pde = (pd_entry_t *)
@@ -3595,7 +3596,7 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pm
 			 * we only virtual copy managed pages
 			 */
 			if ((ptetemp & PG_MANAGED) != 0) {
-				dstmpte = pmap_allocpte(dst_pmap, addr,
+				dstmpte = pmap_allocpte(dst_pmap, addr, NULL,
 				    M_NOWAIT);
 				if (dstmpte == NULL)
 					break;
@@ -3629,7 +3630,6 @@ pmap_copy(pmap_t dst_pmap, pmap_t src_pm
 			src_pte++;
 		}
 	}
-	vm_page_unlock_queues();
 	PMAP_UNLOCK(src_pmap);
 	PMAP_UNLOCK(dst_pmap);
 }	
@@ -3709,7 +3709,7 @@ pmap_page_exists_quick(pmap_t pmap, vm_p
 	if (m->flags & PG_FICTITIOUS)
 		return FALSE;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) {
 		if (PV_PMAP(pv) == pmap) {
 			return TRUE;
@@ -3745,6 +3745,7 @@ pmap_page_wired_mappings(vm_page_t m)
 	count = 0;
 	if ((m->flags & PG_FICTITIOUS) != 0)
 		return (count);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	count = pmap_pvh_wired_mappings(&m->md, count);
 	return (pmap_pvh_wired_mappings(pa_to_pvh(VM_PAGE_TO_PHYS(m)), count));
 }
@@ -3761,7 +3762,6 @@ pmap_pvh_wired_mappings(struct md_page *
 	pt_entry_t *pte;
 	pv_entry_t pv;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	TAILQ_FOREACH(pv, &pvh->pv_list, pv_list) {
 		pmap = PV_PMAP(pv);
 		PMAP_LOCK(pmap);
@@ -3784,7 +3784,7 @@ pmap_page_is_mapped(vm_page_t m)
 
 	if ((m->flags & (PG_FICTITIOUS | PG_UNMANAGED)) != 0)
 		return (FALSE);
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	if (TAILQ_EMPTY(&m->md.pv_list)) {
 		pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
 		return (!TAILQ_EMPTY(&pvh->pv_list));
@@ -3805,6 +3805,7 @@ pmap_remove_pages(pmap_t pmap)
 {
 	pd_entry_t *pde;
 	pt_entry_t *pte, tpte;
+	vm_object_t locked_object;
 	vm_page_t free = NULL;
 	vm_page_t m, mpte, mt;
 	pv_entry_t pv;
@@ -3819,6 +3820,8 @@ pmap_remove_pages(pmap_t pmap)
 		printf("warning: pmap_remove_pages called with non-current pmap\n");
 		return;
 	}
+	locked_object = NULL;
+restart:
 	vm_page_lock_queues();
 	PMAP_LOCK(pmap);
 	TAILQ_FOREACH_SAFE(pc, &pmap->pm_pvchunk, pc_list, npc) {
@@ -3865,6 +3868,18 @@ pmap_remove_pages(pmap_t pmap)
 				KASSERT(m < &vm_page_array[vm_page_array_size],
 					("pmap_remove_pages: bad tpte %#jx",
 					(uintmax_t)tpte));
+				if (m->object != locked_object) {
+					if (locked_object != NULL)
+						VM_OBJECT_UNLOCK(locked_object);
+					locked_object = m->object;
+					if (!VM_OBJECT_TRYLOCK(locked_object)) {
+						pmap_invalidate_all(pmap);
+						vm_page_unlock_queues();
+						PMAP_UNLOCK(pmap);
+						VM_OBJECT_LOCK(locked_object);
+						goto restart;
+					}
+				}
 
 				pte_clear(pte);
 
@@ -3882,7 +3897,7 @@ pmap_remove_pages(pmap_t pmap)
 				/* Mark free */
 				PV_STAT(pv_entry_frees++);
 				PV_STAT(pv_entry_spare++);
-				pv_entry_count--;
+				atomic_subtract_int(&pv_entry_count, 1);
 				pc->pc_map[field] |= bitmask;
 				if ((tpte & PG_PS) != 0) {
 					pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;
@@ -3916,6 +3931,10 @@ pmap_remove_pages(pmap_t pmap)
 				}
 			}
 		}
+		if (locked_object != NULL) {
+			VM_OBJECT_UNLOCK(locked_object);
+			locked_object = NULL;
+		}
 		if (allfree) {
 			PV_STAT(pv_entry_spare -= _NPCPV);
 			PV_STAT(pc_chunk_count--);
@@ -3945,6 +3964,7 @@ pmap_is_modified(vm_page_t m)
 
 	if (m->flags & PG_FICTITIOUS)
 		return (FALSE);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	if (pmap_is_modified_pvh(&m->md))
 		return (TRUE);
 	return (pmap_is_modified_pvh(pa_to_pvh(VM_PAGE_TO_PHYS(m))));
@@ -3963,7 +3983,6 @@ pmap_is_modified_pvh(struct md_page *pvh
 	pmap_t pmap;
 	boolean_t rv;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	rv = FALSE;
 	TAILQ_FOREACH(pv, &pvh->pv_list, pv_list) {
 		pmap = PV_PMAP(pv);
@@ -4017,7 +4036,7 @@ pmap_remove_write(vm_page_t m)
 	if ((m->flags & PG_FICTITIOUS) != 0 ||
 	    (m->flags & PG_WRITEABLE) == 0)
 		return;
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
 	TAILQ_FOREACH_SAFE(pv, &pvh->pv_list, pv_list, next_pv) {
 		va = pv->pv_va;
@@ -4075,7 +4094,7 @@ pmap_ts_referenced(vm_page_t m)
 
 	if (m->flags & PG_FICTITIOUS)
 		return (rtval);
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
 	TAILQ_FOREACH_SAFE(pv, &pvh->pv_list, pv_list, pvn) {
 		va = pv->pv_va;
@@ -4147,7 +4166,7 @@ pmap_clear_modify(vm_page_t m)
 
 	if ((m->flags & PG_FICTITIOUS) != 0)
 		return;
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
 	TAILQ_FOREACH_SAFE(pv, &pvh->pv_list, pv_list, next_pv) {
 		va = pv->pv_va;
@@ -4212,7 +4231,7 @@ pmap_clear_reference(vm_page_t m)
 
 	if ((m->flags & PG_FICTITIOUS) != 0)
 		return;
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
 	TAILQ_FOREACH_SAFE(pv, &pvh->pv_list, pv_list, next_pv) {
 		va = pv->pv_va;
@@ -4696,7 +4715,7 @@ pmap_mincore(pmap_t pmap, vm_offset_t ad
 			/*
 			 * Modified by someone else
 			 */
-			vm_page_lock_queues();
+			vm_page_lock_queues();	/* XXX */
 			if (m->dirty || pmap_is_modified(m))
 				val |= MINCORE_MODIFIED_OTHER;
 			vm_page_unlock_queues();
@@ -4710,7 +4729,7 @@ pmap_mincore(pmap_t pmap, vm_offset_t ad
 			/*
 			 * Referenced by someone else
 			 */
-			vm_page_lock_queues();
+			vm_page_lock_queues();	/* XXX */
 			if ((m->flags & PG_REFERENCED) ||
 			    pmap_ts_referenced(m)) {
 				val |= MINCORE_REFERENCED_OTHER;

Modified: user/alc/pagelock/sys/ddb/db_watch.c
==============================================================================
--- user/alc/pagelock/sys/ddb/db_watch.c	Tue Feb 17 03:06:40 2009	(r188702)
+++ user/alc/pagelock/sys/ddb/db_watch.c	Tue Feb 17 03:58:15 2009	(r188703)
@@ -238,7 +238,7 @@ db_set_watchpoints()
 	    for (watch = db_watchpoint_list;
 	         watch != 0;
 	         watch = watch->link)
-		pmap_protect(watch->map->pmap,
+		pmap_protect(watch->map->pmap,	/* XXX */
 			     trunc_page(watch->loaddr),
 			     round_page(watch->hiaddr),
 			     VM_PROT_READ);

Modified: user/alc/pagelock/sys/kern/kern_subr.c
==============================================================================
--- user/alc/pagelock/sys/kern/kern_subr.c	Tue Feb 17 03:06:40 2009	(r188702)
+++ user/alc/pagelock/sys/kern/kern_subr.c	Tue Feb 17 03:58:15 2009	(r188703)
@@ -116,8 +116,11 @@ retry:
 		 * object chain's first object, a physical page from a
 		 * backing object may be mapped read only.
 		 */
-		if (uobject->backing_object != NULL)
+		if (uobject->backing_object != NULL) {
+			vm_object_lock_all(uobject->backing_object);
 			pmap_remove(map->pmap, uaddr, uaddr + PAGE_SIZE);
+			vm_object_unlock_all(uobject->backing_object);
+		}
 		vm_page_lock_queues();
 	}
 	vm_page_insert(kern_pg, uobject, upindex);

Modified: user/alc/pagelock/sys/kern/uipc_shm.c
==============================================================================
--- user/alc/pagelock/sys/kern/uipc_shm.c	Tue Feb 17 03:06:40 2009	(r188702)
+++ user/alc/pagelock/sys/kern/uipc_shm.c	Tue Feb 17 03:58:15 2009	(r188703)
@@ -286,11 +286,9 @@ shm_dotruncate(struct shmfd *shmfd, off_
 			int size = PAGE_SIZE - base;
 
 			pmap_zero_page_area(m, base, size);
-			vm_page_lock_queues();
 			vm_page_set_validclean(m, base, size);
 			if (m->dirty != 0)
 				m->dirty = VM_PAGE_BITS_ALL;
-			vm_page_unlock_queues();
 		} else if ((length & PAGE_MASK) &&
 		    __predict_false(object->cache != NULL)) {
 			vm_page_cache_free(object, OFF_TO_IDX(length),

Modified: user/alc/pagelock/sys/kern/vfs_bio.c
==============================================================================
--- user/alc/pagelock/sys/kern/vfs_bio.c	Tue Feb 17 03:06:40 2009	(r188702)
+++ user/alc/pagelock/sys/kern/vfs_bio.c	Tue Feb 17 03:58:15 2009	(r188703)
@@ -2309,7 +2309,6 @@ vfs_setdirty_locked_object(struct buf *b
 		vm_offset_t boffset;
 		vm_offset_t eoffset;
 
-		vm_page_lock_queues();
 		/*
 		 * test the pages to see if they have been modified directly
 		 * by users through the VM system.
@@ -2335,7 +2334,6 @@ vfs_setdirty_locked_object(struct buf *b
 		}
 		eoffset = ((i + 1) << PAGE_SHIFT) - (bp->b_offset & PAGE_MASK);
 
-		vm_page_unlock_queues();
 		/*
 		 * Fit it to the buffer.
 		 */
@@ -3162,7 +3160,6 @@ bufdone_finish(struct buf *bp)
 		vm_object_t obj;
 		int iosize;
 		struct vnode *vp = bp->b_vp;
-		boolean_t are_queues_locked;
 
 		obj = bp->b_bufobj->bo_object;
 
@@ -3199,11 +3196,6 @@ bufdone_finish(struct buf *bp)
 		    !(bp->b_ioflags & BIO_ERROR)) {
 			bp->b_flags |= B_CACHE;
 		}
-		if (bp->b_iocmd == BIO_READ) {
-			vm_page_lock_queues();
-			are_queues_locked = TRUE;
-		} else
-			are_queues_locked = FALSE;
 		for (i = 0; i < bp->b_npages; i++) {
 			int bogusflag = 0;
 			int resid;
@@ -3272,8 +3264,6 @@ bufdone_finish(struct buf *bp)
 			foff = (foff + PAGE_SIZE) & ~(off_t)PAGE_MASK;
 			iosize -= resid;
 		}
-		if (are_queues_locked)
-			vm_page_unlock_queues();
 		vm_object_pip_wakeupn(obj, 0);
 		VM_OBJECT_UNLOCK(obj);
 	}
@@ -3341,7 +3331,6 @@ vfs_page_set_valid(struct buf *bp, vm_oo
 {
 	vm_ooffset_t soff, eoff;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	/*
 	 * Start and end offsets in buffer.  eoff - soff may not cross a
 	 * page boundry or cross the end of the buffer.  The end of the
@@ -3466,7 +3455,6 @@ vfs_clean_pages(struct buf *bp)
 	KASSERT(bp->b_offset != NOOFFSET,
 	    ("vfs_clean_pages: no buffer offset"));
 	VM_OBJECT_LOCK(bp->b_bufobj->bo_object);
-	vm_page_lock_queues();
 	for (i = 0; i < bp->b_npages; i++) {
 		m = bp->b_pages[i];
 		noff = (foff + PAGE_SIZE) & ~(off_t)PAGE_MASK;
@@ -3478,7 +3466,6 @@ vfs_clean_pages(struct buf *bp)
 		/* vm_page_clear_dirty(m, foff & PAGE_MASK, eoff - foff); */
 		foff = noff;
 	}
-	vm_page_unlock_queues();
 	VM_OBJECT_UNLOCK(bp->b_bufobj->bo_object);
 }
 
@@ -3509,7 +3496,6 @@ vfs_bio_set_validclean(struct buf *bp, i
 	n = PAGE_SIZE - (base & PAGE_MASK);
 
 	VM_OBJECT_LOCK(bp->b_bufobj->bo_object);
-	vm_page_lock_queues();
 	for (i = base / PAGE_SIZE; size > 0 && i < bp->b_npages; ++i) {
 		m = bp->b_pages[i];
 		if (n > size)
@@ -3519,7 +3505,6 @@ vfs_bio_set_validclean(struct buf *bp, i
 		size -= n;
 		n = PAGE_SIZE;
 	}
-	vm_page_unlock_queues();
 	VM_OBJECT_UNLOCK(bp->b_bufobj->bo_object);
 }
 

Modified: user/alc/pagelock/sys/security/mac/mac_process.c
==============================================================================
--- user/alc/pagelock/sys/security/mac/mac_process.c	Tue Feb 17 03:06:40 2009	(r188702)
+++ user/alc/pagelock/sys/security/mac/mac_process.c	Tue Feb 17 03:58:15 2009	(r188703)
@@ -364,8 +364,10 @@ mac_proc_vm_revoke_recurse(struct thread
 				vme->max_protection = 0;
 				vme->protection = 0;
 			}
+			vm_object_lock_all(vme->object.vm_object);
 			pmap_protect(map->pmap, vme->start, vme->end,
 			    vme->protection & ~revokeperms);
+			vm_object_unlock_all(vme->object.vm_object);
 			vm_map_simplify_entry(map, vme);
 		}
 		VFS_UNLOCK_GIANT(vfslocked);

Modified: user/alc/pagelock/sys/vm/vm_fault.c
==============================================================================
--- user/alc/pagelock/sys/vm/vm_fault.c	Tue Feb 17 03:06:40 2009	(r188702)
+++ user/alc/pagelock/sys/vm/vm_fault.c	Tue Feb 17 03:58:15 2009	(r188703)
@@ -919,7 +919,7 @@ vnode_locked:
 		vm_page_zero_invalid(fs.m, TRUE);
 		printf("Warning: page %p partially invalid on fault\n", fs.m);
 	}
-	VM_OBJECT_UNLOCK(fs.object);
+	vm_object_lock_all(fs.object->backing_object);
 
 	/*
 	 * Put this page into the physical map.  We had to do the unlock above
@@ -928,6 +928,7 @@ vnode_locked:
 	 * won't find it (yet).
 	 */
 	pmap_enter(fs.map->pmap, vaddr, fault_type, fs.m, prot, wired);
+	vm_object_unlock_all(fs.object);
 	if (((fault_flags & VM_FAULT_WIRE_MASK) == 0) && (wired == 0)) {
 		vm_fault_prefault(fs.map->pmap, vaddr, fs.entry);
 	}
@@ -1024,12 +1025,8 @@ vm_fault_prefault(pmap_t pmap, vm_offset
 		}
 		if (((m->valid & VM_PAGE_BITS_ALL) == VM_PAGE_BITS_ALL) &&
 			(m->busy == 0) &&
-		    (m->flags & PG_FICTITIOUS) == 0) {
-
-			vm_page_lock_queues();
+		    (m->flags & PG_FICTITIOUS) == 0)
 			pmap_enter_quick(pmap, addr, m, entry->protection);
-			vm_page_unlock_queues();
-		}
 		VM_OBJECT_UNLOCK(lobject);
 	}
 }

Modified: user/alc/pagelock/sys/vm/vm_map.c
==============================================================================
--- user/alc/pagelock/sys/vm/vm_map.c	Tue Feb 17 03:06:40 2009	(r188702)
+++ user/alc/pagelock/sys/vm/vm_map.c	Tue Feb 17 03:58:15 2009	(r188703)
@@ -1576,7 +1576,6 @@ vm_map_pmap_enter(vm_map_t map, vm_offse
 	vm_offset_t start;
 	vm_page_t p, p_start;
 	vm_pindex_t psize, tmpidx;
-	boolean_t are_queues_locked;
 
 	if ((prot & (VM_PROT_READ | VM_PROT_EXECUTE)) == 0 || object == NULL)
 		return;
@@ -1600,7 +1599,6 @@ vm_map_pmap_enter(vm_map_t map, vm_offse
 		psize = object->size - pindex;
 	}
 
-	are_queues_locked = FALSE;
 	start = 0;
 	p_start = NULL;
 
@@ -1635,25 +1633,15 @@ vm_map_pmap_enter(vm_map_t map, vm_offse
 				p_start = p;
 			}
 		} else if (p_start != NULL) {
-			if (!are_queues_locked) {
-				are_queues_locked = TRUE;
-				vm_page_lock_queues();
-			}
 			pmap_enter_object(map->pmap, start, addr +
 			    ptoa(tmpidx), p_start, prot);
 			p_start = NULL;
 		}
 	}
 	if (p_start != NULL) {
-		if (!are_queues_locked) {
-			are_queues_locked = TRUE;
-			vm_page_lock_queues();
-		}
 		pmap_enter_object(map->pmap, start, addr + ptoa(psize),
 		    p_start, prot);
 	}
-	if (are_queues_locked)
-		vm_page_unlock_queues();
 unlock_return:
 	VM_OBJECT_UNLOCK(object);
 }
@@ -1722,12 +1710,15 @@ vm_map_protect(vm_map_t map, vm_offset_t
 		 * here.
 		 */
 		if (current->protection != old_prot) {
+			vm_object_lock_all(current->object.vm_object);
+
 #define MASK(entry)	(((entry)->eflags & MAP_ENTRY_COW) ? ~VM_PROT_WRITE : \
 							VM_PROT_ALL)
 			pmap_protect(map->pmap, current->start,
 			    current->end,
 			    current->protection & MASK(current));
 #undef	MASK
+			vm_object_unlock_all(current->object.vm_object);
 		}
 		vm_map_simplify_entry(map, current);
 		current = current->next;
@@ -2335,9 +2326,6 @@ vm_map_sync(
 		}
 	}
 
-	if (invalidate)
-		pmap_remove(map->pmap, start, end);
-
 	/*
 	 * Make a second pass, cleaning/uncaching pages from the indicated
 	 * objects as we go.
@@ -2362,6 +2350,11 @@ vm_map_sync(
 		} else {
 			object = current->object.vm_object;
 		}
+		if (invalidate) {
+			vm_object_lock_all(object);
+			pmap_remove(map->pmap, start, start + size);
+			vm_object_unlock_all(object);
+		}
 		vm_object_reference(object);
 		last_timestamp = map->timestamp;
 		vm_map_unlock_read(map);
@@ -2524,7 +2517,12 @@ vm_map_delete(vm_map_t map, vm_offset_t 
 			vm_map_entry_unwire(map, entry);
 		}
 
-		pmap_remove(map->pmap, entry->start, entry->end);
+		if ((entry->eflags & MAP_ENTRY_IS_SUB_MAP) == 0) {
+			vm_object_lock_all(entry->object.vm_object);
+			pmap_remove(map->pmap, entry->start, entry->end);
+			vm_object_unlock_all(entry->object.vm_object);
+		} else
+			panic("vm_map_delete: submap");	/* XXX */
 
 		/*
 		 * Delete the entry (which may delete the object) only after
@@ -2631,10 +2629,14 @@ vm_map_copy_entry(
 		 * write-protected.
 		 */
 		if ((src_entry->eflags & MAP_ENTRY_NEEDS_COPY) == 0) {
+			vm_object_lock_all(src_entry->object.vm_object);
+
 			pmap_protect(src_map->pmap,
 			    src_entry->start,
 			    src_entry->end,
 			    src_entry->protection & ~VM_PROT_WRITE);
+
+			vm_object_unlock_all(src_entry->object.vm_object);
 		}
 
 		/*
@@ -2663,8 +2665,10 @@ vm_map_copy_entry(
 			dst_entry->offset = 0;
 		}
 
+		vm_object_lock_all(dst_entry->object.vm_object);
 		pmap_copy(dst_map->pmap, src_map->pmap, dst_entry->start,
 		    dst_entry->end - dst_entry->start, src_entry->start);
+		vm_object_unlock_all(dst_entry->object.vm_object);
 	} else {
 		/*
 		 * Of course, wired down pages can't be set copy-on-write.
@@ -2808,10 +2812,12 @@ vmspace_fork(struct vmspace *vm1)
 			/*
 			 * Update the physical map
 			 */
+			vm_object_lock_all(new_entry->object.vm_object);
 			pmap_copy(new_map->pmap, old_map->pmap,
 			    new_entry->start,
 			    (old_entry->end - old_entry->start),
 			    old_entry->start);
+			vm_object_unlock_all(new_entry->object.vm_object);
 			break;
 
 		case VM_INHERIT_COPY:

Modified: user/alc/pagelock/sys/vm/vm_object.c
==============================================================================
--- user/alc/pagelock/sys/vm/vm_object.c	Tue Feb 17 03:06:40 2009	(r188702)
+++ user/alc/pagelock/sys/vm/vm_object.c	Tue Feb 17 03:58:15 2009	(r188703)
@@ -2010,6 +2010,32 @@ vm_object_coalesce(vm_object_t prev_obje
 	return (TRUE);
 }
 
+/*
+ *
+ */
+void
+vm_object_lock_all(vm_object_t object)
+{
+
+	while (object != NULL) {
+		VM_OBJECT_LOCK(object);
+		object = object->backing_object;
+	}
+}
+
+/*
+ *
+ */
+void
+vm_object_unlock_all(vm_object_t object)
+{
+
+	while (object != NULL) {
+		VM_OBJECT_UNLOCK(object);
+		object = object->backing_object;
+	}
+}
+
 void
 vm_object_set_writeable_dirty(vm_object_t object)
 {

Modified: user/alc/pagelock/sys/vm/vm_object.h
==============================================================================
--- user/alc/pagelock/sys/vm/vm_object.h	Tue Feb 17 03:06:40 2009	(r188702)
+++ user/alc/pagelock/sys/vm/vm_object.h	Tue Feb 17 03:58:15 2009	(r188703)
@@ -205,6 +205,7 @@ void vm_object_destroy (vm_object_t);
 void vm_object_terminate (vm_object_t);
 void vm_object_set_writeable_dirty (vm_object_t);
 void vm_object_init (void);
+void vm_object_lock_all(vm_object_t);
 void vm_object_page_clean (vm_object_t, vm_pindex_t, vm_pindex_t, boolean_t);
 void vm_object_page_remove (vm_object_t, vm_pindex_t, vm_pindex_t, boolean_t);
 void vm_object_reference (vm_object_t);
@@ -213,6 +214,7 @@ void vm_object_shadow (vm_object_t *, vm
 void vm_object_split(vm_map_entry_t);
 void vm_object_sync(vm_object_t, vm_ooffset_t, vm_size_t, boolean_t,
     boolean_t);
+void vm_object_unlock_all(vm_object_t);
 void vm_object_madvise (vm_object_t, vm_pindex_t, int, int);
 #endif				/* _KERNEL */
 

Modified: user/alc/pagelock/sys/vm/vm_page.c
==============================================================================
--- user/alc/pagelock/sys/vm/vm_page.c	Tue Feb 17 03:06:40 2009	(r188702)
+++ user/alc/pagelock/sys/vm/vm_page.c	Tue Feb 17 03:58:15 2009	(r188703)
@@ -566,6 +566,8 @@ vm_page_sleep(vm_page_t m, const char *m
 void
 vm_page_dirty(vm_page_t m)
 {
+
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	KASSERT((m->flags & PG_CACHED) == 0,
 	    ("vm_page_dirty: page in cache!"));
 	KASSERT(!VM_PAGE_IS_FREE(m),
@@ -1594,7 +1596,7 @@ vm_page_try_to_free(vm_page_t m)
 	    (m->oflags & VPO_BUSY) || (m->flags & PG_UNMANAGED)) {
 		return (0);
 	}
-	pmap_remove_all(m);
+	pmap_remove_all(m);	/* XXX */
 	if (m->dirty)
 		return (0);
 	vm_page_free(m);
@@ -1741,6 +1743,7 @@ vm_page_dontneed(vm_page_t m)
 	int head;
 
 	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	dnw = ++dnweight;
 
 	/*
@@ -1870,7 +1873,6 @@ vm_page_set_validclean(vm_page_t m, int 
 	int frag;
 	int endoff;
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	if (size == 0)	/* handle degenerate case */
 		return;
@@ -1929,6 +1931,7 @@ void
 vm_page_clear_dirty(vm_page_t m, int base, int size)
 {
 
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);	/* XXX */
 	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	m->dirty &= ~vm_page_bits(base, size);
 }
@@ -2028,6 +2031,8 @@ vm_page_is_valid(vm_page_t m, int base, 
 void
 vm_page_test_dirty(vm_page_t m)
 {
+
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	if ((m->dirty != VM_PAGE_BITS_ALL) && pmap_is_modified(m)) {
 		vm_page_dirty(m);
 	}
@@ -2118,6 +2123,7 @@ vm_page_cowsetup(vm_page_t m)
 {
 
 	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);	/* XXX */
 	if (m->cow == USHRT_MAX - 1)
 		return (EBUSY);
 	m->cow++;

Modified: user/alc/pagelock/sys/vm/vm_pageout.c
==============================================================================
--- user/alc/pagelock/sys/vm/vm_pageout.c	Tue Feb 17 03:06:40 2009	(r188702)
+++ user/alc/pagelock/sys/vm/vm_pageout.c	Tue Feb 17 03:58:15 2009	(r188703)
@@ -664,8 +664,7 @@ vm_pageout_map_deactivate_pages(map, des
 	 * table pages.
 	 */
 	if (desired == 0 && nothingwired) {
-		pmap_remove(vm_map_pmap(map), vm_map_min(map),
-		    vm_map_max(map));
+		pmap_remove_pages(vm_map_pmap(map));
 	}
 	vm_map_unlock(map);
 }

Modified: user/alc/pagelock/sys/vm/vnode_pager.c
==============================================================================
--- user/alc/pagelock/sys/vm/vnode_pager.c	Tue Feb 17 03:06:40 2009	(r188702)
+++ user/alc/pagelock/sys/vm/vnode_pager.c	Tue Feb 17 03:58:15 2009	(r188703)
@@ -415,11 +415,9 @@ vnode_pager_setsize(vp, nsize)
 			 * bits.  This would prevent bogus_page
 			 * replacement from working properly.
 			 */
-			vm_page_lock_queues();
 			vm_page_set_validclean(m, base, size);
 			if (m->dirty != 0)
 				m->dirty = VM_PAGE_BITS_ALL;
-			vm_page_unlock_queues();
 		} else if ((nsize & PAGE_MASK) &&
 		    __predict_false(object->cache != NULL)) {
 			vm_page_cache_free(object, OFF_TO_IDX(nsize),
@@ -545,23 +543,19 @@ vnode_pager_input_smlfs(object, m)
 				break;
 
 			VM_OBJECT_LOCK(object);
-			vm_page_lock_queues();
 			vm_page_set_validclean(m, (i * bsize) & PAGE_MASK, bsize);
-			vm_page_unlock_queues();
 			VM_OBJECT_UNLOCK(object);
 		} else {
 			VM_OBJECT_LOCK(object);
-			vm_page_lock_queues();
 			vm_page_set_validclean(m, (i * bsize) & PAGE_MASK, bsize);
-			vm_page_unlock_queues();
 			VM_OBJECT_UNLOCK(object);
 			bzero((caddr_t)sf_buf_kva(sf) + i * bsize, bsize);
 		}
 	}
 	sf_buf_free(sf);
-	vm_page_lock_queues();
+	VM_OBJECT_LOCK(object);
 	pmap_clear_modify(m);
-	vm_page_unlock_queues();
+	VM_OBJECT_UNLOCK(object);
 	if (error) {
 		return VM_PAGER_ERROR;
 	}
@@ -630,10 +624,8 @@ vnode_pager_input_old(object, m)
 
 		VM_OBJECT_LOCK(object);
 	}
-	vm_page_lock_queues();
 	pmap_clear_modify(m);
 	vm_page_undirty(m);
-	vm_page_unlock_queues();
 	if (!error)
 		m->valid = VM_PAGE_BITS_ALL;
 	return error ? VM_PAGER_ERROR : VM_PAGER_OK;

From owner-svn-src-user@FreeBSD.ORG  Tue Feb 17 06:56:38 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 716B21065703;
	Tue, 17 Feb 2009 06:56:38 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 60B388FC25;
	Tue, 17 Feb 2009 06:56:38 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1H6ucDY006168;
	Tue, 17 Feb 2009 06:56:38 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1H6ucmf006167;
	Tue, 17 Feb 2009 06:56:38 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200902170656.n1H6ucmf006167@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Tue, 17 Feb 2009 06:56:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188706 - user/alc/pagelock/sys/vm
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Feb 2009 06:56:38 -0000

Author: alc
Date: Tue Feb 17 06:56:38 2009
New Revision: 188706
URL: http://svn.freebsd.org/changeset/base/188706

Log:
  Reduce the scope of the page queues lock.

Modified:
  user/alc/pagelock/sys/vm/vm_mmap.c

Modified: user/alc/pagelock/sys/vm/vm_mmap.c
==============================================================================
--- user/alc/pagelock/sys/vm/vm_mmap.c	Tue Feb 17 04:12:10 2009	(r188705)
+++ user/alc/pagelock/sys/vm/vm_mmap.c	Tue Feb 17 06:56:38 2009	(r188706)
@@ -869,10 +869,10 @@ RestartScan:
 				 */
 				if (m != NULL && m->valid != 0) {
 					mincoreinfo = MINCORE_INCORE;
-					vm_page_lock_queues();
 					if (m->dirty ||
 						pmap_is_modified(m))
 						mincoreinfo |= MINCORE_MODIFIED_OTHER;
+					vm_page_lock_queues();
 					if ((m->flags & PG_REFERENCED) ||
 						pmap_ts_referenced(m)) {
 						vm_page_flag_set(m, PG_REFERENCED);

From owner-svn-src-user@FreeBSD.ORG  Tue Feb 17 10:01:22 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1F0C0106564A;
	Tue, 17 Feb 2009 10:01:22 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E7DAD8FC12;
	Tue, 17 Feb 2009 10:01:21 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1HA1Lm2009535;
	Tue, 17 Feb 2009 10:01:21 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1HA1LdD009534;
	Tue, 17 Feb 2009 10:01:21 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200902171001.n1HA1LdD009534@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Tue, 17 Feb 2009 10:01:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188707 - user/dfr/xenhvm/7/sys/amd64/include/xen
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 Feb 2009 10:01:22 -0000

Author: dfr
Date: Tue Feb 17 10:01:21 2009
New Revision: 188707
URL: http://svn.freebsd.org/changeset/base/188707

Log:
  Pull in support for Xen HVM from user/dfr/xenhvm/6.

Added:
  user/dfr/xenhvm/7/sys/amd64/include/xen/   (props changed)
     - copied from r188706, user/dfr/xenhvm/6/sys/amd64/include/xen/

From owner-svn-src-user@FreeBSD.ORG  Wed Feb 18 06:43:04 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BCB271065675;
	Wed, 18 Feb 2009 06:43:04 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A891B8FC12;
	Wed, 18 Feb 2009 06:43:04 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1I6h428048247;
	Wed, 18 Feb 2009 06:43:04 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1I6h4T2048239;
	Wed, 18 Feb 2009 06:43:04 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200902180643.n1I6h4T2048239@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Wed, 18 Feb 2009 06:43:04 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188747 - in user/alc/pagelock/sys: amd64/amd64 vm
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Feb 2009 06:43:05 -0000

Author: alc
Date: Wed Feb 18 06:43:03 2009
New Revision: 188747
URL: http://svn.freebsd.org/changeset/base/188747

Log:
  Replace PG_REFERENCED with VPO_REFERENCED.

Modified:
  user/alc/pagelock/sys/amd64/amd64/pmap.c
  user/alc/pagelock/sys/vm/swap_pager.c
  user/alc/pagelock/sys/vm/vm_fault.c
  user/alc/pagelock/sys/vm/vm_mmap.c
  user/alc/pagelock/sys/vm/vm_object.c
  user/alc/pagelock/sys/vm/vm_page.c
  user/alc/pagelock/sys/vm/vm_page.h
  user/alc/pagelock/sys/vm/vm_pageout.c

Modified: user/alc/pagelock/sys/amd64/amd64/pmap.c
==============================================================================
--- user/alc/pagelock/sys/amd64/amd64/pmap.c	Wed Feb 18 06:33:10 2009	(r188746)
+++ user/alc/pagelock/sys/amd64/amd64/pmap.c	Wed Feb 18 06:43:03 2009	(r188747)
@@ -1896,7 +1896,7 @@ pmap_collect(pmap_t locked_pmap, struct 
 			KASSERT((tpte & PG_W) == 0,
 			    ("pmap_collect: wired pte %#lx", tpte));
 			if (tpte & PG_A)
-				vm_page_flag_set(m, PG_REFERENCED);
+				m->oflags |= VPO_REFERENCED;	/* XXX */
 			if ((tpte & (PG_M | PG_RW)) == (PG_M | PG_RW))
 				vm_page_dirty(m);
 			free = NULL;
@@ -2370,8 +2370,10 @@ pmap_remove_pde(pmap_t pmap, pd_entry_t 
 		    va < eva; va += PAGE_SIZE, m++) {
 			if ((oldpde & (PG_M | PG_RW)) == (PG_M | PG_RW))
 				vm_page_dirty(m);
-			if (oldpde & PG_A)
-				vm_page_flag_set(m, PG_REFERENCED);
+			if (oldpde & PG_A) {
+				VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
+				m->oflags |= VPO_REFERENCED;
+			}
 			if (TAILQ_EMPTY(&m->md.pv_list) &&
 			    TAILQ_EMPTY(&pvh->pv_list))
 				vm_page_flag_clear(m, PG_WRITEABLE);
@@ -2419,8 +2421,10 @@ pmap_remove_pte(pmap_t pmap, pt_entry_t 
 		m = PHYS_TO_VM_PAGE(oldpte & PG_FRAME);
 		if ((oldpte & (PG_M | PG_RW)) == (PG_M | PG_RW))
 			vm_page_dirty(m);
-		if (oldpte & PG_A)
-			vm_page_flag_set(m, PG_REFERENCED);
+		if (oldpte & PG_A) {
+			VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
+			m->oflags |= VPO_REFERENCED;
+		}
 		pmap_remove_entry(pmap, m, va);
 	}
 	return (pmap_unuse_pt(pmap, va, ptepde, free));
@@ -2625,7 +2629,7 @@ pmap_remove_all(vm_page_t m)
 		if (tpte & PG_W)
 			pmap->pm_stats.wired_count--;
 		if (tpte & PG_A)
-			vm_page_flag_set(m, PG_REFERENCED);
+			m->oflags |= VPO_REFERENCED;
 
 		/*
 		 * Update the vm_page_t clean and reference bits.
@@ -2667,7 +2671,7 @@ retry:
 			/*
 			 * In contrast to the analogous operation on a 4KB page
 			 * mapping, the mapping's PG_A flag is not cleared and
-			 * the page's PG_REFERENCED flag is not set.  The
+			 * the page's VPO_REFERENCED flag is not set.  The
 			 * reason is that pmap_demote_pde() expects that a 2MB
 			 * page mapping with a stored page table page has PG_A
 			 * set.
@@ -2716,7 +2720,6 @@ pmap_protect(pmap_t pmap, vm_offset_t sv
 
 	anychanged = 0;
 
-	vm_page_lock_queues();
 	PMAP_LOCK(pmap);
 	for (; sva < eva; sva = va_next) {
 
@@ -2787,7 +2790,9 @@ retry:
 				m = NULL;
 				if (pbits & PG_A) {
 					m = PHYS_TO_VM_PAGE(pbits & PG_FRAME);
-					vm_page_flag_set(m, PG_REFERENCED);
+					VM_OBJECT_LOCK_ASSERT(m->object,
+					    MA_OWNED);
+					m->oflags |= VPO_REFERENCED;
 					pbits &= ~PG_A;
 				}
 				if ((pbits & (PG_M | PG_RW)) == (PG_M | PG_RW)) {
@@ -2815,7 +2820,6 @@ retry:
 	}
 	if (anychanged)
 		pmap_invalidate_all(pmap);
-	vm_page_unlock_queues();
 	PMAP_UNLOCK(pmap);
 }
 
@@ -3084,8 +3088,11 @@ validate:
 			invlva = FALSE;
 			origpte = pte_load_store(pte, newpte);
 			if (origpte & PG_A) {
-				if (origpte & PG_MANAGED)
-					vm_page_flag_set(om, PG_REFERENCED);
+				if (origpte & PG_MANAGED) {
+					VM_OBJECT_LOCK_ASSERT(om->object,
+					    MA_OWNED);
+					om->oflags |= VPO_REFERENCED;
+				}
 				if (opa != VM_PAGE_TO_PHYS(m) || ((origpte &
 				    PG_NX) == 0 && (newpte & PG_NX)))
 					invlva = TRUE;
@@ -4715,10 +4722,10 @@ pmap_mincore(pmap_t pmap, vm_offset_t ad
 			/*
 			 * Modified by someone else
 			 */
-			vm_page_lock_queues();	/* XXX */
+			VM_OBJECT_LOCK(m->object);	/* XXX */
 			if (m->dirty || pmap_is_modified(m))
 				val |= MINCORE_MODIFIED_OTHER;
-			vm_page_unlock_queues();
+			VM_OBJECT_UNLOCK(m->object);
 		}
 		/*
 		 * Referenced by us
@@ -4729,13 +4736,13 @@ pmap_mincore(pmap_t pmap, vm_offset_t ad
 			/*
 			 * Referenced by someone else
 			 */
-			vm_page_lock_queues();	/* XXX */
-			if ((m->flags & PG_REFERENCED) ||
+			VM_OBJECT_LOCK(m->object);	/* XXX */
+			if ((m->oflags & VPO_REFERENCED) ||
 			    pmap_ts_referenced(m)) {
 				val |= MINCORE_REFERENCED_OTHER;
-				vm_page_flag_set(m, PG_REFERENCED);
+				m->oflags |= VPO_REFERENCED;
 			}
-			vm_page_unlock_queues();
+			VM_OBJECT_UNLOCK(m->object);
 		}
 	} 
 	return val;

Modified: user/alc/pagelock/sys/vm/swap_pager.c
==============================================================================
--- user/alc/pagelock/sys/vm/swap_pager.c	Wed Feb 18 06:33:10 2009	(r188746)
+++ user/alc/pagelock/sys/vm/swap_pager.c	Wed Feb 18 06:43:03 2009	(r188747)
@@ -1066,10 +1066,7 @@ swap_pager_getpages(vm_object_t object, 
 	 */
 	VM_OBJECT_LOCK(object);
 	while ((mreq->oflags & VPO_SWAPINPROG) != 0) {
-		mreq->oflags |= VPO_WANTED;
-		vm_page_lock_queues();
-		vm_page_flag_set(mreq, PG_REFERENCED);
-		vm_page_unlock_queues();
+		mreq->oflags |= VPO_REFERENCED | VPO_WANTED;
 		PCPU_INC(cnt.v_intrans);
 		if (msleep(mreq, VM_OBJECT_MTX(object), PSWP, "swread", hz*20)) {
 			printf(

Modified: user/alc/pagelock/sys/vm/vm_fault.c
==============================================================================
--- user/alc/pagelock/sys/vm/vm_fault.c	Wed Feb 18 06:33:10 2009	(r188746)
+++ user/alc/pagelock/sys/vm/vm_fault.c	Wed Feb 18 06:43:03 2009	(r188747)
@@ -933,8 +933,8 @@ vnode_locked:
 		vm_fault_prefault(fs.map->pmap, vaddr, fs.entry);
 	}
 	VM_OBJECT_LOCK(fs.object);
+	fs.m->oflags |= VPO_REFERENCED;
 	vm_page_lock_queues();
-	vm_page_flag_set(fs.m, PG_REFERENCED);
 
 	/*
 	 * If the page is not wired down, then put it where the pageout daemon

Modified: user/alc/pagelock/sys/vm/vm_mmap.c
==============================================================================
--- user/alc/pagelock/sys/vm/vm_mmap.c	Wed Feb 18 06:33:10 2009	(r188746)
+++ user/alc/pagelock/sys/vm/vm_mmap.c	Wed Feb 18 06:43:03 2009	(r188747)
@@ -872,13 +872,11 @@ RestartScan:
 					if (m->dirty ||
 						pmap_is_modified(m))
 						mincoreinfo |= MINCORE_MODIFIED_OTHER;
-					vm_page_lock_queues();
-					if ((m->flags & PG_REFERENCED) ||
+					if ((m->oflags & VPO_REFERENCED) ||
 						pmap_ts_referenced(m)) {
-						vm_page_flag_set(m, PG_REFERENCED);
+						m->oflags |= VPO_REFERENCED;
 						mincoreinfo |= MINCORE_REFERENCED_OTHER;
 					}
-					vm_page_unlock_queues();
 				}
 				VM_OBJECT_UNLOCK(current->object.vm_object);
 			}

Modified: user/alc/pagelock/sys/vm/vm_object.c
==============================================================================
--- user/alc/pagelock/sys/vm/vm_object.c	Wed Feb 18 06:33:10 2009	(r188746)
+++ user/alc/pagelock/sys/vm/vm_object.c	Wed Feb 18 06:43:03 2009	(r188747)
@@ -1166,11 +1166,10 @@ shadowlookup:
 			goto unlock_tobject;
 		}
 		if ((m->oflags & VPO_BUSY) || m->busy) {
-			vm_page_flag_set(m, PG_REFERENCED);
 			vm_page_unlock_queues();
 			if (object != tobject)
 				VM_OBJECT_UNLOCK(object);
-			m->oflags |= VPO_WANTED;
+			m->oflags |= VPO_REFERENCED | VPO_WANTED;
 			msleep(m, VM_OBJECT_MTX(tobject), PDROP | PVM, "madvpo", 0);
 			VM_OBJECT_LOCK(object);
   			goto relookup;
@@ -1368,10 +1367,9 @@ retry:
 		 * not be changed by this operation.
 		 */
 		if ((m->oflags & VPO_BUSY) || m->busy) {
-			vm_page_flag_set(m, PG_REFERENCED);
 			vm_page_unlock_queues();
 			VM_OBJECT_UNLOCK(new_object);
-			m->oflags |= VPO_WANTED;
+			m->oflags |= VPO_REFERENCED | VPO_WANTED;
 			msleep(m, VM_OBJECT_MTX(orig_object), PVM, "spltwt", 0);
 			VM_OBJECT_LOCK(new_object);
 			goto retry;
@@ -1506,11 +1504,8 @@ vm_object_backing_scan(vm_object_t objec
 				}
 			} else if (op & OBSC_COLLAPSE_WAIT) {
 				if ((p->oflags & VPO_BUSY) || p->busy) {
-					vm_page_lock_queues();
-					vm_page_flag_set(p, PG_REFERENCED);
-					vm_page_unlock_queues();
 					VM_OBJECT_UNLOCK(object);
-					p->oflags |= VPO_WANTED;
+					p->oflags |= VPO_REFERENCED | VPO_WANTED;
 					msleep(p, VM_OBJECT_MTX(backing_object),
 					    PDROP | PVM, "vmocol", 0);
 					VM_OBJECT_LOCK(object);

Modified: user/alc/pagelock/sys/vm/vm_page.c
==============================================================================
--- user/alc/pagelock/sys/vm/vm_page.c	Wed Feb 18 06:33:10 2009	(r188746)
+++ user/alc/pagelock/sys/vm/vm_page.c	Wed Feb 18 06:43:03 2009	(r188747)
@@ -542,10 +542,8 @@ vm_page_sleep(vm_page_t m, const char *m
 {
 
 	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
-	if (!mtx_owned(&vm_page_queue_mtx))
-		vm_page_lock_queues();
-	vm_page_flag_set(m, PG_REFERENCED);
-	vm_page_unlock_queues();
+	if (mtx_owned(&vm_page_queue_mtx))
+		vm_page_unlock_queues();
 
 	/*
 	 * It's possible that while we sleep, the page will get
@@ -554,7 +552,7 @@ vm_page_sleep(vm_page_t m, const char *m
 	 * such that even if m->object changes, we can re-lock
 	 * it.
 	 */
-	m->oflags |= VPO_WANTED;
+	m->oflags |= VPO_REFERENCED | VPO_WANTED;
 	msleep(m, VM_OBJECT_MTX(m->object), PVM, msg, 0);
 }
 
@@ -1760,7 +1758,7 @@ vm_page_dontneed(vm_page_t m)
 	 * Clear any references to the page.  Otherwise, the page daemon will
 	 * immediately reactivate the page.
 	 */
-	vm_page_flag_clear(m, PG_REFERENCED);
+	m->oflags &= ~VPO_REFERENCED;
 	pmap_clear_reference(m);
 
 	if (m->dirty == 0 && pmap_is_modified(m))

Modified: user/alc/pagelock/sys/vm/vm_page.h
==============================================================================
--- user/alc/pagelock/sys/vm/vm_page.h	Wed Feb 18 06:33:10 2009	(r188746)
+++ user/alc/pagelock/sys/vm/vm_page.h	Wed Feb 18 06:43:03 2009	(r188747)
@@ -146,6 +146,7 @@ struct vm_page {
  */
 #define	VPO_BUSY	0x0001	/* page is in transit */
 #define	VPO_WANTED	0x0002	/* someone is waiting for page */
+#define	VPO_REFERENCED	0x0080	/* page has been referenced */
 #define	VPO_CLEANCHK	0x0100	/* page will be checked for cleaning */
 #define	VPO_SWAPINPROG	0x0200	/* swap I/O in progress on page */
 #define	VPO_NOSYNC	0x0400	/* do not collect for syncer */
@@ -192,7 +193,6 @@ extern struct mtx vm_page_queue_free_mtx
 #define	PG_FICTITIOUS	0x0008		/* physical page doesn't exist (O) */
 #define	PG_WRITEABLE	0x0010		/* page is mapped writeable */
 #define	PG_ZERO		0x0040		/* page is zeroed */
-#define PG_REFERENCED	0x0080		/* page has been referenced */
 #define PG_UNMANAGED	0x0800		/* No PV management for page */
 #define PG_MARKER	0x1000		/* special queue marker page */
 #define	PG_SLAB		0x2000		/* object pointer is actually a slab */

Modified: user/alc/pagelock/sys/vm/vm_pageout.c
==============================================================================
--- user/alc/pagelock/sys/vm/vm_pageout.c	Wed Feb 18 06:33:10 2009	(r188746)
+++ user/alc/pagelock/sys/vm/vm_pageout.c	Wed Feb 18 06:43:03 2009	(r188747)
@@ -551,17 +551,17 @@ vm_pageout_object_deactivate_pages(pmap,
 			}
 			actcount = pmap_ts_referenced(p);
 			if (actcount) {
-				vm_page_flag_set(p, PG_REFERENCED);
-			} else if (p->flags & PG_REFERENCED) {
+				p->oflags |= VPO_REFERENCED;
+			} else if (p->oflags & VPO_REFERENCED) {
 				actcount = 1;
 			}
 			if ((p->queue != PQ_ACTIVE) &&
-				(p->flags & PG_REFERENCED)) {
+			    (p->oflags & VPO_REFERENCED)) {
 				vm_page_activate(p);
 				p->act_count += actcount;
-				vm_page_flag_clear(p, PG_REFERENCED);
+				p->oflags &= ~VPO_REFERENCED;
 			} else if (p->queue == PQ_ACTIVE) {
-				if ((p->flags & PG_REFERENCED) == 0) {
+				if ((p->oflags & VPO_REFERENCED) == 0) {
 					p->act_count -= min(p->act_count, ACT_DECLINE);
 					if (!remove_mode && (vm_pageout_algorithm || (p->act_count == 0))) {
 						pmap_remove_all(p);
@@ -571,7 +571,7 @@ vm_pageout_object_deactivate_pages(pmap,
 					}
 				} else {
 					vm_page_activate(p);
-					vm_page_flag_clear(p, PG_REFERENCED);
+					p->oflags &= ~VPO_REFERENCED;
 					if (p->act_count < (ACT_MAX - ACT_ADVANCE))
 						p->act_count += ACT_ADVANCE;
 					vm_page_requeue(p);
@@ -785,7 +785,7 @@ rescan0:
 		 * references.
 		 */
 		if (object->ref_count == 0) {
-			vm_page_flag_clear(m, PG_REFERENCED);
+			m->oflags &= ~VPO_REFERENCED;
 			pmap_clear_reference(m);
 
 		/*
@@ -797,7 +797,7 @@ rescan0:
 		 * level VM system not knowing anything about existing 
 		 * references.
 		 */
-		} else if (((m->flags & PG_REFERENCED) == 0) &&
+		} else if ((m->oflags & VPO_REFERENCED) == 0 &&
 			(actcount = pmap_ts_referenced(m))) {
 			vm_page_activate(m);
 			VM_OBJECT_UNLOCK(object);
@@ -811,8 +811,8 @@ rescan0:
 		 * "activation count" higher than normal so that we will less 
 		 * likely place pages back onto the inactive queue again.
 		 */
-		if ((m->flags & PG_REFERENCED) != 0) {
-			vm_page_flag_clear(m, PG_REFERENCED);
+		if ((m->oflags & VPO_REFERENCED) != 0) {
+			m->oflags &= ~VPO_REFERENCED;
 			actcount = pmap_ts_referenced(m);
 			vm_page_activate(m);
 			VM_OBJECT_UNLOCK(object);
@@ -1091,7 +1091,7 @@ unlock_and_continue:
 		 */
 		actcount = 0;
 		if (object->ref_count != 0) {
-			if (m->flags & PG_REFERENCED) {
+			if (m->oflags & VPO_REFERENCED) {
 				actcount += 1;
 			}
 			actcount += pmap_ts_referenced(m);
@@ -1105,7 +1105,7 @@ unlock_and_continue:
 		/*
 		 * Since we have "tested" this bit, we need to clear it now.
 		 */
-		vm_page_flag_clear(m, PG_REFERENCED);
+		m->oflags &= ~VPO_REFERENCED;
 
 		/*
 		 * Only if an object is currently being used, do we use the
@@ -1329,8 +1329,8 @@ vm_pageout_page_stats()
 		}
 
 		actcount = 0;
-		if (m->flags & PG_REFERENCED) {
-			vm_page_flag_clear(m, PG_REFERENCED);
+		if (m->oflags & VPO_REFERENCED) {
+			m->oflags &= ~VPO_REFERENCED;
 			actcount += 1;
 		}
 

From owner-svn-src-user@FreeBSD.ORG  Wed Feb 18 07:09:53 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5DFD51065675;
	Wed, 18 Feb 2009 07:09:53 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 44F778FC08;
	Wed, 18 Feb 2009 07:09:53 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1I79rv4049734;
	Wed, 18 Feb 2009 07:09:53 GMT
	(envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1I79qQY049709;
	Wed, 18 Feb 2009 07:09:52 GMT
	(envelope-from lstewart@svn.freebsd.org)
Message-Id: <200902180709.n1I79qQY049709@svn.freebsd.org>
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Wed, 18 Feb 2009 07:09:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188748 - in user/lstewart/alq_varlen_8.x: . bin/cat
	bin/chio bin/chmod bin/cp bin/dd bin/df bin/kenv bin/ln
	bin/pax bin/ps bin/rcp bin/sh bin/test cddl
	cddl/compat/opensolaris/include ...
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Feb 2009 07:09:53 -0000

Author: lstewart
Date: Wed Feb 18 07:09:47 2009
New Revision: 188748
URL: http://svn.freebsd.org/changeset/base/188748

Log:
  Merge r184065:188705 from head.

Added:
  user/lstewart/alq_varlen_8.x/cddl/compat/opensolaris/include/libshare.h
     - copied unchanged from r188705, head/cddl/compat/opensolaris/include/libshare.h
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/cmd/zinject/
     - copied from r188705, head/cddl/contrib/opensolaris/cmd/zinject/
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
     - copied unchanged from r188705, head/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c
  user/lstewart/alq_varlen_8.x/cddl/usr.bin/zinject/
     - copied from r188705, head/cddl/usr.bin/zinject/
  user/lstewart/alq_varlen_8.x/contrib/bind9/aclocal.m4
     - copied unchanged from r188705, head/contrib/bind9/aclocal.m4
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/nsupdate/nsupdate.1
     - copied unchanged from r188705, head/contrib/bind9/bin/nsupdate/nsupdate.1
  user/lstewart/alq_varlen_8.x/contrib/bind9/config.h.in
     - copied unchanged from r188705, head/contrib/bind9/config.h.in
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/misc/sort-options.pl
     - copied unchanged from r188705, head/contrib/bind9/doc/misc/sort-options.pl
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/rfc/rfc4648.txt
     - copied unchanged from r188705, head/contrib/bind9/doc/rfc/rfc4648.txt
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/rfc/rfc4701.txt
     - copied unchanged from r188705, head/contrib/bind9/doc/rfc/rfc4701.txt
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/rfc/rfc5155.txt
     - copied unchanged from r188705, head/contrib/bind9/doc/rfc/rfc5155.txt
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/aclocal.m4
     - copied unchanged from r188705, head/contrib/bind9/lib/bind/aclocal.m4
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/config.h.in
     - copied unchanged from r188705, head/contrib/bind9/lib/bind/config.h.in
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/include/isc/platform.h.in
     - copied unchanged from r188705, head/contrib/bind9/lib/bind/include/isc/platform.h.in
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/include/isc/portset.h
     - copied unchanged from r188705, head/contrib/bind9/lib/isc/include/isc/portset.h
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/portset.c
     - copied unchanged from r188705, head/contrib/bind9/lib/isc/portset.c
  user/lstewart/alq_varlen_8.x/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh
     - copied unchanged from r188705, head/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh
  user/lstewart/alq_varlen_8.x/contrib/csup/lex.rcs.c
     - copied unchanged from r188705, head/contrib/csup/lex.rcs.c
  user/lstewart/alq_varlen_8.x/contrib/csup/rcsfile.c
     - copied unchanged from r188705, head/contrib/csup/rcsfile.c
  user/lstewart/alq_varlen_8.x/contrib/csup/rcsfile.h
     - copied unchanged from r188705, head/contrib/csup/rcsfile.h
  user/lstewart/alq_varlen_8.x/contrib/csup/rcsparse.c
     - copied unchanged from r188705, head/contrib/csup/rcsparse.c
  user/lstewart/alq_varlen_8.x/contrib/csup/rcsparse.h
     - copied unchanged from r188705, head/contrib/csup/rcsparse.h
  user/lstewart/alq_varlen_8.x/contrib/csup/rcstokenizer.h
     - copied unchanged from r188705, head/contrib/csup/rcstokenizer.h
  user/lstewart/alq_varlen_8.x/contrib/csup/rcstokenizer.l
     - copied unchanged from r188705, head/contrib/csup/rcstokenizer.l
  user/lstewart/alq_varlen_8.x/contrib/csup/rsyncfile.c
     - copied unchanged from r188705, head/contrib/csup/rsyncfile.c
  user/lstewart/alq_varlen_8.x/contrib/csup/rsyncfile.h
     - copied unchanged from r188705, head/contrib/csup/rsyncfile.h
  user/lstewart/alq_varlen_8.x/contrib/file/AUTHORS
     - copied unchanged from r188705, head/contrib/file/AUTHORS
  user/lstewart/alq_varlen_8.x/contrib/file/COPYING
     - copied unchanged from r188705, head/contrib/file/COPYING
  user/lstewart/alq_varlen_8.x/contrib/file/INSTALL
     - copied unchanged from r188705, head/contrib/file/INSTALL
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/clarion
     - copied unchanged from r188705, head/contrib/file/Magdir/clarion
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/erlang
     - copied unchanged from r188705, head/contrib/file/Magdir/erlang
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/gnome-keyring
     - copied unchanged from r188705, head/contrib/file/Magdir/gnome-keyring
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/gnumeric
     - copied unchanged from r188705, head/contrib/file/Magdir/gnumeric
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/graphviz
     - copied unchanged from r188705, head/contrib/file/Magdir/graphviz
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/inform
     - copied unchanged from r188705, head/contrib/file/Magdir/inform
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/kde
     - copied unchanged from r188705, head/contrib/file/Magdir/kde
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/llvm
     - copied unchanged from r188705, head/contrib/file/Magdir/llvm
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/lua
     - copied unchanged from r188705, head/contrib/file/Magdir/lua
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/luks
     - copied unchanged from r188705, head/contrib/file/Magdir/luks
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/mathcad
     - copied unchanged from r188705, head/contrib/file/Magdir/mathcad
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/mercurial
     - copied unchanged from r188705, head/contrib/file/Magdir/mercurial
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/mozilla
     - copied unchanged from r188705, head/contrib/file/Magdir/mozilla
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/netware
     - copied unchanged from r188705, head/contrib/file/Magdir/netware
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/ole2compounddocs
     - copied unchanged from r188705, head/contrib/file/Magdir/ole2compounddocs
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/ruby
     - copied unchanged from r188705, head/contrib/file/Magdir/ruby
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/securitycerts
     - copied unchanged from r188705, head/contrib/file/Magdir/securitycerts
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/warc
     - copied unchanged from r188705, head/contrib/file/Magdir/warc
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/weak
     - copied unchanged from r188705, head/contrib/file/Magdir/weak
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/windows
     - copied unchanged from r188705, head/contrib/file/Magdir/windows
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/xilinx
     - copied unchanged from r188705, head/contrib/file/Magdir/xilinx
  user/lstewart/alq_varlen_8.x/contrib/file/NEWS
     - copied unchanged from r188705, head/contrib/file/NEWS
  user/lstewart/alq_varlen_8.x/contrib/file/TODO
     - copied unchanged from r188705, head/contrib/file/TODO
  user/lstewart/alq_varlen_8.x/contrib/file/asprintf.c
     - copied unchanged from r188705, head/contrib/file/asprintf.c
  user/lstewart/alq_varlen_8.x/contrib/file/compile
     - copied unchanged from r188705, head/contrib/file/compile
  user/lstewart/alq_varlen_8.x/contrib/file/config.guess
     - copied unchanged from r188705, head/contrib/file/config.guess
  user/lstewart/alq_varlen_8.x/contrib/file/config.sub
     - copied unchanged from r188705, head/contrib/file/config.sub
  user/lstewart/alq_varlen_8.x/contrib/file/configure.ac
     - copied unchanged from r188705, head/contrib/file/configure.ac
  user/lstewart/alq_varlen_8.x/contrib/file/elfclass.h
     - copied unchanged from r188705, head/contrib/file/elfclass.h
  user/lstewart/alq_varlen_8.x/contrib/file/getopt_long.c
     - copied unchanged from r188705, head/contrib/file/getopt_long.c
  user/lstewart/alq_varlen_8.x/contrib/file/mygetopt.h
     - copied unchanged from r188705, head/contrib/file/mygetopt.h
  user/lstewart/alq_varlen_8.x/contrib/file/tests/
     - copied from r188705, head/contrib/file/tests/
  user/lstewart/alq_varlen_8.x/contrib/file/vasprintf.c
     - copied unchanged from r188705, head/contrib/file/vasprintf.c
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/gdtoa_fltrnds.h
     - copied unchanged from r188705, head/contrib/gdtoa/gdtoa_fltrnds.h
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/test/obad/
     - copied from r188705, head/contrib/gdtoa/test/obad/
  user/lstewart/alq_varlen_8.x/contrib/ncurses/man/curs_memleaks.3x
     - copied unchanged from r188705, head/contrib/ncurses/man/curs_memleaks.3x
  user/lstewart/alq_varlen_8.x/contrib/ncurses/misc/ncurses.supp
     - copied unchanged from r188705, head/contrib/ncurses/misc/ncurses.supp
  user/lstewart/alq_varlen_8.x/contrib/openbsm/CREDITS
     - copied unchanged from r188705, head/contrib/openbsm/CREDITS
  user/lstewart/alq_varlen_8.x/contrib/openbsm/INSTALL
     - copied unchanged from r188705, head/contrib/openbsm/INSTALL
  user/lstewart/alq_varlen_8.x/contrib/openbsm/NEWS
     - copied unchanged from r188705, head/contrib/openbsm/NEWS
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditd/audit_triggers.defs
     - copied unchanged from r188705, head/contrib/openbsm/bin/auditd/audit_triggers.defs
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditd/auditd_control.defs
     - copied unchanged from r188705, head/contrib/openbsm/bin/auditd/auditd_control.defs
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditd/auditd_darwin.c
     - copied unchanged from r188705, head/contrib/openbsm/bin/auditd/auditd_darwin.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditd/auditd_fbsd.c
     - copied unchanged from r188705, head/contrib/openbsm/bin/auditd/auditd_fbsd.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bsm/auditd_lib.h
     - copied unchanged from r188705, head/contrib/openbsm/bsm/auditd_lib.h
  user/lstewart/alq_varlen_8.x/contrib/openbsm/compat/strlcpy.h
     - copied unchanged from r188705, head/contrib/openbsm/compat/strlcpy.h
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libauditd/
     - copied from r188705, head/contrib/openbsm/libauditd/
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/au_domain.3
     - copied unchanged from r188705, head/contrib/openbsm/libbsm/au_domain.3
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/au_errno.3
     - copied unchanged from r188705, head/contrib/openbsm/libbsm/au_errno.3
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/au_socket_type.3
     - copied unchanged from r188705, head/contrib/openbsm/libbsm/au_socket_type.3
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/bsm_domain.c
     - copied unchanged from r188705, head/contrib/openbsm/libbsm/bsm_domain.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/bsm_errno.c
     - copied unchanged from r188705, head/contrib/openbsm/libbsm/bsm_errno.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/bsm_socket_type.c
     - copied unchanged from r188705, head/contrib/openbsm/libbsm/bsm_socket_type.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/sys/
     - copied from r188705, head/contrib/openbsm/sys/
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/E2BIG_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/E2BIG_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/EACCES_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/EACCES_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/EBADF_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/EBADF_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/EBUSY_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/EBUSY_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/ECHILD_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/ECHILD_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/EDEADLK_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/EDEADLK_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/EEXIST_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/EEXIST_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/EFAULT_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/EFAULT_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/EFBIG_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/EFBIG_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/EINTR_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/EINTR_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/EINVAL_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/EINVAL_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/EIO_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/EIO_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/EISDIR_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/EISDIR_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/EMFILE_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/EMFILE_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/EMLINK_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/EMLINK_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/ENFILE_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/ENFILE_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/ENODEV_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/ENODEV_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/ENOENT_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/ENOENT_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/ENOEXEC_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/ENOEXEC_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/ENOMEM_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/ENOMEM_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/ENOSPC_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/ENOSPC_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/ENOTBLK_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/ENOTBLK_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/ENOTDIR_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/ENOTDIR_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/ENOTTY_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/ENOTTY_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/ENXIO_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/ENXIO_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/EPERM_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/EPERM_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/EPIPE_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/EPIPE_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/EROFS_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/EROFS_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/ESPIPE_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/ESPIPE_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/ESRCH_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/ESRCH_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/ETXTBSY_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/ETXTBSY_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/EXDEV_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/EXDEV_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/socketex_record
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/socketex_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/socketex_token
     - copied unchanged from r188705, head/contrib/openbsm/test/reference/socketex_token
  user/lstewart/alq_varlen_8.x/etc/devd/
     - copied from r188705, head/etc/devd/
  user/lstewart/alq_varlen_8.x/etc/rc.d/gssd
     - copied unchanged from r188705, head/etc/rc.d/gssd
  user/lstewart/alq_varlen_8.x/gnu/usr.bin/binutils/as/mips-freebsd/
     - copied from r188705, head/gnu/usr.bin/binutils/as/mips-freebsd/
  user/lstewart/alq_varlen_8.x/gnu/usr.bin/binutils/ld/Makefile.mips
     - copied unchanged from r188705, head/gnu/usr.bin/binutils/ld/Makefile.mips
  user/lstewart/alq_varlen_8.x/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh
     - copied unchanged from r188705, head/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh
  user/lstewart/alq_varlen_8.x/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh
     - copied unchanged from r188705, head/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh
  user/lstewart/alq_varlen_8.x/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh
     - copied unchanged from r188705, head/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh
  user/lstewart/alq_varlen_8.x/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh
     - copied unchanged from r188705, head/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh
  user/lstewart/alq_varlen_8.x/gnu/usr.bin/binutils/libbfd/Makefile.mips
     - copied unchanged from r188705, head/gnu/usr.bin/binutils/libbfd/Makefile.mips
  user/lstewart/alq_varlen_8.x/gnu/usr.bin/binutils/libopcodes/Makefile.mips
     - copied unchanged from r188705, head/gnu/usr.bin/binutils/libopcodes/Makefile.mips
  user/lstewart/alq_varlen_8.x/gnu/usr.bin/gdb/gdbserver/fbsd-arm-low.c
     - copied unchanged from r188705, head/gnu/usr.bin/gdb/gdbserver/fbsd-arm-low.c
  user/lstewart/alq_varlen_8.x/gnu/usr.bin/gdb/gdbserver/reg-arm.c
     - copied unchanged from r188705, head/gnu/usr.bin/gdb/gdbserver/reg-arm.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_compat_bzip2.c
     - copied unchanged from r188705, head/lib/libarchive/test/test_compat_bzip2.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_compat_bzip2_1.tbz.uu
     - copied unchanged from r188705, head/lib/libarchive/test/test_compat_bzip2_1.tbz.uu
  user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_compat_bzip2_2.tbz.uu
     - copied unchanged from r188705, head/lib/libarchive/test/test_compat_bzip2_2.tbz.uu
  user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_compat_gzip.c
     - copied unchanged from r188705, head/lib/libarchive/test/test_compat_gzip.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_compat_gzip_1.tgz.uu
     - copied unchanged from r188705, head/lib/libarchive/test/test_compat_gzip_1.tgz.uu
  user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_compat_gzip_2.tgz.uu
     - copied unchanged from r188705, head/lib/libarchive/test/test_compat_gzip_2.tgz.uu
  user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_fuzz.c
     - copied unchanged from r188705, head/lib/libarchive/test/test_fuzz.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_fuzz_1.iso.uu
     - copied unchanged from r188705, head/lib/libarchive/test/test_fuzz_1.iso.uu
  user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_write_disk_failures.c
     - copied unchanged from r188705, head/lib/libarchive/test/test_write_disk_failures.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_write_disk_sparse.c
     - copied unchanged from r188705, head/lib/libarchive/test/test_write_disk_sparse.c
  user/lstewart/alq_varlen_8.x/lib/libauditd/
     - copied from r188705, head/lib/libauditd/
  user/lstewart/alq_varlen_8.x/lib/libc/gen/fdevname.c
     - copied unchanged from r188705, head/lib/libc/gen/fdevname.c
  user/lstewart/alq_varlen_8.x/lib/libc/include/isc/platform.h
     - copied unchanged from r188705, head/lib/libc/include/isc/platform.h
  user/lstewart/alq_varlen_8.x/lib/libc/stdio/printfcommon.h
     - copied unchanged from r188705, head/lib/libc/stdio/printfcommon.h
  user/lstewart/alq_varlen_8.x/lib/libc/string/ffsll.c
     - copied unchanged from r188705, head/lib/libc/string/ffsll.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/flsll.c
     - copied unchanged from r188705, head/lib/libc/string/flsll.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/strndup.c
     - copied unchanged from r188705, head/lib/libc/string/strndup.c
  user/lstewart/alq_varlen_8.x/lib/libelf/README
     - copied unchanged from r188705, head/lib/libelf/README
  user/lstewart/alq_varlen_8.x/lib/libkvm/kvm_minidump_arm.c
     - copied unchanged from r188705, head/lib/libkvm/kvm_minidump_arm.c
  user/lstewart/alq_varlen_8.x/lib/libpmc/libpmcinternal.h
     - copied unchanged from r188705, head/lib/libpmc/libpmcinternal.h
  user/lstewart/alq_varlen_8.x/lib/libusb20/
     - copied from r188705, head/lib/libusb20/
  user/lstewart/alq_varlen_8.x/lib/libusbhid/descr_compat.c
     - copied unchanged from r188705, head/lib/libusbhid/descr_compat.c
  user/lstewart/alq_varlen_8.x/lib/libutil/kinfo_getfile.3
     - copied unchanged from r188705, head/lib/libutil/kinfo_getfile.3
  user/lstewart/alq_varlen_8.x/lib/libutil/kinfo_getfile.c
     - copied unchanged from r188705, head/lib/libutil/kinfo_getfile.c
  user/lstewart/alq_varlen_8.x/lib/libutil/kinfo_getvmmap.3
     - copied unchanged from r188705, head/lib/libutil/kinfo_getvmmap.3
  user/lstewart/alq_varlen_8.x/lib/libutil/kinfo_getvmmap.c
     - copied unchanged from r188705, head/lib/libutil/kinfo_getvmmap.c
  user/lstewart/alq_varlen_8.x/sbin/ipfw/altq.c
     - copied unchanged from r188705, head/sbin/ipfw/altq.c
  user/lstewart/alq_varlen_8.x/sbin/ipfw/dummynet.c
     - copied unchanged from r188705, head/sbin/ipfw/dummynet.c
  user/lstewart/alq_varlen_8.x/sbin/ipfw/ipfw2.h
     - copied unchanged from r188705, head/sbin/ipfw/ipfw2.h
  user/lstewart/alq_varlen_8.x/sbin/ipfw/ipv6.c
     - copied unchanged from r188705, head/sbin/ipfw/ipv6.c
  user/lstewart/alq_varlen_8.x/sbin/ipfw/main.c
     - copied unchanged from r188705, head/sbin/ipfw/main.c
  user/lstewart/alq_varlen_8.x/sbin/ipfw/nat.c
     - copied unchanged from r188705, head/sbin/ipfw/nat.c
  user/lstewart/alq_varlen_8.x/share/man/man4/ale.4
     - copied unchanged from r188705, head/share/man/man4/ale.4
  user/lstewart/alq_varlen_8.x/share/man/man4/man4.arm/mge.4
     - copied unchanged from r188705, head/share/man/man4/man4.arm/mge.4
  user/lstewart/alq_varlen_8.x/share/man/man4/man4.powerpc/pmu.4
     - copied unchanged from r188705, head/share/man/man4/man4.powerpc/pmu.4
  user/lstewart/alq_varlen_8.x/share/man/man4/man4.powerpc/snd_ai2s.4
     - copied unchanged from r188705, head/share/man/man4/man4.powerpc/snd_ai2s.4
  user/lstewart/alq_varlen_8.x/share/man/man4/man4.powerpc/snd_davbus.4
     - copied unchanged from r188705, head/share/man/man4/man4.powerpc/snd_davbus.4
  user/lstewart/alq_varlen_8.x/share/man/man4/ng_ether_echo.4
     - copied unchanged from r188705, head/share/man/man4/ng_ether_echo.4
  user/lstewart/alq_varlen_8.x/share/man/man4/sdhci.4
     - copied unchanged from r188705, head/share/man/man4/sdhci.4
  user/lstewart/alq_varlen_8.x/share/man/man4/urtw.4
     - copied unchanged from r188705, head/share/man/man4/urtw.4
  user/lstewart/alq_varlen_8.x/share/man/man4/usb2_bluetooth.4
     - copied unchanged from r188705, head/share/man/man4/usb2_bluetooth.4
  user/lstewart/alq_varlen_8.x/share/man/man4/usb2_controller.4
     - copied unchanged from r188705, head/share/man/man4/usb2_controller.4
  user/lstewart/alq_varlen_8.x/share/man/man4/usb2_core.4
     - copied unchanged from r188705, head/share/man/man4/usb2_core.4
  user/lstewart/alq_varlen_8.x/share/man/man4/usb2_ethernet.4
     - copied unchanged from r188705, head/share/man/man4/usb2_ethernet.4
  user/lstewart/alq_varlen_8.x/share/man/man4/usb2_image.4
     - copied unchanged from r188705, head/share/man/man4/usb2_image.4
  user/lstewart/alq_varlen_8.x/share/man/man4/usb2_input.4
     - copied unchanged from r188705, head/share/man/man4/usb2_input.4
  user/lstewart/alq_varlen_8.x/share/man/man4/usb2_misc.4
     - copied unchanged from r188705, head/share/man/man4/usb2_misc.4
  user/lstewart/alq_varlen_8.x/share/man/man4/usb2_ndis.4
     - copied unchanged from r188705, head/share/man/man4/usb2_ndis.4
  user/lstewart/alq_varlen_8.x/share/man/man4/usb2_quirk.4
     - copied unchanged from r188705, head/share/man/man4/usb2_quirk.4
  user/lstewart/alq_varlen_8.x/share/man/man4/usb2_serial.4
     - copied unchanged from r188705, head/share/man/man4/usb2_serial.4
  user/lstewart/alq_varlen_8.x/share/man/man4/usb2_sound.4
     - copied unchanged from r188705, head/share/man/man4/usb2_sound.4
  user/lstewart/alq_varlen_8.x/share/man/man4/usb2_storage.4
     - copied unchanged from r188705, head/share/man/man4/usb2_storage.4
  user/lstewart/alq_varlen_8.x/share/man/man4/usb2_template.4
     - copied unchanged from r188705, head/share/man/man4/usb2_template.4
  user/lstewart/alq_varlen_8.x/share/man/man4/usb2_wlan.4
     - copied unchanged from r188705, head/share/man/man4/usb2_wlan.4
  user/lstewart/alq_varlen_8.x/share/man/man5/portindex.5
     - copied unchanged from r188705, head/share/man/man5/portindex.5
  user/lstewart/alq_varlen_8.x/share/man/man7/adding_user.7
     - copied unchanged from r188705, head/share/man/man7/adding_user.7
  user/lstewart/alq_varlen_8.x/share/man/man9/VOP_VPTOCNP.9
     - copied unchanged from r188705, head/share/man/man9/VOP_VPTOCNP.9
  user/lstewart/alq_varlen_8.x/sys/amd64/conf/USB2
     - copied unchanged from r188705, head/sys/amd64/conf/USB2
  user/lstewart/alq_varlen_8.x/sys/arm/arm/cpufunc_asm_sheeva.S
     - copied unchanged from r188705, head/sys/arm/arm/cpufunc_asm_sheeva.S
  user/lstewart/alq_varlen_8.x/sys/arm/arm/minidump_machdep.c
     - copied unchanged from r188705, head/sys/arm/arm/minidump_machdep.c
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91_machdep.c
     - copied unchanged from r188705, head/sys/arm/at91/at91_machdep.c
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91board.h
     - copied unchanged from r188705, head/sys/arm/at91/at91board.h
  user/lstewart/alq_varlen_8.x/sys/arm/at91/board_bwct.c
     - copied unchanged from r188705, head/sys/arm/at91/board_bwct.c
  user/lstewart/alq_varlen_8.x/sys/arm/at91/board_hl200.c
     - copied unchanged from r188705, head/sys/arm/at91/board_hl200.c
  user/lstewart/alq_varlen_8.x/sys/arm/at91/board_kb920x.c
     - copied unchanged from r188705, head/sys/arm/at91/board_kb920x.c
  user/lstewart/alq_varlen_8.x/sys/arm/at91/board_tsc4370.c
     - copied unchanged from r188705, head/sys/arm/at91/board_tsc4370.c
  user/lstewart/alq_varlen_8.x/sys/arm/at91/std.bwct
     - copied unchanged from r188705, head/sys/arm/at91/std.bwct
  user/lstewart/alq_varlen_8.x/sys/arm/at91/std.hl200
     - copied unchanged from r188705, head/sys/arm/at91/std.hl200
  user/lstewart/alq_varlen_8.x/sys/arm/at91/std.tsc4370
     - copied unchanged from r188705, head/sys/arm/at91/std.tsc4370
  user/lstewart/alq_varlen_8.x/sys/arm/conf/CAMBRIA
     - copied unchanged from r188705, head/sys/arm/conf/CAMBRIA
  user/lstewart/alq_varlen_8.x/sys/arm/conf/CAMBRIA.hints
     - copied unchanged from r188705, head/sys/arm/conf/CAMBRIA.hints
  user/lstewart/alq_varlen_8.x/sys/arm/conf/DEFAULTS
     - copied unchanged from r188705, head/sys/arm/conf/DEFAULTS
  user/lstewart/alq_varlen_8.x/sys/arm/include/minidump.h
     - copied unchanged from r188705, head/sys/arm/include/minidump.h
  user/lstewart/alq_varlen_8.x/sys/arm/mv/mv_pci.c
     - copied unchanged from r188705, head/sys/arm/mv/mv_pci.c
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/cambria_fled.c
     - copied unchanged from r188705, head/sys/arm/xscale/ixp425/cambria_fled.c
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/cambria_led.c
     - copied unchanged from r188705, head/sys/arm/xscale/ixp425/cambria_led.c
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/std.ixp435
     - copied unchanged from r188705, head/sys/arm/xscale/ixp425/std.ixp435
  user/lstewart/alq_varlen_8.x/sys/boot/i386/gptzfsboot/
     - copied from r188705, head/sys/boot/i386/gptzfsboot/
  user/lstewart/alq_varlen_8.x/sys/boot/i386/zfsboot/
     - copied from r188705, head/sys/boot/i386/zfsboot/
  user/lstewart/alq_varlen_8.x/sys/boot/zfs/
     - copied from r188705, head/sys/boot/zfs/
  user/lstewart/alq_varlen_8.x/sys/bsm/audit_domain.h
     - copied unchanged from r188705, head/sys/bsm/audit_domain.h
  user/lstewart/alq_varlen_8.x/sys/bsm/audit_errno.h
     - copied unchanged from r188705, head/sys/bsm/audit_errno.h
  user/lstewart/alq_varlen_8.x/sys/bsm/audit_socket_type.h
     - copied unchanged from r188705, head/sys/bsm/audit_socket_type.h
  user/lstewart/alq_varlen_8.x/sys/cddl/boot/
     - copied from r188705, head/sys/cddl/boot/
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c
     - copied unchanged from r188705, head/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/file.h
     - copied unchanged from r188705, head/sys/cddl/compat/opensolaris/sys/file.h
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/kidmap.h
     - copied unchanged from r188705, head/sys/cddl/compat/opensolaris/sys/kidmap.h
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/pathname.h
     - copied unchanged from r188705, head/sys/cddl/compat/opensolaris/sys/pathname.h
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/refstr.h
     - copied unchanged from r188705, head/sys/cddl/compat/opensolaris/sys/refstr.h
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/sid.h
     - copied unchanged from r188705, head/sys/cddl/compat/opensolaris/sys/sid.h
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/sig.h
     - copied unchanged from r188705, head/sys/cddl/compat/opensolaris/sys/sig.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/common/unicode/
     - copied from r188705, head/sys/cddl/contrib/opensolaris/common/unicode/
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c
     - copied unchanged from r188705, head/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h
     - copied unchanged from r188705, head/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c
     - copied unchanged from r188705, head/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h
     - copied unchanged from r188705, head/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c
     - copied unchanged from r188705, head/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c
     - copied unchanged from r188705, head/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c
     - copied unchanged from r188705, head/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c
     - copied unchanged from r188705, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c
     - copied unchanged from r188705, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c
     - copied unchanged from r188705, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h
     - copied unchanged from r188705, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h
     - copied unchanged from r188705, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h
     - copied unchanged from r188705, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h
     - copied unchanged from r188705, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c
     - copied unchanged from r188705, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h
     - copied unchanged from r188705, head/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h
     - copied unchanged from r188705, head/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/extdirent.h
     - copied unchanged from r188705, head/sys/cddl/contrib/opensolaris/uts/common/sys/extdirent.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/idmap.h
     - copied unchanged from r188705, head/sys/cddl/contrib/opensolaris/uts/common/sys/idmap.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/
     - copied from r188705, head/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep.h
     - copied unchanged from r188705, head/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep_data.h
     - copied unchanged from r188705, head/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep_data.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h
     - copied unchanged from r188705, head/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h
  user/lstewart/alq_varlen_8.x/sys/dev/adb/
     - copied from r188705, head/sys/dev/adb/
  user/lstewart/alq_varlen_8.x/sys/dev/ale/
     - copied from r188705, head/sys/dev/ale/
  user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_hal/
     - copied from r188705, head/sys/dev/ath/ath_hal/
  user/lstewart/alq_varlen_8.x/sys/dev/cfi/
     - copied from r188705, head/sys/dev/cfi/
  user/lstewart/alq_varlen_8.x/sys/dev/hwpmc/hwpmc_core.c
     - copied unchanged from r188705, head/sys/dev/hwpmc/hwpmc_core.c
  user/lstewart/alq_varlen_8.x/sys/dev/hwpmc/hwpmc_core.h
     - copied unchanged from r188705, head/sys/dev/hwpmc/hwpmc_core.h
  user/lstewart/alq_varlen_8.x/sys/dev/hwpmc/hwpmc_intel.c
     - copied unchanged from r188705, head/sys/dev/hwpmc/hwpmc_intel.c
  user/lstewart/alq_varlen_8.x/sys/dev/hwpmc/hwpmc_tsc.c
     - copied unchanged from r188705, head/sys/dev/hwpmc/hwpmc_tsc.c
  user/lstewart/alq_varlen_8.x/sys/dev/hwpmc/hwpmc_tsc.h
     - copied unchanged from r188705, head/sys/dev/hwpmc/hwpmc_tsc.h
  user/lstewart/alq_varlen_8.x/sys/dev/mn/
     - copied from r188705, head/sys/dev/mn/
  user/lstewart/alq_varlen_8.x/sys/dev/ofw/ofw_if.m
     - copied unchanged from r188705, head/sys/dev/ofw/ofw_if.m
  user/lstewart/alq_varlen_8.x/sys/dev/ofw/ofw_iicbus.c
     - copied unchanged from r188705, head/sys/dev/ofw/ofw_iicbus.c
  user/lstewart/alq_varlen_8.x/sys/dev/ofw/ofw_standard.c
     - copied unchanged from r188705, head/sys/dev/ofw/ofw_standard.c
  user/lstewart/alq_varlen_8.x/sys/dev/ofw/ofwvar.h
     - copied unchanged from r188705, head/sys/dev/ofw/ofwvar.h
  user/lstewart/alq_varlen_8.x/sys/dev/sdhci/
     - copied from r188705, head/sys/dev/sdhci/
  user/lstewart/alq_varlen_8.x/sys/dev/sound/macio/
     - copied from r188705, head/sys/dev/sound/macio/
  user/lstewart/alq_varlen_8.x/sys/dev/syscons/scterm-teken.c
     - copied unchanged from r188705, head/sys/dev/syscons/scterm-teken.c
  user/lstewart/alq_varlen_8.x/sys/dev/syscons/teken/
     - copied from r188705, head/sys/dev/syscons/teken/
  user/lstewart/alq_varlen_8.x/sys/dev/usb/ehci_ddb.c
     - copied unchanged from r188705, head/sys/dev/usb/ehci_ddb.c
  user/lstewart/alq_varlen_8.x/sys/dev/usb/ehci_ixp4xx.c
     - copied unchanged from r188705, head/sys/dev/usb/ehci_ixp4xx.c
  user/lstewart/alq_varlen_8.x/sys/dev/usb/if_urtw.c
     - copied unchanged from r188705, head/sys/dev/usb/if_urtw.c
  user/lstewart/alq_varlen_8.x/sys/dev/usb/if_urtwreg.h
     - copied unchanged from r188705, head/sys/dev/usb/if_urtwreg.h
  user/lstewart/alq_varlen_8.x/sys/dev/usb/if_urtwvar.h
     - copied unchanged from r188705, head/sys/dev/usb/if_urtwvar.h
  user/lstewart/alq_varlen_8.x/sys/dev/usb2/
     - copied from r188705, head/sys/dev/usb2/
  user/lstewart/alq_varlen_8.x/sys/geom/part/g_part_ebr.c
     - copied unchanged from r188705, head/sys/geom/part/g_part_ebr.c
  user/lstewart/alq_varlen_8.x/sys/i386/conf/USB2
     - copied unchanged from r188705, head/sys/i386/conf/USB2
  user/lstewart/alq_varlen_8.x/sys/kern/kern_cons.c
     - copied unchanged from r188705, head/sys/kern/kern_cons.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_osd.c
     - copied unchanged from r188705, head/sys/kern/kern_osd.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_vimage.c
     - copied unchanged from r188705, head/sys/kern/kern_vimage.c
  user/lstewart/alq_varlen_8.x/sys/kern/subr_bufring.c
     - copied unchanged from r188705, head/sys/kern/subr_bufring.c
  user/lstewart/alq_varlen_8.x/sys/kgssapi/
     - copied from r188705, head/sys/kgssapi/
  user/lstewart/alq_varlen_8.x/sys/mips/conf/DEFAULTS
     - copied unchanged from r188705, head/sys/mips/conf/DEFAULTS
  user/lstewart/alq_varlen_8.x/sys/mips/mips/elf64_machdep.c
     - copied unchanged from r188705, head/sys/mips/mips/elf64_machdep.c
  user/lstewart/alq_varlen_8.x/sys/modules/ale/
     - copied from r188705, head/sys/modules/ale/
  user/lstewart/alq_varlen_8.x/sys/modules/amr/amr_cam/
     - copied from r188705, head/sys/modules/amr/amr_cam/
  user/lstewart/alq_varlen_8.x/sys/modules/geom/geom_part/geom_part_ebr/
     - copied from r188705, head/sys/modules/geom/geom_part/geom_part_ebr/
  user/lstewart/alq_varlen_8.x/sys/modules/kgssapi/
     - copied from r188705, head/sys/modules/kgssapi/
  user/lstewart/alq_varlen_8.x/sys/modules/kgssapi_krb5/
     - copied from r188705, head/sys/modules/kgssapi_krb5/
  user/lstewart/alq_varlen_8.x/sys/modules/netgraph/ether_echo/
     - copied from r188705, head/sys/modules/netgraph/ether_echo/
  user/lstewart/alq_varlen_8.x/sys/modules/sdhci/
     - copied from r188705, head/sys/modules/sdhci/
  user/lstewart/alq_varlen_8.x/sys/modules/sound/driver/ai2s/
     - copied from r188705, head/sys/modules/sound/driver/ai2s/
  user/lstewart/alq_varlen_8.x/sys/modules/sound/driver/davbus/
     - copied from r188705, head/sys/modules/sound/driver/davbus/
  user/lstewart/alq_varlen_8.x/sys/modules/urtw/
     - copied from r188705, head/sys/modules/urtw/
  user/lstewart/alq_varlen_8.x/sys/modules/usb2/
     - copied from r188705, head/sys/modules/usb2/
  user/lstewart/alq_varlen_8.x/sys/net/if_llatbl.c
     - copied unchanged from r188705, head/sys/net/if_llatbl.c
  user/lstewart/alq_varlen_8.x/sys/net/if_llatbl.h
     - copied unchanged from r188705, head/sys/net/if_llatbl.h
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_tdma.c
     - copied unchanged from r188705, head/sys/net80211/ieee80211_tdma.c
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_tdma.h
     - copied unchanged from r188705, head/sys/net80211/ieee80211_tdma.h
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_ether_echo.c
     - copied unchanged from r188705, head/sys/netgraph/ng_ether_echo.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_ether_echo.h
     - copied unchanged from r188705, head/sys/netgraph/ng_ether_echo.h
  user/lstewart/alq_varlen_8.x/sys/netinet/libalias/alias_sctp.c
     - copied unchanged from r188705, head/sys/netinet/libalias/alias_sctp.c
  user/lstewart/alq_varlen_8.x/sys/netinet/libalias/alias_sctp.h
     - copied unchanged from r188705, head/sys/netinet/libalias/alias_sctp.h
  user/lstewart/alq_varlen_8.x/sys/netinet/tcp_hostcache.h
     - copied unchanged from r188705, head/sys/netinet/tcp_hostcache.h
  user/lstewart/alq_varlen_8.x/sys/nfsclient/nfs_krpc.c
     - copied unchanged from r188705, head/sys/nfsclient/nfs_krpc.c
  user/lstewart/alq_varlen_8.x/sys/nfsserver/nfs_fha.c
     - copied unchanged from r188705, head/sys/nfsserver/nfs_fha.c
  user/lstewart/alq_varlen_8.x/sys/nfsserver/nfs_fha.h
     - copied unchanged from r188705, head/sys/nfsserver/nfs_fha.h
  user/lstewart/alq_varlen_8.x/sys/nfsserver/nfs_srvkrpc.c
     - copied unchanged from r188705, head/sys/nfsserver/nfs_srvkrpc.c
  user/lstewart/alq_varlen_8.x/sys/pc98/cbus/sctermvar.h
     - copied unchanged from r188705, head/sys/pc98/cbus/sctermvar.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/mpc85xx/lbc.c
     - copied unchanged from r188705, head/sys/powerpc/mpc85xx/lbc.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/mpc85xx/lbc.h
     - copied unchanged from r188705, head/sys/powerpc/mpc85xx/lbc.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/mpc85xx/mpc85xx.h
     - copied unchanged from r188705, head/sys/powerpc/mpc85xx/mpc85xx.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/powermac/cuda.c
     - copied unchanged from r188705, head/sys/powerpc/powermac/cuda.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/powermac/cudavar.h
     - copied unchanged from r188705, head/sys/powerpc/powermac/cudavar.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/powermac/kiic.c
     - copied unchanged from r188705, head/sys/powerpc/powermac/kiic.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/powermac/macgpio.c
     - copied unchanged from r188705, head/sys/powerpc/powermac/macgpio.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/powermac/macgpiovar.h
     - copied unchanged from r188705, head/sys/powerpc/powermac/macgpiovar.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/powermac/pmu.c
     - copied unchanged from r188705, head/sys/powerpc/powermac/pmu.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/powermac/pmuvar.h
     - copied unchanged from r188705, head/sys/powerpc/powermac/pmuvar.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/powermac/viareg.h
     - copied unchanged from r188705, head/sys/powerpc/powermac/viareg.h
  user/lstewart/alq_varlen_8.x/sys/rpc/replay.c
     - copied unchanged from r188705, head/sys/rpc/replay.c
  user/lstewart/alq_varlen_8.x/sys/rpc/replay.h
     - copied unchanged from r188705, head/sys/rpc/replay.h
  user/lstewart/alq_varlen_8.x/sys/rpc/rpcsec_gss/
     - copied from r188705, head/sys/rpc/rpcsec_gss/
  user/lstewart/alq_varlen_8.x/sys/rpc/rpcsec_gss.h
     - copied unchanged from r188705, head/sys/rpc/rpcsec_gss.h
  user/lstewart/alq_varlen_8.x/sys/security/audit/audit_bsm_domain.c
     - copied unchanged from r188705, head/sys/security/audit/audit_bsm_domain.c
  user/lstewart/alq_varlen_8.x/sys/security/audit/audit_bsm_errno.c
     - copied unchanged from r188705, head/sys/security/audit/audit_bsm_errno.c
  user/lstewart/alq_varlen_8.x/sys/security/audit/audit_bsm_socket_type.c
     - copied unchanged from r188705, head/sys/security/audit/audit_bsm_socket_type.c
  user/lstewart/alq_varlen_8.x/sys/security/mac/mac_cred.c
     - copied unchanged from r188705, head/sys/security/mac/mac_cred.c
  user/lstewart/alq_varlen_8.x/sys/security/mac_bsdextended/ugidfw_internal.h
     - copied unchanged from r188705, head/sys/security/mac_bsdextended/ugidfw_internal.h
  user/lstewart/alq_varlen_8.x/sys/security/mac_bsdextended/ugidfw_system.c
     - copied unchanged from r188705, head/sys/security/mac_bsdextended/ugidfw_system.c
  user/lstewart/alq_varlen_8.x/sys/security/mac_bsdextended/ugidfw_vnode.c
     - copied unchanged from r188705, head/sys/security/mac_bsdextended/ugidfw_vnode.c
  user/lstewart/alq_varlen_8.x/sys/sys/buf_ring.h
     - copied unchanged from r188705, head/sys/sys/buf_ring.h
  user/lstewart/alq_varlen_8.x/sys/sys/cfictl.h
     - copied unchanged from r188705, head/sys/sys/cfictl.h
  user/lstewart/alq_varlen_8.x/sys/sys/osd.h
     - copied unchanged from r188705, head/sys/sys/osd.h
  user/lstewart/alq_varlen_8.x/sys/xen/evtchn.h
     - copied unchanged from r188705, head/sys/xen/evtchn.h
  user/lstewart/alq_varlen_8.x/sys/xen/hypervisor.h
     - copied unchanged from r188705, head/sys/xen/hypervisor.h
  user/lstewart/alq_varlen_8.x/sys/xen/xen_intr.h
     - copied unchanged from r188705, head/sys/xen/xen_intr.h
  user/lstewart/alq_varlen_8.x/sys/xen/xenbus/xenbus_if.m
     - copied unchanged from r188705, head/sys/xen/xenbus/xenbus_if.m
  user/lstewart/alq_varlen_8.x/sys/xen/xenbus/xenbusvar.h
     - copied unchanged from r188705, head/sys/xen/xenbus/xenbusvar.h
  user/lstewart/alq_varlen_8.x/tools/regression/acltools/
     - copied from r188705, head/tools/regression/acltools/
  user/lstewart/alq_varlen_8.x/tools/regression/bin/sh/builtins/type1.0.stderr
     - copied unchanged from r188705, head/tools/regression/bin/sh/builtins/type1.0.stderr
  user/lstewart/alq_varlen_8.x/tools/regression/bin/sh/parameters/
     - copied from r188705, head/tools/regression/bin/sh/parameters/
  user/lstewart/alq_varlen_8.x/tools/regression/file/newfileops_on_fork/
     - copied from r188705, head/tools/regression/file/newfileops_on_fork/
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/rename/21.t
     - copied unchanged from r188705, head/tools/regression/fstest/tests/rename/21.t
  user/lstewart/alq_varlen_8.x/tools/regression/kgssapi/
     - copied from r188705, head/tools/regression/kgssapi/
  user/lstewart/alq_varlen_8.x/tools/regression/lib/msun/test-conj.c
     - copied unchanged from r188705, head/tools/regression/lib/msun/test-conj.c
  user/lstewart/alq_varlen_8.x/tools/regression/lib/msun/test-conj.t
     - copied unchanged from r188705, head/tools/regression/lib/msun/test-conj.t
  user/lstewart/alq_varlen_8.x/tools/regression/rpcsec_gss/
     - copied from r188705, head/tools/regression/rpcsec_gss/
  user/lstewart/alq_varlen_8.x/tools/regression/usr.bin/jot/regress.wX1.out
     - copied unchanged from r188705, head/tools/regression/usr.bin/jot/regress.wX1.out
  user/lstewart/alq_varlen_8.x/tools/regression/usr.bin/sed/regress.not.out
     - copied unchanged from r188705, head/tools/regression/usr.bin/sed/regress.not.out
  user/lstewart/alq_varlen_8.x/tools/regression/zfs/
     - copied from r188705, head/tools/regression/zfs/
  user/lstewart/alq_varlen_8.x/tools/test/pthread_vfork/
     - copied from r188705, head/tools/test/pthread_vfork/
  user/lstewart/alq_varlen_8.x/tools/tools/ath/Makefile.inc
     - copied unchanged from r188705, head/tools/tools/ath/Makefile.inc
  user/lstewart/alq_varlen_8.x/tools/tools/ath/athkey/
     - copied from r188705, head/tools/tools/ath/athkey/
  user/lstewart/alq_varlen_8.x/tools/tools/ath/athpow/
     - copied from r188705, head/tools/tools/ath/athpow/
  user/lstewart/alq_varlen_8.x/tools/tools/ath/athprom/
     - copied from r188705, head/tools/tools/ath/athprom/
  user/lstewart/alq_varlen_8.x/tools/tools/ath/athrd/
     - copied from r188705, head/tools/tools/ath/athrd/
  user/lstewart/alq_varlen_8.x/tools/tools/ath/athregs/
     - copied from r188705, head/tools/tools/ath/athregs/
  user/lstewart/alq_varlen_8.x/tools/tools/ath/common/
     - copied from r188705, head/tools/tools/ath/common/
  user/lstewart/alq_varlen_8.x/tools/tools/cfi/
     - copied from r188705, head/tools/tools/cfi/
  user/lstewart/alq_varlen_8.x/tools/tools/ether_reflect/
     - copied from r188705, head/tools/tools/ether_reflect/
  user/lstewart/alq_varlen_8.x/tools/tools/nanobsd/gateworks/
     - copied from r188705, head/tools/tools/nanobsd/gateworks/
  user/lstewart/alq_varlen_8.x/tools/tools/nanobsd/rescue/
     - copied from r188705, head/tools/tools/nanobsd/rescue/
  user/lstewart/alq_varlen_8.x/tools/tools/net80211/scripts/setup.tdma-master
     - copied unchanged from r188705, head/tools/tools/net80211/scripts/setup.tdma-master
  user/lstewart/alq_varlen_8.x/tools/tools/net80211/scripts/setup.tdma-slave
     - copied unchanged from r188705, head/tools/tools/net80211/scripts/setup.tdma-slave
  user/lstewart/alq_varlen_8.x/tools/tools/net80211/wlantxtime/
     - copied from r188705, head/tools/tools/net80211/wlantxtime/
  user/lstewart/alq_varlen_8.x/tools/tools/sysbuild/
     - copied from r188705, head/tools/tools/sysbuild/
  user/lstewart/alq_varlen_8.x/tools/tools/tionxcl/
     - copied from r188705, head/tools/tools/tionxcl/
  user/lstewart/alq_varlen_8.x/usr.bin/elf2aout/elf2aout.1
     - copied unchanged from r188705, head/usr.bin/elf2aout/elf2aout.1
  user/lstewart/alq_varlen_8.x/usr.bin/mail/util.c
     - copied unchanged from r188705, head/usr.bin/mail/util.c
  user/lstewart/alq_varlen_8.x/usr.bin/tar/cmdline.c
     - copied unchanged from r188705, head/usr.bin/tar/cmdline.c
  user/lstewart/alq_varlen_8.x/usr.bin/tar/test/test_strip_components.c
     - copied unchanged from r188705, head/usr.bin/tar/test/test_strip_components.c
  user/lstewart/alq_varlen_8.x/usr.bin/truss/mips-fbsd.c
     - copied unchanged from r188705, head/usr.bin/truss/mips-fbsd.c
  user/lstewart/alq_varlen_8.x/usr.sbin/bluetooth/btpand/
     - copied from r188705, head/usr.sbin/bluetooth/btpand/
  user/lstewart/alq_varlen_8.x/usr.sbin/dumpcis/
     - copied from r188705, head/usr.sbin/dumpcis/
  user/lstewart/alq_varlen_8.x/usr.sbin/gssd/
     - copied from r188705, head/usr.sbin/gssd/
  user/lstewart/alq_varlen_8.x/usr.sbin/i2c/
     - copied from r188705, head/usr.sbin/i2c/
  user/lstewart/alq_varlen_8.x/usr.sbin/makefs/
     - copied from r188705, head/usr.sbin/makefs/
  user/lstewart/alq_varlen_8.x/usr.sbin/pmcannotate/
     - copied from r188705, head/usr.sbin/pmcannotate/
  user/lstewart/alq_varlen_8.x/usr.sbin/usbconfig/
     - copied from r188705, head/usr.sbin/usbconfig/
Replaced:
  user/lstewart/alq_varlen_8.x/contrib/file/FREEBSD-upgrade
     - copied unchanged from r188705, head/contrib/file/FREEBSD-upgrade
  user/lstewart/alq_varlen_8.x/contrib/file/magic2mime
     - copied unchanged from r188705, head/contrib/file/magic2mime
Deleted:
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/nsupdate/nsupdate.8
  user/lstewart/alq_varlen_8.x/contrib/file/LEGAL.NOTICE
  user/lstewart/alq_varlen_8.x/contrib/file/Makefile.std
  user/lstewart/alq_varlen_8.x/contrib/file/PORTING
  user/lstewart/alq_varlen_8.x/contrib/file/configure.in
  user/lstewart/alq_varlen_8.x/contrib/file/magic.mime
  user/lstewart/alq_varlen_8.x/contrib/file/mkinstalldirs
  user/lstewart/alq_varlen_8.x/contrib/file/test.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/FREEBSD-vendor
  user/lstewart/alq_varlen_8.x/contrib/openbsm/HISTORY
  user/lstewart/alq_varlen_8.x/share/man/man8/adding_user.8
  user/lstewart/alq_varlen_8.x/share/man/man9/vfs_mountedon.9
  user/lstewart/alq_varlen_8.x/sys/arm/arm/cpufunc_asm_feroceon.S
  user/lstewart/alq_varlen_8.x/sys/arm/at91/files.kb920x
  user/lstewart/alq_varlen_8.x/sys/arm/at91/kb920x_machdep.c
  user/lstewart/alq_varlen_8.x/sys/boot/common/load.c
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/acl.h
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/callb.h
  user/lstewart/alq_varlen_8.x/sys/contrib/dev/ath/
  user/lstewart/alq_varlen_8.x/sys/dev/digi/con.CX-IBM.h
  user/lstewart/alq_varlen_8.x/sys/dev/digi/con.CX.h
  user/lstewart/alq_varlen_8.x/sys/dev/digi/con.EPCX.h
  user/lstewart/alq_varlen_8.x/sys/dev/digi/con.MBank.h
  user/lstewart/alq_varlen_8.x/sys/dev/sound/pci/au88x0.c
  user/lstewart/alq_varlen_8.x/sys/dev/sound/pci/au88x0.h
  user/lstewart/alq_varlen_8.x/sys/dev/syscons/scterm-dumb.c
  user/lstewart/alq_varlen_8.x/sys/dev/syscons/scterm-sc.c
  user/lstewart/alq_varlen_8.x/sys/dev/syscons/sctermvar.h
  user/lstewart/alq_varlen_8.x/sys/i386/include/xen/evtchn.h
  user/lstewart/alq_varlen_8.x/sys/i386/include/xen/hypervisor.h
  user/lstewart/alq_varlen_8.x/sys/i386/include/xen/xen_intr.h
  user/lstewart/alq_varlen_8.x/sys/i386/include/xen/xenbus.h
  user/lstewart/alq_varlen_8.x/sys/kern/tty_cons.c
  user/lstewart/alq_varlen_8.x/sys/modules/ath_hal/
  user/lstewart/alq_varlen_8.x/sys/modules/ath_rate_amrr/
  user/lstewart/alq_varlen_8.x/sys/modules/ath_rate_onoe/
  user/lstewart/alq_varlen_8.x/sys/modules/ath_rate_sample/
  user/lstewart/alq_varlen_8.x/sys/modules/sound/driver/au88x0/
  user/lstewart/alq_varlen_8.x/sys/netinet/ipprotosw.h
  user/lstewart/alq_varlen_8.x/sys/pccard/
  user/lstewart/alq_varlen_8.x/sys/pci/if_mn.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/booke/support.S
  user/lstewart/alq_varlen_8.x/sys/sparc64/include/ofw_bus.h
  user/lstewart/alq_varlen_8.x/sys/sparc64/sparc64/ofw_bus.c
  user/lstewart/alq_varlen_8.x/sys/sun4v/include/ofw_bus.h
  user/lstewart/alq_varlen_8.x/tools/regression/bin/sh/builtins/type1.0.stdout
  user/lstewart/alq_varlen_8.x/tools/regression/usr.bin/jot/regress.wX.out
  user/lstewart/alq_varlen_8.x/usr.bin/mail/aux.c
  user/lstewart/alq_varlen_8.x/usr.bin/netstat/mcast.c
  user/lstewart/alq_varlen_8.x/usr.sbin/pccard/
  user/lstewart/alq_varlen_8.x/usr.sbin/sysinstall/pccard.c
  user/lstewart/alq_varlen_8.x/usr.sbin/sysinstall/tape.c
Modified:
  user/lstewart/alq_varlen_8.x/   (props changed)
  user/lstewart/alq_varlen_8.x/COPYRIGHT
  user/lstewart/alq_varlen_8.x/Makefile
  user/lstewart/alq_varlen_8.x/Makefile.inc1
  user/lstewart/alq_varlen_8.x/ObsoleteFiles.inc
  user/lstewart/alq_varlen_8.x/UPDATING
  user/lstewart/alq_varlen_8.x/bin/cat/cat.c
  user/lstewart/alq_varlen_8.x/bin/chio/chio.c
  user/lstewart/alq_varlen_8.x/bin/chmod/chmod.1
  user/lstewart/alq_varlen_8.x/bin/cp/utils.c
  user/lstewart/alq_varlen_8.x/bin/dd/dd.1
  user/lstewart/alq_varlen_8.x/bin/df/df.1
  user/lstewart/alq_varlen_8.x/bin/df/df.c
  user/lstewart/alq_varlen_8.x/bin/kenv/kenv.1
  user/lstewart/alq_varlen_8.x/bin/ln/ln.1
  user/lstewart/alq_varlen_8.x/bin/pax/file_subs.c
  user/lstewart/alq_varlen_8.x/bin/ps/print.c
  user/lstewart/alq_varlen_8.x/bin/rcp/rcp.c
  user/lstewart/alq_varlen_8.x/bin/sh/eval.c
  user/lstewart/alq_varlen_8.x/bin/sh/exec.c
  user/lstewart/alq_varlen_8.x/bin/test/test.1
  user/lstewart/alq_varlen_8.x/cddl/Makefile.inc
  user/lstewart/alq_varlen_8.x/cddl/compat/opensolaris/include/mnttab.h
  user/lstewart/alq_varlen_8.x/cddl/compat/opensolaris/misc/deviceid.c
  user/lstewart/alq_varlen_8.x/cddl/compat/opensolaris/misc/mnttab.c
  user/lstewart/alq_varlen_8.x/cddl/compat/opensolaris/misc/zmount.c
  user/lstewart/alq_varlen_8.x/cddl/compat/opensolaris/misc/zone.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/cmd/zdb/zdb.8
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/cmd/zdb/zdb.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/cmd/zfs/zfs.8
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/cmd/zpool/zpool.8
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/cmd/ztest/ztest.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/head/assert.h
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/head/libintl.h
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/head/synch.h
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/head/thread.h
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.h
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c
  user/lstewart/alq_varlen_8.x/cddl/contrib/opensolaris/lib/libzpool/common/util.c
  user/lstewart/alq_varlen_8.x/cddl/lib/libzfs/Makefile
  user/lstewart/alq_varlen_8.x/cddl/lib/libzpool/Makefile
  user/lstewart/alq_varlen_8.x/cddl/sbin/zpool/Makefile
  user/lstewart/alq_varlen_8.x/cddl/usr.bin/Makefile
  user/lstewart/alq_varlen_8.x/cddl/usr.bin/ztest/Makefile
  user/lstewart/alq_varlen_8.x/cddl/usr.sbin/zdb/Makefile
  user/lstewart/alq_varlen_8.x/contrib/bind9/   (props changed)
  user/lstewart/alq_varlen_8.x/contrib/bind9/CHANGES
  user/lstewart/alq_varlen_8.x/contrib/bind9/COPYRIGHT
  user/lstewart/alq_varlen_8.x/contrib/bind9/FAQ
  user/lstewart/alq_varlen_8.x/contrib/bind9/FAQ.xml
  user/lstewart/alq_varlen_8.x/contrib/bind9/README
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/check/check-tool.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/check/named-checkconf.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/check/named-checkzone.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/dig/dig.1
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/dig/dig.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/dig/dig.docbook
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/dig/dig.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/dig/dighost.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/dig/host.1
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/dig/host.docbook
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/dig/host.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/dnssec/dnssec-keygen.8
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/dnssec/dnssec-keygen.docbook
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/dnssec/dnssec-keygen.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/dnssec/dnssec-signzone.8
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/dnssec/dnssec-signzone.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/dnssec/dnssec-signzone.docbook
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/dnssec/dnssec-signzone.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/named/client.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/named/config.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/named/controlconf.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/named/include/named/globals.h
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/named/interfacemgr.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/named/lwaddr.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/named/lwdgnba.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/named/lwdnoop.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/named/lwresd.8
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/named/lwresd.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/named/lwresd.docbook
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/named/lwresd.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/named/main.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/named/named.8
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/named/named.conf.5
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/named/named.conf.docbook
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/named/named.conf.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/named/named.docbook
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/named/named.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/named/query.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/named/server.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/named/unix/include/named/os.h
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/named/unix/os.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/named/update.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/nsupdate/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/nsupdate/nsupdate.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/nsupdate/nsupdate.docbook
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/nsupdate/nsupdate.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/rndc/rndc-confgen.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/rndc/rndc.8
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/rndc/rndc.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/rndc/rndc.docbook
  user/lstewart/alq_varlen_8.x/contrib/bind9/bin/rndc/rndc.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/configure.in
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/arm/Bv9ARM-book.xml
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/arm/Bv9ARM.ch01.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/arm/Bv9ARM.ch02.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/arm/Bv9ARM.ch03.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/arm/Bv9ARM.ch04.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/arm/Bv9ARM.ch05.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/arm/Bv9ARM.ch06.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/arm/Bv9ARM.ch07.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/arm/Bv9ARM.ch08.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/arm/Bv9ARM.ch09.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/arm/Bv9ARM.ch10.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/arm/Bv9ARM.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/arm/Bv9ARM.pdf
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/arm/man.dig.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/arm/man.dnssec-keygen.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/arm/man.dnssec-signzone.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/arm/man.host.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/arm/man.named-checkconf.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/arm/man.named-checkzone.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/arm/man.named.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/arm/man.rndc-confgen.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/arm/man.rndc.conf.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/arm/man.rndc.html
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/misc/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/misc/format-options.pl
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/misc/migration
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/misc/options
  user/lstewart/alq_varlen_8.x/contrib/bind9/doc/rfc/index
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/api
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/bsd/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/bsd/strerror.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/bsd/strtoul.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/configure.in
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/dst/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/dst/dst_api.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/dst/hmac_link.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/dst/support.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/include/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/include/arpa/nameser.h
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/include/isc/assertions.h
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/include/isc/eventlib.h
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/include/isc/misc.h
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/include/netdb.h
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/include/resolv.h
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/inet/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/inet/inet_net_pton.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/inet/inet_network.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/irs/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/irs/dns_ho.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/irs/getnetgrent.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/irs/getnetgrent_r.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/irs/irp.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/isc/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/isc/assertions.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/isc/bitncmp.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/isc/ctl_clnt.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/isc/ctl_srvr.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/isc/logging.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/nameser/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/port_after.h.in
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/port_before.h.in
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/resolv/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/resolv/res_debug.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/resolv/res_mkquery.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/resolv/res_query.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind/resolv/res_send.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind9/api
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/bind9/check.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/acache.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/adb.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/api
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/cache.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/dispatch.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/dst_parse.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/dst_parse.h
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/include/dns/dispatch.h
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/journal.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/master.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/masterdump.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/message.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/openssldsa_link.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/opensslrsa_link.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/rbt.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/rbtdb.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/rdata/generic/nsec_47.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/rdata/generic/nsec_47.h
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/rdata/generic/txt_16.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/rdata/in_1/apl_42.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/rdata/in_1/naptr_35.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/request.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/resolver.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/rootns.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/sdb.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/tkey.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/tsig.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/validator.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/view.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/xfrin.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/dns/zone.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/api
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/assertions.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/include/isc/assertions.h
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/include/isc/lex.h
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/include/isc/mem.h
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/include/isc/msgs.h
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/include/isc/platform.h.in
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/include/isc/resource.h
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/include/isc/socket.h
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/include/isc/timer.h
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/include/isc/types.h
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/mem.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/print.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/pthreads/mutex.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/timer.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/unix/app.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/unix/include/isc/net.h
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/unix/net.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/unix/resource.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/unix/socket.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/unix/socket_p.h
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isc/unix/time.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isccfg/api
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/isccfg/namedconf.c
  user/lstewart/alq_varlen_8.x/contrib/bind9/lib/lwres/api
  user/lstewart/alq_varlen_8.x/contrib/bind9/make/rules.in
  user/lstewart/alq_varlen_8.x/contrib/bind9/version
  user/lstewart/alq_varlen_8.x/contrib/binutils/bfd/config.bfd
  user/lstewart/alq_varlen_8.x/contrib/binutils/gas/config/tc-mips.c
  user/lstewart/alq_varlen_8.x/contrib/bsnmp/snmp_mibII/mibII.c
  user/lstewart/alq_varlen_8.x/contrib/bsnmp/snmp_mibII/mibII_route.c
  user/lstewart/alq_varlen_8.x/contrib/cpio/   (props changed)
  user/lstewart/alq_varlen_8.x/contrib/csup/   (props changed)
  user/lstewart/alq_varlen_8.x/contrib/csup/GNUmakefile
  user/lstewart/alq_varlen_8.x/contrib/csup/Makefile
  user/lstewart/alq_varlen_8.x/contrib/csup/TODO
  user/lstewart/alq_varlen_8.x/contrib/csup/config.c
  user/lstewart/alq_varlen_8.x/contrib/csup/csup.1
  user/lstewart/alq_varlen_8.x/contrib/csup/detailer.c
  user/lstewart/alq_varlen_8.x/contrib/csup/diff.c
  user/lstewart/alq_varlen_8.x/contrib/csup/diff.h
  user/lstewart/alq_varlen_8.x/contrib/csup/fattr.c
  user/lstewart/alq_varlen_8.x/contrib/csup/fattr.h
  user/lstewart/alq_varlen_8.x/contrib/csup/keyword.c
  user/lstewart/alq_varlen_8.x/contrib/csup/keyword.h
  user/lstewart/alq_varlen_8.x/contrib/csup/lister.c
  user/lstewart/alq_varlen_8.x/contrib/csup/misc.c
  user/lstewart/alq_varlen_8.x/contrib/csup/misc.h
  user/lstewart/alq_varlen_8.x/contrib/csup/mux.c
  user/lstewart/alq_varlen_8.x/contrib/csup/proto.c
  user/lstewart/alq_varlen_8.x/contrib/csup/proto.h
  user/lstewart/alq_varlen_8.x/contrib/csup/status.c
  user/lstewart/alq_varlen_8.x/contrib/csup/stream.c
  user/lstewart/alq_varlen_8.x/contrib/csup/stream.h
  user/lstewart/alq_varlen_8.x/contrib/csup/updater.c
  user/lstewart/alq_varlen_8.x/contrib/file/   (props changed)
  user/lstewart/alq_varlen_8.x/contrib/file/ChangeLog
  user/lstewart/alq_varlen_8.x/contrib/file/MAINT
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/adventure
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/animation
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/apple
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/archive
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/audio
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/c-lang
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/c64
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/cafebabe
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/cddb
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/commands
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/compress
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/console
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/cracklib
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/ctags
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/database
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/diff
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/dump
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/elf
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/filesystems
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/flash
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/fonts
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/fortran
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/frame
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/freebsd
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/fsav
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/games
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/gimp
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/gnu
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/hp
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/iff
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/images
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/java
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/jpeg
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/lex
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/linux
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/lisp
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/macintosh
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/mail.news
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/mathematica
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/misctools
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/msdos
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/mup
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/os2
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/palm
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/pdf
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/perl
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/pgp
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/pkgadd
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/printer
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/psion
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/revision
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/riff
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/rpm
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/rtf
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/sc
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/scientific
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/sgi
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/sgml
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/sharc
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/sketch
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/softquad
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/spectrum
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/tex
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/troff
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/unicode
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/uuencode
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/varied.script
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/vorbis
  user/lstewart/alq_varlen_8.x/contrib/file/Magdir/wordprocessors
  user/lstewart/alq_varlen_8.x/contrib/file/Makefile.am
  user/lstewart/alq_varlen_8.x/contrib/file/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/file/README
  user/lstewart/alq_varlen_8.x/contrib/file/acinclude.m4
  user/lstewart/alq_varlen_8.x/contrib/file/aclocal.m4
  user/lstewart/alq_varlen_8.x/contrib/file/apprentice.c
  user/lstewart/alq_varlen_8.x/contrib/file/ascmagic.c
  user/lstewart/alq_varlen_8.x/contrib/file/compress.c
  user/lstewart/alq_varlen_8.x/contrib/file/config.h.in
  user/lstewart/alq_varlen_8.x/contrib/file/configure
  user/lstewart/alq_varlen_8.x/contrib/file/file.c
  user/lstewart/alq_varlen_8.x/contrib/file/file.h
  user/lstewart/alq_varlen_8.x/contrib/file/file.man
  user/lstewart/alq_varlen_8.x/contrib/file/fsmagic.c
  user/lstewart/alq_varlen_8.x/contrib/file/funcs.c
  user/lstewart/alq_varlen_8.x/contrib/file/is_tar.c
  user/lstewart/alq_varlen_8.x/contrib/file/libmagic.man
  user/lstewart/alq_varlen_8.x/contrib/file/magic.c
  user/lstewart/alq_varlen_8.x/contrib/file/magic.h
  user/lstewart/alq_varlen_8.x/contrib/file/magic.man
  user/lstewart/alq_varlen_8.x/contrib/file/names.h
  user/lstewart/alq_varlen_8.x/contrib/file/patchlevel.h
  user/lstewart/alq_varlen_8.x/contrib/file/print.c
  user/lstewart/alq_varlen_8.x/contrib/file/readelf.c
  user/lstewart/alq_varlen_8.x/contrib/file/readelf.h
  user/lstewart/alq_varlen_8.x/contrib/file/softmagic.c
  user/lstewart/alq_varlen_8.x/contrib/file/tar.h
  user/lstewart/alq_varlen_8.x/contrib/gdb/gdb/arm-tdep.c
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/   (props changed)
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/README
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/g_Qfmt.c
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/g__fmt.c
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/g_ddfmt.c
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/g_dfmt.c
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/g_ffmt.c
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/g_xLfmt.c
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/g_xfmt.c
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/gdtoa.c
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/gdtoa.h
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/gdtoaimp.h
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/gethex.c
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/makefile
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/smisc.c
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/strtod.c
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/strtodg.c
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/strtof.c
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/strtopQ.c
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/strtopd.c
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/strtopdd.c
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/strtopf.c
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/strtopx.c
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/strtopxL.c
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/test/README
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/test/getround.c
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/test/makefile
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/test/xsum0.out
  user/lstewart/alq_varlen_8.x/contrib/gdtoa/xsum0.out
  user/lstewart/alq_varlen_8.x/contrib/ipfilter/ipsend/44arp.c
  user/lstewart/alq_varlen_8.x/contrib/lukemftpd/src/extern.h
  user/lstewart/alq_varlen_8.x/contrib/lukemftpd/src/ftpcmd.y
  user/lstewart/alq_varlen_8.x/contrib/lukemftpd/src/ftpd.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/   (props changed)
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ANNOUNCE
  user/lstewart/alq_varlen_8.x/contrib/ncurses/FREEBSD-upgrade
  user/lstewart/alq_varlen_8.x/contrib/ncurses/INSTALL
  user/lstewart/alq_varlen_8.x/contrib/ncurses/MANIFEST
  user/lstewart/alq_varlen_8.x/contrib/ncurses/NEWS
  user/lstewart/alq_varlen_8.x/contrib/ncurses/TO-DO
  user/lstewart/alq_varlen_8.x/contrib/ncurses/aclocal.m4
  user/lstewart/alq_varlen_8.x/contrib/ncurses/announce.html.in
  user/lstewart/alq_varlen_8.x/contrib/ncurses/config.guess
  user/lstewart/alq_varlen_8.x/contrib/ncurses/config.sub
  user/lstewart/alq_varlen_8.x/contrib/ncurses/configure
  user/lstewart/alq_varlen_8.x/contrib/ncurses/configure.in
  user/lstewart/alq_varlen_8.x/contrib/ncurses/dist.mk
  user/lstewart/alq_varlen_8.x/contrib/ncurses/doc/html/announce.html
  user/lstewart/alq_varlen_8.x/contrib/ncurses/form/form.priv.h
  user/lstewart/alq_varlen_8.x/contrib/ncurses/form/frm_def.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/form/frm_driver.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/form/frm_req_name.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/include/MKterm.h.awk.in
  user/lstewart/alq_varlen_8.x/contrib/ncurses/include/capdefaults.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/include/curses.h.in
  user/lstewart/alq_varlen_8.x/contrib/ncurses/include/curses.tail
  user/lstewart/alq_varlen_8.x/contrib/ncurses/include/nc_alloc.h
  user/lstewart/alq_varlen_8.x/contrib/ncurses/include/nc_panel.h
  user/lstewart/alq_varlen_8.x/contrib/ncurses/include/ncurses_defs
  user/lstewart/alq_varlen_8.x/contrib/ncurses/include/term_entry.h
  user/lstewart/alq_varlen_8.x/contrib/ncurses/man/curs_getcchar.3x
  user/lstewart/alq_varlen_8.x/contrib/ncurses/man/curs_terminfo.3x
  user/lstewart/alq_varlen_8.x/contrib/ncurses/man/curs_util.3x
  user/lstewart/alq_varlen_8.x/contrib/ncurses/man/form.3x
  user/lstewart/alq_varlen_8.x/contrib/ncurses/man/form_driver.3x
  user/lstewart/alq_varlen_8.x/contrib/ncurses/man/form_field_buffer.3x
  user/lstewart/alq_varlen_8.x/contrib/ncurses/man/man_db.renames
  user/lstewart/alq_varlen_8.x/contrib/ncurses/man/menu_attributes.3x
  user/lstewart/alq_varlen_8.x/contrib/ncurses/man/menu_driver.3x
  user/lstewart/alq_varlen_8.x/contrib/ncurses/man/menu_pattern.3x
  user/lstewart/alq_varlen_8.x/contrib/ncurses/man/ncurses.3x
  user/lstewart/alq_varlen_8.x/contrib/ncurses/menu/m_driver.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/menu/m_req_name.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/misc/ncu-indent
  user/lstewart/alq_varlen_8.x/contrib/ncurses/misc/terminfo.src
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/base/MKkeyname.awk
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/base/MKlib_gen.sh
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/base/MKunctrl.awk
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/base/lib_addch.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/base/lib_delwin.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/base/lib_freeall.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/base/lib_getch.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/base/lib_getstr.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/base/lib_initscr.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/base/lib_mouse.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/base/lib_newterm.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/base/lib_newwin.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/base/lib_overlay.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/base/lib_restart.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/base/lib_screen.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/base/lib_set_term.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/base/lib_slk.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/base/lib_slkrefr.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/base/lib_ungetch.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/base/lib_window.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/base/resizeterm.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/base/tries.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/base/use_window.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/base/wresize.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/curses.priv.h
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/fifo_defs.h
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/llib-lncurses
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/llib-lncursest
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/llib-lncursesw
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/MKcodes.awk
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/MKnames.awk
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/alloc_entry.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/alloc_ttype.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/captoinfo.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/comp_expand.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/comp_hash.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/comp_parse.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/comp_scan.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/entries.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/home_terminfo.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/init_keytry.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/lib_acs.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/lib_baudrate.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/lib_cur_term.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/lib_data.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/lib_options.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/lib_raw.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/lib_setup.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/lib_termcap.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/lib_tgoto.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/lib_tparm.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/lib_tputs.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/make_keys.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/name_match.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/parse_entry.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/read_entry.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/use_screen.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tinfo/write_entry.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/trace/lib_trace.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/trace/lib_traceatr.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/trace/lib_tracebits.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/trace/lib_tracechr.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/trace/lib_tracedmp.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/trace/lib_tracemse.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/trace/trace_buf.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/trace/trace_tries.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/trace/varargs.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/trace/visbuf.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tty/hardscroll.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tty/lib_mvcur.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tty/lib_twait.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/tty/tty_update.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/widechar/charable.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/widechar/lib_get_wch.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/widechar/lib_get_wstr.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/widechar/lib_key_name.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/ncurses/widechar/lib_unget_wch.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/panel/p_new.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/panel/panel.priv.h
  user/lstewart/alq_varlen_8.x/contrib/ncurses/progs/MKtermsort.sh
  user/lstewart/alq_varlen_8.x/contrib/ncurses/progs/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/ncurses/progs/dump_entry.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/progs/dump_entry.h
  user/lstewart/alq_varlen_8.x/contrib/ncurses/progs/infocmp.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/progs/progs.priv.h
  user/lstewart/alq_varlen_8.x/contrib/ncurses/progs/tic.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/progs/toe.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/progs/tput.c
  user/lstewart/alq_varlen_8.x/contrib/ncurses/progs/tset.c
  user/lstewart/alq_varlen_8.x/contrib/netcat/   (props changed)
  user/lstewart/alq_varlen_8.x/contrib/netcat/FREEBSD-vendor
  user/lstewart/alq_varlen_8.x/contrib/netcat/atomicio.c   (props changed)
  user/lstewart/alq_varlen_8.x/contrib/netcat/atomicio.h   (props changed)
  user/lstewart/alq_varlen_8.x/contrib/netcat/nc.1
  user/lstewart/alq_varlen_8.x/contrib/netcat/netcat.c
  user/lstewart/alq_varlen_8.x/contrib/netcat/socks.c   (props changed)
  user/lstewart/alq_varlen_8.x/contrib/ntp/   (props changed)
  user/lstewart/alq_varlen_8.x/contrib/ntp/ntpd/ntp_crypto.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/   (props changed)
  user/lstewart/alq_varlen_8.x/contrib/openbsm/LICENSE
  user/lstewart/alq_varlen_8.x/contrib/openbsm/Makefile.am
  user/lstewart/alq_varlen_8.x/contrib/openbsm/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/openbsm/README
  user/lstewart/alq_varlen_8.x/contrib/openbsm/TODO
  user/lstewart/alq_varlen_8.x/contrib/openbsm/VERSION
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/audit/Makefile.am
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/audit/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/audit/audit.8
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/audit/audit.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditd/Makefile.am
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditd/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditd/audit_warn.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditd/auditd.8
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditd/auditd.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditd/auditd.h
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditfilterd/Makefile.am
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditfilterd/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditfilterd/auditfilterd.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditreduce/Makefile.am
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditreduce/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditreduce/auditreduce.1
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditreduce/auditreduce.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/auditreduce/auditreduce.h
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/praudit/Makefile.am
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/praudit/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/praudit/praudit.1
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bin/praudit/praudit.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bsm/Makefile.am
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bsm/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bsm/audit_uevents.h
  user/lstewart/alq_varlen_8.x/contrib/openbsm/bsm/libbsm.h
  user/lstewart/alq_varlen_8.x/contrib/openbsm/compat/clock_gettime.h
  user/lstewart/alq_varlen_8.x/contrib/openbsm/compat/endian.h
  user/lstewart/alq_varlen_8.x/contrib/openbsm/compat/strlcat.h
  user/lstewart/alq_varlen_8.x/contrib/openbsm/config/config.h
  user/lstewart/alq_varlen_8.x/contrib/openbsm/config/config.h.in
  user/lstewart/alq_varlen_8.x/contrib/openbsm/configure
  user/lstewart/alq_varlen_8.x/contrib/openbsm/configure.ac
  user/lstewart/alq_varlen_8.x/contrib/openbsm/etc/audit_event
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/Makefile.am
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/au_class.3
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/au_free_token.3
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/au_token.3
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/audit_submit.3
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/bsm_audit.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/bsm_class.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/bsm_control.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/bsm_event.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/bsm_flags.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/bsm_io.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/bsm_mask.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/bsm_notify.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/bsm_token.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/bsm_user.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/bsm_wrappers.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/libbsm/libbsm.3
  user/lstewart/alq_varlen_8.x/contrib/openbsm/man/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/openbsm/man/audit.2
  user/lstewart/alq_varlen_8.x/contrib/openbsm/man/audit.log.5
  user/lstewart/alq_varlen_8.x/contrib/openbsm/man/audit_class.5
  user/lstewart/alq_varlen_8.x/contrib/openbsm/man/audit_control.5
  user/lstewart/alq_varlen_8.x/contrib/openbsm/man/audit_event.5
  user/lstewart/alq_varlen_8.x/contrib/openbsm/man/audit_user.5
  user/lstewart/alq_varlen_8.x/contrib/openbsm/man/audit_warn.5
  user/lstewart/alq_varlen_8.x/contrib/openbsm/man/auditctl.2
  user/lstewart/alq_varlen_8.x/contrib/openbsm/man/auditon.2
  user/lstewart/alq_varlen_8.x/contrib/openbsm/man/getaudit.2
  user/lstewart/alq_varlen_8.x/contrib/openbsm/man/getauid.2
  user/lstewart/alq_varlen_8.x/contrib/openbsm/man/setaudit.2
  user/lstewart/alq_varlen_8.x/contrib/openbsm/man/setauid.2
  user/lstewart/alq_varlen_8.x/contrib/openbsm/modules/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/openbsm/modules/auditfilter_noop/Makefile.am
  user/lstewart/alq_varlen_8.x/contrib/openbsm/modules/auditfilter_noop/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/openbsm/modules/auditfilter_noop/auditfilter_noop.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/Makefile.am
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/bsm/Makefile.am
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/bsm/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/bsm/generate.c
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/arg32_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/data_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/data_token
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/file_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/header32_token
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/in_addr_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/ip_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/ipc_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/iport_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/opaque_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/path_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/process32_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/process32ex_record-IPv4
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/process32ex_record-IPv6
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/process64_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/process64ex_record-IPv4
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/process64ex_record-IPv6
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/return32_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/return32_token
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/seq_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/subject32_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/subject32ex_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/text_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/test/reference/zonename_record
  user/lstewart/alq_varlen_8.x/contrib/openbsm/tools/Makefile.am
  user/lstewart/alq_varlen_8.x/contrib/openbsm/tools/Makefile.in
  user/lstewart/alq_varlen_8.x/contrib/openpam/   (props changed)
  user/lstewart/alq_varlen_8.x/contrib/opie/opiekey.1
  user/lstewart/alq_varlen_8.x/contrib/pf/   (props changed)
  user/lstewart/alq_varlen_8.x/contrib/sendmail/   (props changed)
  user/lstewart/alq_varlen_8.x/contrib/sendmail/src/sendmail.h
  user/lstewart/alq_varlen_8.x/contrib/smbfs/lib/smb/nb_name.c
  user/lstewart/alq_varlen_8.x/contrib/smbfs/mount_smbfs/mount_smbfs.8
  user/lstewart/alq_varlen_8.x/contrib/smbfs/mount_smbfs/mount_smbfs.c
  user/lstewart/alq_varlen_8.x/contrib/tcsh/sh.c
  user/lstewart/alq_varlen_8.x/contrib/tcsh/tc.const.c
  user/lstewart/alq_varlen_8.x/contrib/telnet/telnetd/ext.h
  user/lstewart/alq_varlen_8.x/contrib/telnet/telnetd/sys_term.c
  user/lstewart/alq_varlen_8.x/contrib/top/   (props changed)
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/   (props changed)
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/ChangeLog
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/Makefile
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/base64.c
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/ctrl_iface.c
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/ctrl_iface_dbus.c
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/ctrl_iface_unix.c
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/dbus_dict_helpers.c
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/doc/docbook/wpa_background.8
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/doc/docbook/wpa_cli.8
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/driver_ndis.c
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/eap.c
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/eap_aka.c
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/eap_gpsk.c
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/eap_gpsk_common.c
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/eap_ttls.c
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/eloop.c
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/eloop.h
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/eloop_none.c
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/mlme.c
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/os_unix.c
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/preauth_test.c
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/radius.c
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/sha1.c
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/tls_openssl.c
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/version.h
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/wpa.c
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/wpa.h
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/wpa_cli.c
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/wpa_gui-qt4/scanresults.cpp
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/wpa_gui/userdatarequest.ui.h
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/wpa_i.h
  user/lstewart/alq_varlen_8.x/contrib/wpa_supplicant/wpa_supplicant.c
  user/lstewart/alq_varlen_8.x/crypto/openssh/   (props changed)
  user/lstewart/alq_varlen_8.x/crypto/openssh/loginrec.c
  user/lstewart/alq_varlen_8.x/crypto/openssh/sshd.c
  user/lstewart/alq_varlen_8.x/crypto/openssl/   (props changed)
  user/lstewart/alq_varlen_8.x/crypto/openssl/apps/speed.c
  user/lstewart/alq_varlen_8.x/crypto/openssl/apps/spkac.c
  user/lstewart/alq_varlen_8.x/crypto/openssl/apps/verify.c
  user/lstewart/alq_varlen_8.x/crypto/openssl/apps/x509.c
  user/lstewart/alq_varlen_8.x/crypto/openssl/ssl/s2_clnt.c
  user/lstewart/alq_varlen_8.x/crypto/openssl/ssl/s2_srvr.c
  user/lstewart/alq_varlen_8.x/crypto/openssl/ssl/s3_clnt.c
  user/lstewart/alq_varlen_8.x/crypto/openssl/ssl/s3_srvr.c
  user/lstewart/alq_varlen_8.x/crypto/openssl/ssl/ssltest.c
  user/lstewart/alq_varlen_8.x/etc/Makefile
  user/lstewart/alq_varlen_8.x/etc/defaults/rc.conf
  user/lstewart/alq_varlen_8.x/etc/devd.conf
  user/lstewart/alq_varlen_8.x/etc/etc.amd64/ttys
  user/lstewart/alq_varlen_8.x/etc/etc.arm/ttys
  user/lstewart/alq_varlen_8.x/etc/etc.i386/ttys
  user/lstewart/alq_varlen_8.x/etc/etc.ia64/ttys
  user/lstewart/alq_varlen_8.x/etc/etc.mips/ttys
  user/lstewart/alq_varlen_8.x/etc/etc.powerpc/ttys
  user/lstewart/alq_varlen_8.x/etc/etc.sparc64/ttys
  user/lstewart/alq_varlen_8.x/etc/gss/mech
  user/lstewart/alq_varlen_8.x/etc/mtree/BSD.include.dist
  user/lstewart/alq_varlen_8.x/etc/mtree/BSD.root.dist
  user/lstewart/alq_varlen_8.x/etc/network.subr
  user/lstewart/alq_varlen_8.x/etc/newsyslog.conf
  user/lstewart/alq_varlen_8.x/etc/periodic/security/200.chkmounts
  user/lstewart/alq_varlen_8.x/etc/periodic/weekly/Makefile
  user/lstewart/alq_varlen_8.x/etc/rc.d/Makefile
  user/lstewart/alq_varlen_8.x/etc/rc.d/defaultroute
  user/lstewart/alq_varlen_8.x/etc/rc.d/jail
  user/lstewart/alq_varlen_8.x/etc/rc.d/named
  user/lstewart/alq_varlen_8.x/etc/rc.d/netif
  user/lstewart/alq_varlen_8.x/etc/rc.d/nfsd
  user/lstewart/alq_varlen_8.x/etc/rc.shutdown
  user/lstewart/alq_varlen_8.x/etc/rc.subr
  user/lstewart/alq_varlen_8.x/etc/regdomain.xml
  user/lstewart/alq_varlen_8.x/etc/remote
  user/lstewart/alq_varlen_8.x/etc/syslog.conf
  user/lstewart/alq_varlen_8.x/games/fortune/datfiles/freebsd-tips
  user/lstewart/alq_varlen_8.x/gnu/lib/libgcc/Makefile
  user/lstewart/alq_varlen_8.x/gnu/lib/libstdc++/Makefile
  user/lstewart/alq_varlen_8.x/gnu/usr.bin/binutils/as/Makefile
  user/lstewart/alq_varlen_8.x/gnu/usr.bin/binutils/libbfd/bfd.h
  user/lstewart/alq_varlen_8.x/gnu/usr.bin/cc/libiberty/config.h
  user/lstewart/alq_varlen_8.x/gnu/usr.bin/gdb/Makefile
  user/lstewart/alq_varlen_8.x/gnu/usr.bin/gdb/gdbserver/Makefile
  user/lstewart/alq_varlen_8.x/gnu/usr.bin/grep/savedir.c
  user/lstewart/alq_varlen_8.x/gnu/usr.bin/groff/tmac/mdoc.local
  user/lstewart/alq_varlen_8.x/gnu/usr.bin/man/manpath/manpath.config
  user/lstewart/alq_varlen_8.x/gnu/usr.bin/sort/config.h
  user/lstewart/alq_varlen_8.x/include/Makefile
  user/lstewart/alq_varlen_8.x/include/arpa/nameser.h
  user/lstewart/alq_varlen_8.x/include/paths.h
  user/lstewart/alq_varlen_8.x/include/resolv.h
  user/lstewart/alq_varlen_8.x/include/rpc/xdr.h
  user/lstewart/alq_varlen_8.x/include/stdlib.h
  user/lstewart/alq_varlen_8.x/include/string.h
  user/lstewart/alq_varlen_8.x/include/strings.h
  user/lstewart/alq_varlen_8.x/include/utmp.h
  user/lstewart/alq_varlen_8.x/include/wchar.h
  user/lstewart/alq_varlen_8.x/kerberos5/include/config.h
  user/lstewart/alq_varlen_8.x/lib/Makefile
  user/lstewart/alq_varlen_8.x/lib/bind/bind/config.h
  user/lstewart/alq_varlen_8.x/lib/bind/bind/port_after.h
  user/lstewart/alq_varlen_8.x/lib/bind/bind/port_before.h
  user/lstewart/alq_varlen_8.x/lib/bind/config.h
  user/lstewart/alq_varlen_8.x/lib/bind/dns/code.h
  user/lstewart/alq_varlen_8.x/lib/bind/dns/dns/enumclass.h
  user/lstewart/alq_varlen_8.x/lib/bind/dns/dns/enumtype.h
  user/lstewart/alq_varlen_8.x/lib/bind/dns/dns/rdatastruct.h
  user/lstewart/alq_varlen_8.x/lib/bind/isc/Makefile
  user/lstewart/alq_varlen_8.x/lib/bind/isc/isc/platform.h
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive.h
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_check_magic.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_endian.h
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_entry.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_entry.h
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_platform.h
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_private.h
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_private.h
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_compression_all.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_compression_bzip2.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_compression_compress.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_compression_gzip.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_compression_none.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_compression_program.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_format_ar.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_format_cpio.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_format_empty.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_format_iso9660.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_format_mtree.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_format_tar.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_read_support_format_zip.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_string.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_string.h
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_util.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_write.3
  user/lstewart/alq_varlen_8.x/lib/libarchive/archive_write_disk.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/test/Makefile
  user/lstewart/alq_varlen_8.x/lib/libarchive/test/main.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_acl_freebsd.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_compat_gtar.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_cpio_bin_bz2.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_gtar_sparse.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_zip.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_format_zip.zip.uu
  user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_read_pax_truncated.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_write_compress.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_write_disk_perms.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_write_disk_secure.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_write_format_ar.c
  user/lstewart/alq_varlen_8.x/lib/libarchive/test/test_write_format_cpio.c
  user/lstewart/alq_varlen_8.x/lib/libbsm/Makefile
  user/lstewart/alq_varlen_8.x/lib/libc/   (props changed)
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/SYS.h
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/gen/_setjmp.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/gen/fabs.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/gen/modf.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/gen/rfork_thread.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/gen/setjmp.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/gen/sigsetjmp.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/stdlib/div.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/stdlib/ldiv.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/stdlib/lldiv.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/string/bcmp.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/string/bcopy.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/string/bzero.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/string/memcmp.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/string/memset.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/string/strcat.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/string/strcmp.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/string/strcpy.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/sys/Makefile.inc
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/sys/brk.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/sys/exect.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/sys/getcontext.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/sys/pipe.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/sys/ptrace.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/sys/reboot.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/sys/sbrk.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/sys/setlogin.S
  user/lstewart/alq_varlen_8.x/lib/libc/amd64/sys/vfork.S
  user/lstewart/alq_varlen_8.x/lib/libc/arm/_fpmath.h
  user/lstewart/alq_varlen_8.x/lib/libc/arm/arith.h
  user/lstewart/alq_varlen_8.x/lib/libc/arm/sys/Makefile.inc
  user/lstewart/alq_varlen_8.x/lib/libc/db/man/dbm.3
  user/lstewart/alq_varlen_8.x/lib/libc/gen/Makefile.inc
  user/lstewart/alq_varlen_8.x/lib/libc/gen/Symbol.map
  user/lstewart/alq_varlen_8.x/lib/libc/gen/__xuname.c
  user/lstewart/alq_varlen_8.x/lib/libc/gen/devname.3
  user/lstewart/alq_varlen_8.x/lib/libc/gen/dirname.3
  user/lstewart/alq_varlen_8.x/lib/libc/gen/dirname.c
  user/lstewart/alq_varlen_8.x/lib/libc/gen/dlfcn.c
  user/lstewart/alq_varlen_8.x/lib/libc/gen/err.3
  user/lstewart/alq_varlen_8.x/lib/libc/gen/getttyent.c
  user/lstewart/alq_varlen_8.x/lib/libc/gen/getvfsbyname.3
  user/lstewart/alq_varlen_8.x/lib/libc/gen/posix_spawn.c
  user/lstewart/alq_varlen_8.x/lib/libc/gen/sysctl.3
  user/lstewart/alq_varlen_8.x/lib/libc/gen/times.3
  user/lstewart/alq_varlen_8.x/lib/libc/gen/ttyname.c
  user/lstewart/alq_varlen_8.x/lib/libc/gen/ttyslot.c
  user/lstewart/alq_varlen_8.x/lib/libc/i386/SYS.h
  user/lstewart/alq_varlen_8.x/lib/libc/i386/gen/_ctx_start.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/gen/_setjmp.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/gen/fabs.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/gen/modf.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/gen/rfork_thread.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/gen/setjmp.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/gen/sigsetjmp.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/stdlib/abs.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/stdlib/div.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/stdlib/labs.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/stdlib/ldiv.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/string/bcmp.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/string/bcopy.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/string/bzero.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/string/ffs.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/string/index.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/string/memchr.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/string/memcmp.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/string/memset.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/string/rindex.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/string/strcat.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/string/strchr.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/string/strcmp.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/string/strcpy.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/string/strlen.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/string/strncmp.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/string/strrchr.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/string/swab.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/string/wcschr.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/string/wcscmp.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/string/wcslen.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/string/wmemchr.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/sys/Makefile.inc
  user/lstewart/alq_varlen_8.x/lib/libc/i386/sys/Ovfork.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/sys/brk.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/sys/exect.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/sys/getcontext.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/sys/pipe.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/sys/ptrace.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/sys/reboot.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/sys/sbrk.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/sys/setlogin.S
  user/lstewart/alq_varlen_8.x/lib/libc/i386/sys/syscall.S
  user/lstewart/alq_varlen_8.x/lib/libc/ia64/sys/Makefile.inc
  user/lstewart/alq_varlen_8.x/lib/libc/include/fpmath.h
  user/lstewart/alq_varlen_8.x/lib/libc/include/isc/eventlib.h   (contents, props changed)
  user/lstewart/alq_varlen_8.x/lib/libc/inet/inet_net_pton.c
  user/lstewart/alq_varlen_8.x/lib/libc/locale/mbstowcs.c
  user/lstewart/alq_varlen_8.x/lib/libc/locale/wcsftime.c
  user/lstewart/alq_varlen_8.x/lib/libc/locale/wcstombs.c
  user/lstewart/alq_varlen_8.x/lib/libc/mips/sys/Makefile.inc
  user/lstewart/alq_varlen_8.x/lib/libc/net/getaddrinfo.3
  user/lstewart/alq_varlen_8.x/lib/libc/net/getaddrinfo.c
  user/lstewart/alq_varlen_8.x/lib/libc/net/gethostbydns.c
  user/lstewart/alq_varlen_8.x/lib/libc/net/rcmd.3
  user/lstewart/alq_varlen_8.x/lib/libc/posix1e/acl_add_perm.3
  user/lstewart/alq_varlen_8.x/lib/libc/posix1e/acl_calc_mask.3
  user/lstewart/alq_varlen_8.x/lib/libc/posix1e/acl_calc_mask.c
  user/lstewart/alq_varlen_8.x/lib/libc/posix1e/acl_clear_perms.3
  user/lstewart/alq_varlen_8.x/lib/libc/posix1e/acl_copy.c
  user/lstewart/alq_varlen_8.x/lib/libc/posix1e/acl_copy_entry.3
  user/lstewart/alq_varlen_8.x/lib/libc/posix1e/acl_create_entry.3
  user/lstewart/alq_varlen_8.x/lib/libc/posix1e/acl_delete_entry.3
  user/lstewart/alq_varlen_8.x/lib/libc/posix1e/acl_delete_perm.3
  user/lstewart/alq_varlen_8.x/lib/libc/posix1e/acl_get_entry.3
  user/lstewart/alq_varlen_8.x/lib/libc/posix1e/acl_get_perm_np.3
  user/lstewart/alq_varlen_8.x/lib/libc/posix1e/acl_get_permset.3
  user/lstewart/alq_varlen_8.x/lib/libc/posix1e/acl_get_qualifier.3
  user/lstewart/alq_varlen_8.x/lib/libc/posix1e/acl_get_tag_type.3
  user/lstewart/alq_varlen_8.x/lib/libc/posix1e/acl_perm.c
  user/lstewart/alq_varlen_8.x/lib/libc/posix1e/acl_set_permset.3
  user/lstewart/alq_varlen_8.x/lib/libc/posix1e/acl_set_qualifier.3
  user/lstewart/alq_varlen_8.x/lib/libc/posix1e/acl_set_tag_type.3
  user/lstewart/alq_varlen_8.x/lib/libc/posix1e/acl_size.c
  user/lstewart/alq_varlen_8.x/lib/libc/powerpc/sys/Makefile.inc
  user/lstewart/alq_varlen_8.x/lib/libc/resolv/res_debug.c
  user/lstewart/alq_varlen_8.x/lib/libc/resolv/res_mkquery.c
  user/lstewart/alq_varlen_8.x/lib/libc/resolv/res_query.c
  user/lstewart/alq_varlen_8.x/lib/libc/resolv/res_send.c
  user/lstewart/alq_varlen_8.x/lib/libc/sparc64/sys/Makefile.inc
  user/lstewart/alq_varlen_8.x/lib/libc/sparc64/sys/__sparc_utrap.c
  user/lstewart/alq_varlen_8.x/lib/libc/stdio/ferror.3
  user/lstewart/alq_varlen_8.x/lib/libc/stdio/fputws.c
  user/lstewart/alq_varlen_8.x/lib/libc/stdio/fread.c
  user/lstewart/alq_varlen_8.x/lib/libc/stdio/printf.3
  user/lstewart/alq_varlen_8.x/lib/libc/stdio/vfprintf.c
  user/lstewart/alq_varlen_8.x/lib/libc/stdio/vfscanf.c
  user/lstewart/alq_varlen_8.x/lib/libc/stdio/vfwprintf.c
  user/lstewart/alq_varlen_8.x/lib/libc/stdio/vfwscanf.c
  user/lstewart/alq_varlen_8.x/lib/libc/stdio/vswscanf.c
  user/lstewart/alq_varlen_8.x/lib/libc/stdio/wsetup.c
  user/lstewart/alq_varlen_8.x/lib/libc/stdlib/atol.3
  user/lstewart/alq_varlen_8.x/lib/libc/stdlib/malloc.3
  user/lstewart/alq_varlen_8.x/lib/libc/stdlib/malloc.c
  user/lstewart/alq_varlen_8.x/lib/libc/stdlib/ptsname.c
  user/lstewart/alq_varlen_8.x/lib/libc/stdtime/   (props changed)
  user/lstewart/alq_varlen_8.x/lib/libc/stdtime/strftime.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/Makefile.inc
  user/lstewart/alq_varlen_8.x/lib/libc/string/Symbol.map
  user/lstewart/alq_varlen_8.x/lib/libc/string/ffs.3
  user/lstewart/alq_varlen_8.x/lib/libc/string/ffsl.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/memccpy.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/memchr.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/memcmp.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/memmem.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/strcasecmp.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/strcasestr.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/strcmp.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/strcoll.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/strdup.3
  user/lstewart/alq_varlen_8.x/lib/libc/string/strdup.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/strlcat.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/strlcpy.3
  user/lstewart/alq_varlen_8.x/lib/libc/string/strlen.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/strmode.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/strncmp.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/strncpy.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/strnstr.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/strpbrk.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/strsep.3
  user/lstewart/alq_varlen_8.x/lib/libc/string/strsep.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/strstr.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/wcscat.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/wcscmp.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/wcscpy.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/wcscspn.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/wcslcat.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/wcslcpy.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/wcslen.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/wcsncat.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/wcsncmp.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/wcspbrk.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/wcsspn.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/wcsstr.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/wmemchr.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/wmemcmp.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/wmemcpy.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/wmemmove.c
  user/lstewart/alq_varlen_8.x/lib/libc/string/wmemset.c
  user/lstewart/alq_varlen_8.x/lib/libc/sys/Symbol.map
  user/lstewart/alq_varlen_8.x/lib/libc/sys/cpuset_getaffinity.2
  user/lstewart/alq_varlen_8.x/lib/libc/sys/jail.2
  user/lstewart/alq_varlen_8.x/lib/libc/sys/kldunload.2
  user/lstewart/alq_varlen_8.x/lib/libc/sys/mmap.2
  user/lstewart/alq_varlen_8.x/lib/libc/sys/pipe.2
  user/lstewart/alq_varlen_8.x/lib/libc/sys/recv.2
  user/lstewart/alq_varlen_8.x/lib/libc/sys/rename.2
  user/lstewart/alq_varlen_8.x/lib/libc/sys/send.2
  user/lstewart/alq_varlen_8.x/lib/libc/sys/socket.2
  user/lstewart/alq_varlen_8.x/lib/libc/sys/timer_create.2
  user/lstewart/alq_varlen_8.x/lib/libc/xdr/Symbol.map
  user/lstewart/alq_varlen_8.x/lib/libc/xdr/xdr.c
  user/lstewart/alq_varlen_8.x/lib/libc_r/Makefile
  user/lstewart/alq_varlen_8.x/lib/libc_r/uthread/uthread_init.c
  user/lstewart/alq_varlen_8.x/lib/libcam/camlib.c
  user/lstewart/alq_varlen_8.x/lib/libdisk/open_disk.c
  user/lstewart/alq_varlen_8.x/lib/libfetch/fetch.3
  user/lstewart/alq_varlen_8.x/lib/libfetch/fetch.c
  user/lstewart/alq_varlen_8.x/lib/libfetch/fetch.h
  user/lstewart/alq_varlen_8.x/lib/libfetch/http.c
  user/lstewart/alq_varlen_8.x/lib/libkse/Makefile
  user/lstewart/alq_varlen_8.x/lib/libkvm/Makefile
  user/lstewart/alq_varlen_8.x/lib/libkvm/kvm_arm.c
  user/lstewart/alq_varlen_8.x/lib/libkvm/kvm_private.h
  user/lstewart/alq_varlen_8.x/lib/libkvm/kvm_proc.c
  user/lstewart/alq_varlen_8.x/lib/libmagic/Makefile
  user/lstewart/alq_varlen_8.x/lib/libmagic/config.h
  user/lstewart/alq_varlen_8.x/lib/libmd/Makefile
  user/lstewart/alq_varlen_8.x/lib/libmd/mdX.3
  user/lstewart/alq_varlen_8.x/lib/libpmc/libpmc.c
  user/lstewart/alq_varlen_8.x/lib/libpmc/pmc.3
  user/lstewart/alq_varlen_8.x/lib/libpmc/pmc.atom.3
  user/lstewart/alq_varlen_8.x/lib/libpmc/pmc.core.3
  user/lstewart/alq_varlen_8.x/lib/libpmc/pmc.core2.3
  user/lstewart/alq_varlen_8.x/lib/libpmc/pmc.iaf.3
  user/lstewart/alq_varlen_8.x/lib/libpmc/pmclog.c
  user/lstewart/alq_varlen_8.x/lib/libproc/libproc.h
  user/lstewart/alq_varlen_8.x/lib/libproc/proc_create.c
  user/lstewart/alq_varlen_8.x/lib/librpcsec_gss/svc_rpcsec_gss.c
  user/lstewart/alq_varlen_8.x/lib/libstand/bootp.c
  user/lstewart/alq_varlen_8.x/lib/libstand/if_ether.h
  user/lstewart/alq_varlen_8.x/lib/libstand/nfs.c
  user/lstewart/alq_varlen_8.x/lib/libstand/printf.c
  user/lstewart/alq_varlen_8.x/lib/libstand/stand.h
  user/lstewart/alq_varlen_8.x/lib/libthr/Makefile
  user/lstewart/alq_varlen_8.x/lib/libthr/thread/thr_fork.c
  user/lstewart/alq_varlen_8.x/lib/libthr/thread/thr_rtld.c
  user/lstewart/alq_varlen_8.x/lib/libusbhid/Makefile
  user/lstewart/alq_varlen_8.x/lib/libusbhid/descr.c
  user/lstewart/alq_varlen_8.x/lib/libusbhid/usbhid.3
  user/lstewart/alq_varlen_8.x/lib/libusbhid/usbhid.h
  user/lstewart/alq_varlen_8.x/lib/libusbhid/usbvar.h
  user/lstewart/alq_varlen_8.x/lib/libutil/   (props changed)
  user/lstewart/alq_varlen_8.x/lib/libutil/Makefile
  user/lstewart/alq_varlen_8.x/lib/libutil/flopen.3
  user/lstewart/alq_varlen_8.x/lib/libutil/flopen.c
  user/lstewart/alq_varlen_8.x/lib/libutil/gr_util.c
  user/lstewart/alq_varlen_8.x/lib/libutil/libutil.h
  user/lstewart/alq_varlen_8.x/lib/libutil/login_cap.c
  user/lstewart/alq_varlen_8.x/lib/libutil/login_cap.h
  user/lstewart/alq_varlen_8.x/lib/libutil/login_class.3
  user/lstewart/alq_varlen_8.x/lib/libutil/login_class.c
  user/lstewart/alq_varlen_8.x/lib/libutil/login_times.3
  user/lstewart/alq_varlen_8.x/lib/libutil/login_times.c
  user/lstewart/alq_varlen_8.x/lib/libutil/pidfile.3
  user/lstewart/alq_varlen_8.x/lib/libutil/pidfile.c
  user/lstewart/alq_varlen_8.x/lib/libutil/pty.c
  user/lstewart/alq_varlen_8.x/lib/libutil/realhostname.c
  user/lstewart/alq_varlen_8.x/lib/msun/src/e_rem_pio2.c
  user/lstewart/alq_varlen_8.x/lib/msun/src/e_rem_pio2f.c
  user/lstewart/alq_varlen_8.x/lib/msun/src/k_cosf.c
  user/lstewart/alq_varlen_8.x/lib/msun/src/k_sinf.c
  user/lstewart/alq_varlen_8.x/lib/msun/src/k_tanf.c
  user/lstewart/alq_varlen_8.x/lib/msun/src/math.h
  user/lstewart/alq_varlen_8.x/lib/msun/src/math_private.h
  user/lstewart/alq_varlen_8.x/lib/ncurses/ncurses/Makefile
  user/lstewart/alq_varlen_8.x/lib/ncurses/ncurses/ncurses_cfg.h
  user/lstewart/alq_varlen_8.x/libexec/bootpd/rtmsg.c
  user/lstewart/alq_varlen_8.x/libexec/comsat/comsat.c
  user/lstewart/alq_varlen_8.x/libexec/ftpd/extern.h
  user/lstewart/alq_varlen_8.x/libexec/ftpd/ftpcmd.y
  user/lstewart/alq_varlen_8.x/libexec/ftpd/ftpd.8
  user/lstewart/alq_varlen_8.x/libexec/ftpd/ftpd.c
  user/lstewart/alq_varlen_8.x/libexec/rpc.rquotad/Makefile
  user/lstewart/alq_varlen_8.x/libexec/rpc.rquotad/rquotad.c
  user/lstewart/alq_varlen_8.x/libexec/rtld-elf/Symbol.map
  user/lstewart/alq_varlen_8.x/libexec/rtld-elf/rtld.c
  user/lstewart/alq_varlen_8.x/libexec/rtld-elf/rtld_lock.c
  user/lstewart/alq_varlen_8.x/libexec/rtld-elf/rtld_lock.h
  user/lstewart/alq_varlen_8.x/libexec/telnetd/Makefile
  user/lstewart/alq_varlen_8.x/release/Makefile
  user/lstewart/alq_varlen_8.x/release/doc/en_US.ISO8859-1/hardware/article.sgml
  user/lstewart/alq_varlen_8.x/release/doc/en_US.ISO8859-1/relnotes/article.sgml
  user/lstewart/alq_varlen_8.x/release/picobsd/tinyware/ns/ns.c
  user/lstewart/alq_varlen_8.x/release/scripts/doFS.sh
  user/lstewart/alq_varlen_8.x/sbin/   (props changed)
  user/lstewart/alq_varlen_8.x/sbin/atacontrol/atacontrol.8
  user/lstewart/alq_varlen_8.x/sbin/bsdlabel/bsdlabel.8
  user/lstewart/alq_varlen_8.x/sbin/ddb/ddb.8
  user/lstewart/alq_varlen_8.x/sbin/devd/devd.cc
  user/lstewart/alq_varlen_8.x/sbin/devd/devd.conf.5
  user/lstewart/alq_varlen_8.x/sbin/dumpfs/dumpfs.8
  user/lstewart/alq_varlen_8.x/sbin/dumpfs/dumpfs.c
  user/lstewart/alq_varlen_8.x/sbin/fdisk/fdisk.c
  user/lstewart/alq_varlen_8.x/sbin/fsck/fsck.8
  user/lstewart/alq_varlen_8.x/sbin/fsck/fsck.c
  user/lstewart/alq_varlen_8.x/sbin/fsck/fsutil.h
  user/lstewart/alq_varlen_8.x/sbin/fsck_ffs/fsck.h
  user/lstewart/alq_varlen_8.x/sbin/fsck_ffs/fsck_ffs.8
  user/lstewart/alq_varlen_8.x/sbin/fsck_ffs/fsutil.c
  user/lstewart/alq_varlen_8.x/sbin/fsck_ffs/inode.c
  user/lstewart/alq_varlen_8.x/sbin/fsck_ffs/main.c
  user/lstewart/alq_varlen_8.x/sbin/fsck_ffs/pass1.c
  user/lstewart/alq_varlen_8.x/sbin/fsck_ffs/setup.c
  user/lstewart/alq_varlen_8.x/sbin/geom/class/part/Makefile
  user/lstewart/alq_varlen_8.x/sbin/geom/class/part/geom_part.c
  user/lstewart/alq_varlen_8.x/sbin/geom/class/part/gpart.8
  user/lstewart/alq_varlen_8.x/sbin/geom/class/virstor/gvirstor.8
  user/lstewart/alq_varlen_8.x/sbin/geom/core/geom.c
  user/lstewart/alq_varlen_8.x/sbin/ifconfig/ifconfig.8
  user/lstewart/alq_varlen_8.x/sbin/ifconfig/ifconfig.c
  user/lstewart/alq_varlen_8.x/sbin/ifconfig/ifieee80211.c
  user/lstewart/alq_varlen_8.x/sbin/ifconfig/regdomain.c
  user/lstewart/alq_varlen_8.x/sbin/ifconfig/regdomain.h
  user/lstewart/alq_varlen_8.x/sbin/ipfw/Makefile
  user/lstewart/alq_varlen_8.x/sbin/ipfw/ipfw.8
  user/lstewart/alq_varlen_8.x/sbin/ipfw/ipfw2.c
  user/lstewart/alq_varlen_8.x/sbin/iscontrol/auth_subr.c
  user/lstewart/alq_varlen_8.x/sbin/iscontrol/config.c
  user/lstewart/alq_varlen_8.x/sbin/iscontrol/fsm.c
  user/lstewart/alq_varlen_8.x/sbin/iscontrol/iscontrol.8
  user/lstewart/alq_varlen_8.x/sbin/iscontrol/iscontrol.c
  user/lstewart/alq_varlen_8.x/sbin/iscontrol/iscontrol.h
  user/lstewart/alq_varlen_8.x/sbin/iscontrol/iscsi.conf.5
  user/lstewart/alq_varlen_8.x/sbin/iscontrol/login.c
  user/lstewart/alq_varlen_8.x/sbin/iscontrol/misc.c
  user/lstewart/alq_varlen_8.x/sbin/iscontrol/pdu.c
  user/lstewart/alq_varlen_8.x/sbin/kldstat/kldstat.c
  user/lstewart/alq_varlen_8.x/sbin/md5/md5.1
  user/lstewart/alq_varlen_8.x/sbin/mdconfig/mdconfig.8
  user/lstewart/alq_varlen_8.x/sbin/mdconfig/mdconfig.c
  user/lstewart/alq_varlen_8.x/sbin/mount/getmntopts.c
  user/lstewart/alq_varlen_8.x/sbin/mount/mount.c
  user/lstewart/alq_varlen_8.x/sbin/mount/mount_fs.c
  user/lstewart/alq_varlen_8.x/sbin/mount_msdosfs/mount_msdosfs.8
  user/lstewart/alq_varlen_8.x/sbin/mount_msdosfs/mount_msdosfs.c
  user/lstewart/alq_varlen_8.x/sbin/mount_nfs/mount_nfs.c
  user/lstewart/alq_varlen_8.x/sbin/mount_ntfs/mount_ntfs.8
  user/lstewart/alq_varlen_8.x/sbin/newfs/Makefile
  user/lstewart/alq_varlen_8.x/sbin/newfs/mkfs.c
  user/lstewart/alq_varlen_8.x/sbin/newfs/newfs.8
  user/lstewart/alq_varlen_8.x/sbin/newfs/newfs.c
  user/lstewart/alq_varlen_8.x/sbin/newfs/newfs.h
  user/lstewart/alq_varlen_8.x/sbin/newfs_msdos/newfs_msdos.8
  user/lstewart/alq_varlen_8.x/sbin/newfs_msdos/newfs_msdos.c
  user/lstewart/alq_varlen_8.x/sbin/ping/ping.8
  user/lstewart/alq_varlen_8.x/sbin/reboot/reboot.c
  user/lstewart/alq_varlen_8.x/sbin/recoverdisk/recoverdisk.c
  user/lstewart/alq_varlen_8.x/sbin/restore/interactive.c
  user/lstewart/alq_varlen_8.x/sbin/route/route.c
  user/lstewart/alq_varlen_8.x/sbin/routed/table.c
  user/lstewart/alq_varlen_8.x/sbin/savecore/savecore.8
  user/lstewart/alq_varlen_8.x/sbin/shutdown/shutdown.8
  user/lstewart/alq_varlen_8.x/secure/usr.sbin/sshd/Makefile
  user/lstewart/alq_varlen_8.x/share/doc/bind9/Makefile
  user/lstewart/alq_varlen_8.x/share/examples/cvsup/refuse.README
  user/lstewart/alq_varlen_8.x/share/man/man4/Makefile
  user/lstewart/alq_varlen_8.x/share/man/man4/acpi_aiboost.4
  user/lstewart/alq_varlen_8.x/share/man/man4/acpi_asus.4
  user/lstewart/alq_varlen_8.x/share/man/man4/ae.4
  user/lstewart/alq_varlen_8.x/share/man/man4/altq.4
  user/lstewart/alq_varlen_8.x/share/man/man4/atapicam.4
  user/lstewart/alq_varlen_8.x/share/man/man4/ath.4
  user/lstewart/alq_varlen_8.x/share/man/man4/ath_hal.4
  user/lstewart/alq_varlen_8.x/share/man/man4/bce.4
  user/lstewart/alq_varlen_8.x/share/man/man4/bge.4
  user/lstewart/alq_varlen_8.x/share/man/man4/cd.4
  user/lstewart/alq_varlen_8.x/share/man/man4/cpuctl.4
  user/lstewart/alq_varlen_8.x/share/man/man4/cxgb.4
  user/lstewart/alq_varlen_8.x/share/man/man4/ddb.4
  user/lstewart/alq_varlen_8.x/share/man/man4/fxp.4
  user/lstewart/alq_varlen_8.x/share/man/man4/gem.4
  user/lstewart/alq_varlen_8.x/share/man/man4/hme.4
  user/lstewart/alq_varlen_8.x/share/man/man4/iic.4
  user/lstewart/alq_varlen_8.x/share/man/man4/man4.arm/Makefile
  user/lstewart/alq_varlen_8.x/share/man/man4/man4.powerpc/Makefile
  user/lstewart/alq_varlen_8.x/share/man/man4/miibus.4
  user/lstewart/alq_varlen_8.x/share/man/man4/mmc.4
  user/lstewart/alq_varlen_8.x/share/man/man4/mmcsd.4
  user/lstewart/alq_varlen_8.x/share/man/man4/ndis.4
  user/lstewart/alq_varlen_8.x/share/man/man4/ng_bpf.4
  user/lstewart/alq_varlen_8.x/share/man/man4/ng_tty.4
  user/lstewart/alq_varlen_8.x/share/man/man4/nge.4
  user/lstewart/alq_varlen_8.x/share/man/man4/re.4
  user/lstewart/alq_varlen_8.x/share/man/man4/rl.4
  user/lstewart/alq_varlen_8.x/share/man/man4/route.4
  user/lstewart/alq_varlen_8.x/share/man/man4/rum.4
  user/lstewart/alq_varlen_8.x/share/man/man4/sk.4
  user/lstewart/alq_varlen_8.x/share/man/man4/smb.4
  user/lstewart/alq_varlen_8.x/share/man/man4/snd_hda.4
  user/lstewart/alq_varlen_8.x/share/man/man4/snd_ich.4
  user/lstewart/alq_varlen_8.x/share/man/man4/snp.4
  user/lstewart/alq_varlen_8.x/share/man/man4/sysmouse.4
  user/lstewart/alq_varlen_8.x/share/man/man4/textdump.4
  user/lstewart/alq_varlen_8.x/share/man/man4/u3g.4
  user/lstewart/alq_varlen_8.x/share/man/man4/umodem.4
  user/lstewart/alq_varlen_8.x/share/man/man4/upgt.4
  user/lstewart/alq_varlen_8.x/share/man/man4/uscanner.4
  user/lstewart/alq_varlen_8.x/share/man/man4/vlan.4
  user/lstewart/alq_varlen_8.x/share/man/man4/zyd.4
  user/lstewart/alq_varlen_8.x/share/man/man5/Makefile
  user/lstewart/alq_varlen_8.x/share/man/man5/fstab.5
  user/lstewart/alq_varlen_8.x/share/man/man5/nsswitch.conf.5
  user/lstewart/alq_varlen_8.x/share/man/man5/rc.conf.5
  user/lstewart/alq_varlen_8.x/share/man/man7/Makefile
  user/lstewart/alq_varlen_8.x/share/man/man7/build.7
  user/lstewart/alq_varlen_8.x/share/man/man7/hier.7
  user/lstewart/alq_varlen_8.x/share/man/man7/ports.7
  user/lstewart/alq_varlen_8.x/share/man/man7/tuning.7
  user/lstewart/alq_varlen_8.x/share/man/man8/Makefile
  user/lstewart/alq_varlen_8.x/share/man/man9/Makefile
  user/lstewart/alq_varlen_8.x/share/man/man9/VFS_SET.9
  user/lstewart/alq_varlen_8.x/share/man/man9/VOP_ACCESS.9
  user/lstewart/alq_varlen_8.x/share/man/man9/VOP_STRATEGY.9
  user/lstewart/alq_varlen_8.x/share/man/man9/bus_dma.9
  user/lstewart/alq_varlen_8.x/share/man/man9/dev_clone.9
  user/lstewart/alq_varlen_8.x/share/man/man9/devfs_set_cdevpriv.9
  user/lstewart/alq_varlen_8.x/share/man/man9/domain.9
  user/lstewart/alq_varlen_8.x/share/man/man9/ifnet.9
  user/lstewart/alq_varlen_8.x/share/man/man9/insmntque.9
  user/lstewart/alq_varlen_8.x/share/man/man9/kthread.9
  user/lstewart/alq_varlen_8.x/share/man/man9/ktr.9
  user/lstewart/alq_varlen_8.x/share/man/man9/lock.9
  user/lstewart/alq_varlen_8.x/share/man/man9/malloc.9
  user/lstewart/alq_varlen_8.x/share/man/man9/pseudofs.9
  user/lstewart/alq_varlen_8.x/share/man/man9/redzone.9
  user/lstewart/alq_varlen_8.x/share/man/man9/rtalloc.9
  user/lstewart/alq_varlen_8.x/share/man/man9/rtentry.9
  user/lstewart/alq_varlen_8.x/share/man/man9/style.9
  user/lstewart/alq_varlen_8.x/share/man/man9/vaccess.9
  user/lstewart/alq_varlen_8.x/share/man/man9/vaccess_acl_posix1e.9
  user/lstewart/alq_varlen_8.x/share/man/man9/vfs_busy.9
  user/lstewart/alq_varlen_8.x/share/man/man9/vinvalbuf.9
  user/lstewart/alq_varlen_8.x/share/man/man9/vn_fullpath.9
  user/lstewart/alq_varlen_8.x/share/misc/bsd-family-tree
  user/lstewart/alq_varlen_8.x/share/misc/committers-doc.dot
  user/lstewart/alq_varlen_8.x/share/misc/committers-ports.dot
  user/lstewart/alq_varlen_8.x/share/misc/committers-src.dot
  user/lstewart/alq_varlen_8.x/share/misc/pci_vendors
  user/lstewart/alq_varlen_8.x/share/mk/bsd.libnames.mk
  user/lstewart/alq_varlen_8.x/share/mk/bsd.own.mk
  user/lstewart/alq_varlen_8.x/share/zoneinfo/   (props changed)
  user/lstewart/alq_varlen_8.x/share/zoneinfo/asia
  user/lstewart/alq_varlen_8.x/share/zoneinfo/backward
  user/lstewart/alq_varlen_8.x/share/zoneinfo/europe
  user/lstewart/alq_varlen_8.x/share/zoneinfo/leapseconds
  user/lstewart/alq_varlen_8.x/share/zoneinfo/northamerica
  user/lstewart/alq_varlen_8.x/share/zoneinfo/southamerica
  user/lstewart/alq_varlen_8.x/share/zoneinfo/zone.tab
  user/lstewart/alq_varlen_8.x/sys/   (props changed)
  user/lstewart/alq_varlen_8.x/sys/Makefile
  user/lstewart/alq_varlen_8.x/sys/amd64/Makefile
  user/lstewart/alq_varlen_8.x/sys/amd64/amd64/amd64_mem.c
  user/lstewart/alq_varlen_8.x/sys/amd64/amd64/busdma_machdep.c
  user/lstewart/alq_varlen_8.x/sys/amd64/amd64/cpu_switch.S
  user/lstewart/alq_varlen_8.x/sys/amd64/amd64/db_trace.c
  user/lstewart/alq_varlen_8.x/sys/amd64/amd64/dump_machdep.c
  user/lstewart/alq_varlen_8.x/sys/amd64/amd64/elf_machdep.c
  user/lstewart/alq_varlen_8.x/sys/amd64/amd64/exception.S
  user/lstewart/alq_varlen_8.x/sys/amd64/amd64/fpu.c
  user/lstewart/alq_varlen_8.x/sys/amd64/amd64/genassym.c
  user/lstewart/alq_varlen_8.x/sys/amd64/amd64/identcpu.c
  user/lstewart/alq_varlen_8.x/sys/amd64/amd64/initcpu.c
  user/lstewart/alq_varlen_8.x/sys/amd64/amd64/intr_machdep.c
  user/lstewart/alq_varlen_8.x/sys/amd64/amd64/io_apic.c
  user/lstewart/alq_varlen_8.x/sys/amd64/amd64/local_apic.c
  user/lstewart/alq_varlen_8.x/sys/amd64/amd64/machdep.c
  user/lstewart/alq_varlen_8.x/sys/amd64/amd64/minidump_machdep.c
  user/lstewart/alq_varlen_8.x/sys/amd64/amd64/mp_machdep.c
  user/lstewart/alq_varlen_8.x/sys/amd64/amd64/msi.c
  user/lstewart/alq_varlen_8.x/sys/amd64/amd64/pmap.c
  user/lstewart/alq_varlen_8.x/sys/amd64/amd64/prof_machdep.c
  user/lstewart/alq_varlen_8.x/sys/amd64/amd64/tsc.c
  user/lstewart/alq_varlen_8.x/sys/amd64/conf/DEFAULTS
  user/lstewart/alq_varlen_8.x/sys/amd64/conf/GENERIC
  user/lstewart/alq_varlen_8.x/sys/amd64/conf/NOTES
  user/lstewart/alq_varlen_8.x/sys/amd64/ia32/ia32_signal.c
  user/lstewart/alq_varlen_8.x/sys/amd64/ia32/ia32_sigtramp.S
  user/lstewart/alq_varlen_8.x/sys/amd64/include/apicreg.h
  user/lstewart/alq_varlen_8.x/sys/amd64/include/apicvar.h
  user/lstewart/alq_varlen_8.x/sys/amd64/include/atomic.h
  user/lstewart/alq_varlen_8.x/sys/amd64/include/clock.h
  user/lstewart/alq_varlen_8.x/sys/amd64/include/cpufunc.h
  user/lstewart/alq_varlen_8.x/sys/amd64/include/cputypes.h
  user/lstewart/alq_varlen_8.x/sys/amd64/include/elf.h
  user/lstewart/alq_varlen_8.x/sys/amd64/include/fpu.h
  user/lstewart/alq_varlen_8.x/sys/amd64/include/intr_machdep.h
  user/lstewart/alq_varlen_8.x/sys/amd64/include/legacyvar.h
  user/lstewart/alq_varlen_8.x/sys/amd64/include/md_var.h
  user/lstewart/alq_varlen_8.x/sys/amd64/include/pmc_mdep.h
  user/lstewart/alq_varlen_8.x/sys/amd64/include/specialreg.h
  user/lstewart/alq_varlen_8.x/sys/amd64/linux32/linux.h
  user/lstewart/alq_varlen_8.x/sys/amd64/linux32/linux32_locore.s
  user/lstewart/alq_varlen_8.x/sys/amd64/linux32/linux32_machdep.c
  user/lstewart/alq_varlen_8.x/sys/amd64/linux32/linux32_proto.h
  user/lstewart/alq_varlen_8.x/sys/amd64/linux32/linux32_syscall.h
  user/lstewart/alq_varlen_8.x/sys/amd64/linux32/linux32_sysent.c
  user/lstewart/alq_varlen_8.x/sys/amd64/linux32/linux32_sysvec.c
  user/lstewart/alq_varlen_8.x/sys/amd64/linux32/syscalls.master
  user/lstewart/alq_varlen_8.x/sys/amd64/pci/pci_bus.c
  user/lstewart/alq_varlen_8.x/sys/arm/arm/busdma_machdep.c
  user/lstewart/alq_varlen_8.x/sys/arm/arm/cpufunc.c
  user/lstewart/alq_varlen_8.x/sys/arm/arm/dump_machdep.c
  user/lstewart/alq_varlen_8.x/sys/arm/arm/elf_machdep.c
  user/lstewart/alq_varlen_8.x/sys/arm/arm/elf_trampoline.c
  user/lstewart/alq_varlen_8.x/sys/arm/arm/genassym.c
  user/lstewart/alq_varlen_8.x/sys/arm/arm/identcpu.c
  user/lstewart/alq_varlen_8.x/sys/arm/arm/machdep.c
  user/lstewart/alq_varlen_8.x/sys/arm/arm/pmap.c
  user/lstewart/alq_varlen_8.x/sys/arm/arm/swtch.S
  user/lstewart/alq_varlen_8.x/sys/arm/arm/undefined.c
  user/lstewart/alq_varlen_8.x/sys/arm/arm/vm_machdep.c
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91.c
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91_mci.c
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91_mcireg.h
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91_pdcreg.h
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91_pio.c
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91_pioreg.h
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91_piovar.h
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91_pmc.c
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91_pmcreg.h
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91_pmcvar.h
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91_rtc.c
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91_rtcreg.h
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91_spi.c
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91_spireg.h
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91_ssc.c
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91_sscreg.h
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91_st.c
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91_streg.h
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91_twi.c
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91_twiio.h
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91_twireg.h
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91_usartreg.h
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91rm92reg.h
  user/lstewart/alq_varlen_8.x/sys/arm/at91/at91var.h
  user/lstewart/alq_varlen_8.x/sys/arm/at91/files.at91
  user/lstewart/alq_varlen_8.x/sys/arm/at91/if_ate.c
  user/lstewart/alq_varlen_8.x/sys/arm/at91/if_atereg.h
  user/lstewart/alq_varlen_8.x/sys/arm/at91/ohci_atmelarm.c
  user/lstewart/alq_varlen_8.x/sys/arm/at91/std.at91
  user/lstewart/alq_varlen_8.x/sys/arm/at91/std.kb920x
  user/lstewart/alq_varlen_8.x/sys/arm/at91/uart_bus_at91usart.c
  user/lstewart/alq_varlen_8.x/sys/arm/at91/uart_cpu_at91rm9200usart.c
  user/lstewart/alq_varlen_8.x/sys/arm/at91/uart_dev_at91usart.c
  user/lstewart/alq_varlen_8.x/sys/arm/conf/AVILA
  user/lstewart/alq_varlen_8.x/sys/arm/conf/AVILA.hints
  user/lstewart/alq_varlen_8.x/sys/arm/conf/BWCT
  user/lstewart/alq_varlen_8.x/sys/arm/conf/CRB
  user/lstewart/alq_varlen_8.x/sys/arm/conf/DB-78XXX
  user/lstewart/alq_varlen_8.x/sys/arm/conf/DB-88F5XXX
  user/lstewart/alq_varlen_8.x/sys/arm/conf/DB-88F6XXX
  user/lstewart/alq_varlen_8.x/sys/arm/conf/EP80219
  user/lstewart/alq_varlen_8.x/sys/arm/conf/GUMSTIX
  user/lstewart/alq_varlen_8.x/sys/arm/conf/HL200
  user/lstewart/alq_varlen_8.x/sys/arm/conf/IQ31244
  user/lstewart/alq_varlen_8.x/sys/arm/conf/KB920X
  user/lstewart/alq_varlen_8.x/sys/arm/conf/NSLU
  user/lstewart/alq_varlen_8.x/sys/arm/conf/SIMICS
  user/lstewart/alq_varlen_8.x/sys/arm/conf/SKYEYE
  user/lstewart/alq_varlen_8.x/sys/arm/include/armreg.h
  user/lstewart/alq_varlen_8.x/sys/arm/include/atomic.h
  user/lstewart/alq_varlen_8.x/sys/arm/include/cpufunc.h
  user/lstewart/alq_varlen_8.x/sys/arm/include/elf.h
  user/lstewart/alq_varlen_8.x/sys/arm/include/ieee.h
  user/lstewart/alq_varlen_8.x/sys/arm/include/intr.h
  user/lstewart/alq_varlen_8.x/sys/arm/include/md_var.h
  user/lstewart/alq_varlen_8.x/sys/arm/include/pmap.h
  user/lstewart/alq_varlen_8.x/sys/arm/include/proc.h
  user/lstewart/alq_varlen_8.x/sys/arm/include/sysarch.h
  user/lstewart/alq_varlen_8.x/sys/arm/include/vmparam.h
  user/lstewart/alq_varlen_8.x/sys/arm/mv/common.c
  user/lstewart/alq_varlen_8.x/sys/arm/mv/discovery/db78xxx.c
  user/lstewart/alq_varlen_8.x/sys/arm/mv/discovery/discovery.c
  user/lstewart/alq_varlen_8.x/sys/arm/mv/files.mv
  user/lstewart/alq_varlen_8.x/sys/arm/mv/gpio.c
  user/lstewart/alq_varlen_8.x/sys/arm/mv/kirkwood/db88f6xxx.c
  user/lstewart/alq_varlen_8.x/sys/arm/mv/kirkwood/kirkwood.c
  user/lstewart/alq_varlen_8.x/sys/arm/mv/mv_machdep.c
  user/lstewart/alq_varlen_8.x/sys/arm/mv/mvreg.h
  user/lstewart/alq_varlen_8.x/sys/arm/mv/mvvar.h
  user/lstewart/alq_varlen_8.x/sys/arm/mv/obio.c
  user/lstewart/alq_varlen_8.x/sys/arm/mv/orion/db88f5xxx.c
  user/lstewart/alq_varlen_8.x/sys/arm/mv/orion/orion.c
  user/lstewart/alq_varlen_8.x/sys/arm/mv/orion/std.db88f5xxx
  user/lstewart/alq_varlen_8.x/sys/arm/sa11x0/assabet_machdep.c
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/i80321/ep80219_machdep.c
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/i80321/iq31244_machdep.c
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/i8134x/crb_machdep.c
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/i8134x/i81342_mcu.c
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/avila_ata.c
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/avila_led.c
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/avila_machdep.c
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/files.avila
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/files.ixp425
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/if_npe.c
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/if_npereg.h
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/ixp425.c
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/ixp425_iic.c
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/ixp425_intr.h
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/ixp425_mem.c
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/ixp425_npe.c
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/ixp425_npevar.h
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/ixp425_pci.c
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/ixp425_qmgr.c
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/ixp425_timer.c
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/ixp425_wdog.c
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/ixp425reg.h
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/ixp425var.h
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/ixp425/std.avila
  user/lstewart/alq_varlen_8.x/sys/arm/xscale/pxa/pxa_machdep.c
  user/lstewart/alq_varlen_8.x/sys/boot/Makefile
  user/lstewart/alq_varlen_8.x/sys/boot/arm/ixp425/boot2/arm_init.S
  user/lstewart/alq_varlen_8.x/sys/boot/arm/ixp425/boot2/boot2.c
  user/lstewart/alq_varlen_8.x/sys/boot/arm/ixp425/boot2/ixp425_board.c
  user/lstewart/alq_varlen_8.x/sys/boot/arm/ixp425/boot2/lib.h
  user/lstewart/alq_varlen_8.x/sys/boot/arm/uboot/Makefile
  user/lstewart/alq_varlen_8.x/sys/boot/arm/uboot/conf.c
  user/lstewart/alq_varlen_8.x/sys/boot/arm/uboot/version
  user/lstewart/alq_varlen_8.x/sys/boot/common/bootstrap.h
  user/lstewart/alq_varlen_8.x/sys/boot/common/interp.c
  user/lstewart/alq_varlen_8.x/sys/boot/common/loader.8
  user/lstewart/alq_varlen_8.x/sys/boot/common/module.c
  user/lstewart/alq_varlen_8.x/sys/boot/forth/loader.4th
  user/lstewart/alq_varlen_8.x/sys/boot/forth/loader.conf
  user/lstewart/alq_varlen_8.x/sys/boot/forth/pnp.4th
  user/lstewart/alq_varlen_8.x/sys/boot/forth/support.4th
  user/lstewart/alq_varlen_8.x/sys/boot/i386/Makefile
  user/lstewart/alq_varlen_8.x/sys/boot/i386/boot0/Makefile
  user/lstewart/alq_varlen_8.x/sys/boot/i386/boot0/boot0.S
  user/lstewart/alq_varlen_8.x/sys/boot/i386/btx/btxldr/btxldr.S
  user/lstewart/alq_varlen_8.x/sys/boot/i386/libi386/biosdisk.c
  user/lstewart/alq_varlen_8.x/sys/boot/i386/libi386/bootinfo32.c
  user/lstewart/alq_varlen_8.x/sys/boot/i386/libi386/bootinfo64.c
  user/lstewart/alq_varlen_8.x/sys/boot/i386/libi386/devicename.c
  user/lstewart/alq_varlen_8.x/sys/boot/i386/loader/Makefile
  user/lstewart/alq_varlen_8.x/sys/boot/i386/loader/conf.c
  user/lstewart/alq_varlen_8.x/sys/boot/i386/loader/main.c
  user/lstewart/alq_varlen_8.x/sys/boot/i386/pxeldr/pxeboot.8
  user/lstewart/alq_varlen_8.x/sys/boot/powerpc/boot1.chrp/boot1.c
  user/lstewart/alq_varlen_8.x/sys/boot/powerpc/boot1.chrp/bootinfo.txt
  user/lstewart/alq_varlen_8.x/sys/boot/powerpc/uboot/conf.c
  user/lstewart/alq_varlen_8.x/sys/boot/sparc64/loader/main.c
  user/lstewart/alq_varlen_8.x/sys/boot/uboot/common/main.c
  user/lstewart/alq_varlen_8.x/sys/boot/uboot/lib/devicename.c
  user/lstewart/alq_varlen_8.x/sys/boot/uboot/lib/disk.c
  user/lstewart/alq_varlen_8.x/sys/boot/uboot/lib/glue.c
  user/lstewart/alq_varlen_8.x/sys/boot/uboot/lib/glue.h
  user/lstewart/alq_varlen_8.x/sys/boot/uboot/lib/libuboot.h
  user/lstewart/alq_varlen_8.x/sys/boot/uboot/lib/net.c
  user/lstewart/alq_varlen_8.x/sys/bsm/audit.h
  user/lstewart/alq_varlen_8.x/sys/bsm/audit_internal.h
  user/lstewart/alq_varlen_8.x/sys/bsm/audit_kevents.h
  user/lstewart/alq_varlen_8.x/sys/bsm/audit_record.h
  user/lstewart/alq_varlen_8.x/sys/cam/cam_periph.c
  user/lstewart/alq_varlen_8.x/sys/cam/cam_periph.h
  user/lstewart/alq_varlen_8.x/sys/cam/cam_sim.c
  user/lstewart/alq_varlen_8.x/sys/cam/cam_sim.h
  user/lstewart/alq_varlen_8.x/sys/cam/cam_xpt.c
  user/lstewart/alq_varlen_8.x/sys/cam/cam_xpt_sim.h
  user/lstewart/alq_varlen_8.x/sys/cam/scsi/scsi_all.c
  user/lstewart/alq_varlen_8.x/sys/cam/scsi/scsi_cd.c
  user/lstewart/alq_varlen_8.x/sys/cam/scsi/scsi_ch.c
  user/lstewart/alq_varlen_8.x/sys/cam/scsi/scsi_da.c
  user/lstewart/alq_varlen_8.x/sys/cam/scsi/scsi_low.c
  user/lstewart/alq_varlen_8.x/sys/cam/scsi/scsi_pass.c
  user/lstewart/alq_varlen_8.x/sys/cam/scsi/scsi_pt.c
  user/lstewart/alq_varlen_8.x/sys/cam/scsi/scsi_sa.c
  user/lstewart/alq_varlen_8.x/sys/cam/scsi/scsi_ses.c
  user/lstewart/alq_varlen_8.x/sys/cam/scsi/scsi_sg.c
  user/lstewart/alq_varlen_8.x/sys/cam/scsi/scsi_target.c
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/atomic.h
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/cred.h
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/dnlc.h
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/kmem.h
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/misc.h
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/mntent.h
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/param.h
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/policy.h
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/proc.h
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/sunddi.h
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/sysmacros.h
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/time.h
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/types.h
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/uio.h
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/vfs.h
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/vnode.h
  user/lstewart/alq_varlen_8.x/sys/cddl/compat/opensolaris/sys/zone.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/common/acl/acl_common.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/common/acl/acl_common.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/common/avl/avl.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/Makefile.files
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/os/callb.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/os/list.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/list.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
  user/lstewart/alq_varlen_8.x/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c
  user/lstewart/alq_varlen_8.x/sys/cddl/dev/cyclic/cyclic.c
  user/lstewart/alq_varlen_8.x/sys/cddl/dev/dtrace/dtrace_ioctl.c
  user/lstewart/alq_varlen_8.x/sys/cddl/dev/dtrace/dtrace_load.c
  user/lstewart/alq_varlen_8.x/sys/cddl/dev/dtrace/dtrace_unload.c
  user/lstewart/alq_varlen_8.x/sys/cddl/dev/dtrace/i386/dtrace_subr.c
  user/lstewart/alq_varlen_8.x/sys/cddl/dev/systrace/systrace.c
  user/lstewart/alq_varlen_8.x/sys/compat/freebsd32/freebsd32.h
  user/lstewart/alq_varlen_8.x/sys/compat/freebsd32/freebsd32_misc.c
  user/lstewart/alq_varlen_8.x/sys/compat/freebsd32/freebsd32_proto.h
  user/lstewart/alq_varlen_8.x/sys/compat/freebsd32/freebsd32_signal.h
  user/lstewart/alq_varlen_8.x/sys/compat/freebsd32/freebsd32_syscall.h
  user/lstewart/alq_varlen_8.x/sys/compat/freebsd32/freebsd32_syscalls.c
  user/lstewart/alq_varlen_8.x/sys/compat/freebsd32/freebsd32_sysent.c
  user/lstewart/alq_varlen_8.x/sys/compat/freebsd32/syscalls.master
  user/lstewart/alq_varlen_8.x/sys/compat/ia32/ia32_sysvec.c
  user/lstewart/alq_varlen_8.x/sys/compat/linprocfs/linprocfs.c
  user/lstewart/alq_varlen_8.x/sys/compat/linux/linux_emul.c
  user/lstewart/alq_varlen_8.x/sys/compat/linux/linux_file.c
  user/lstewart/alq_varlen_8.x/sys/compat/linux/linux_futex.c
  user/lstewart/alq_varlen_8.x/sys/compat/linux/linux_getcwd.c
  user/lstewart/alq_varlen_8.x/sys/compat/linux/linux_ioctl.c
  user/lstewart/alq_varlen_8.x/sys/compat/linux/linux_ipc.c
  user/lstewart/alq_varlen_8.x/sys/compat/linux/linux_misc.c
  user/lstewart/alq_varlen_8.x/sys/compat/linux/linux_socket.c
  user/lstewart/alq_varlen_8.x/sys/compat/linux/linux_socket.h
  user/lstewart/alq_varlen_8.x/sys/compat/linux/linux_stats.c
  user/lstewart/alq_varlen_8.x/sys/compat/linux/linux_util.c
  user/lstewart/alq_varlen_8.x/sys/compat/ndis/kern_ndis.c
  user/lstewart/alq_varlen_8.x/sys/compat/ndis/kern_windrv.c
  user/lstewart/alq_varlen_8.x/sys/compat/ndis/ndis_var.h
  user/lstewart/alq_varlen_8.x/sys/compat/ndis/ntoskrnl_var.h
  user/lstewart/alq_varlen_8.x/sys/compat/ndis/subr_ndis.c
  user/lstewart/alq_varlen_8.x/sys/compat/ndis/subr_ntoskrnl.c
  user/lstewart/alq_varlen_8.x/sys/compat/ndis/subr_usbd.c
  user/lstewart/alq_varlen_8.x/sys/compat/ndis/usbd_var.h
  user/lstewart/alq_varlen_8.x/sys/compat/ndis/winx32_wrap.S
  user/lstewart/alq_varlen_8.x/sys/compat/svr4/svr4_misc.c
  user/lstewart/alq_varlen_8.x/sys/compat/svr4/svr4_sockio.c
  user/lstewart/alq_varlen_8.x/sys/compat/svr4/svr4_sysvec.c
  user/lstewart/alq_varlen_8.x/sys/compat/svr4/svr4_types.h
  user/lstewart/alq_varlen_8.x/sys/conf/Makefile.arm
  user/lstewart/alq_varlen_8.x/sys/conf/NOTES
  user/lstewart/alq_varlen_8.x/sys/conf/files
  user/lstewart/alq_varlen_8.x/sys/conf/files.amd64
  user/lstewart/alq_varlen_8.x/sys/conf/files.arm
  user/lstewart/alq_varlen_8.x/sys/conf/files.i386
  user/lstewart/alq_varlen_8.x/sys/conf/files.ia64
  user/lstewart/alq_varlen_8.x/sys/conf/files.mips
  user/lstewart/alq_varlen_8.x/sys/conf/files.pc98
  user/lstewart/alq_varlen_8.x/sys/conf/files.powerpc
  user/lstewart/alq_varlen_8.x/sys/conf/files.sparc64
  user/lstewart/alq_varlen_8.x/sys/conf/files.sun4v
  user/lstewart/alq_varlen_8.x/sys/conf/kern.post.mk
  user/lstewart/alq_varlen_8.x/sys/conf/kern.pre.mk
  user/lstewart/alq_varlen_8.x/sys/conf/kmod.mk
  user/lstewart/alq_varlen_8.x/sys/conf/newvers.sh
  user/lstewart/alq_varlen_8.x/sys/conf/options
  user/lstewart/alq_varlen_8.x/sys/conf/options.amd64
  user/lstewart/alq_varlen_8.x/sys/conf/options.arm
  user/lstewart/alq_varlen_8.x/sys/conf/options.i386
  user/lstewart/alq_varlen_8.x/sys/conf/options.ia64
  user/lstewart/alq_varlen_8.x/sys/conf/options.mips
  user/lstewart/alq_varlen_8.x/sys/conf/options.pc98
  user/lstewart/alq_varlen_8.x/sys/contrib/altq/altq/altq_cbq.c
  user/lstewart/alq_varlen_8.x/sys/contrib/altq/altq/altq_cdnr.c
  user/lstewart/alq_varlen_8.x/sys/contrib/altq/altq/altq_hfsc.c
  user/lstewart/alq_varlen_8.x/sys/contrib/altq/altq/altq_priq.c
  user/lstewart/alq_varlen_8.x/sys/contrib/altq/altq/altq_red.c
  user/lstewart/alq_varlen_8.x/sys/contrib/altq/altq/altq_rio.c
  user/lstewart/alq_varlen_8.x/sys/contrib/altq/altq/altq_rmclass.c
  user/lstewart/alq_varlen_8.x/sys/contrib/altq/altq/altq_subr.c
  user/lstewart/alq_varlen_8.x/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu
  user/lstewart/alq_varlen_8.x/sys/contrib/ipfilter/netinet/ip_compat.h
  user/lstewart/alq_varlen_8.x/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
  user/lstewart/alq_varlen_8.x/sys/contrib/pf/   (props changed)
  user/lstewart/alq_varlen_8.x/sys/contrib/pf/net/pf.c
  user/lstewart/alq_varlen_8.x/sys/contrib/pf/net/pf_if.c
  user/lstewart/alq_varlen_8.x/sys/contrib/pf/net/pf_ioctl.c
  user/lstewart/alq_varlen_8.x/sys/contrib/pf/net/pf_subr.c
  user/lstewart/alq_varlen_8.x/sys/contrib/pf/net/pf_table.c
  user/lstewart/alq_varlen_8.x/sys/contrib/rdma/rdma_addr.c
  user/lstewart/alq_varlen_8.x/sys/contrib/rdma/rdma_cma.c
  user/lstewart/alq_varlen_8.x/sys/crypto/rc4/rc4.c
  user/lstewart/alq_varlen_8.x/sys/crypto/via/padlock.c
  user/lstewart/alq_varlen_8.x/sys/crypto/via/padlock_hash.c
  user/lstewart/alq_varlen_8.x/sys/dev/aac/aac_pci.c
  user/lstewart/alq_varlen_8.x/sys/dev/acpi_support/acpi_asus.c
  user/lstewart/alq_varlen_8.x/sys/dev/acpi_support/acpi_panasonic.c
  user/lstewart/alq_varlen_8.x/sys/dev/acpica/Osd/OsdSchedule.c
  user/lstewart/alq_varlen_8.x/sys/dev/acpica/acpi.c
  user/lstewart/alq_varlen_8.x/sys/dev/acpica/acpi_battery.c
  user/lstewart/alq_varlen_8.x/sys/dev/acpica/acpi_hpet.c
  user/lstewart/alq_varlen_8.x/sys/dev/acpica/acpi_pcib.c
  user/lstewart/alq_varlen_8.x/sys/dev/acpica/acpi_pcib_acpi.c
  user/lstewart/alq_varlen_8.x/sys/dev/acpica/acpi_smbat.c
  user/lstewart/alq_varlen_8.x/sys/dev/ae/if_ae.c
  user/lstewart/alq_varlen_8.x/sys/dev/age/if_age.c
  user/lstewart/alq_varlen_8.x/sys/dev/age/if_agevar.h
  user/lstewart/alq_varlen_8.x/sys/dev/agp/agp.c
  user/lstewart/alq_varlen_8.x/sys/dev/agp/agp_amd64.c
  user/lstewart/alq_varlen_8.x/sys/dev/agp/agp_i810.c
  user/lstewart/alq_varlen_8.x/sys/dev/agp/agp_via.c
  user/lstewart/alq_varlen_8.x/sys/dev/agp/agppriv.h
  user/lstewart/alq_varlen_8.x/sys/dev/amr/amr.c
  user/lstewart/alq_varlen_8.x/sys/dev/amr/amr_cam.c
  user/lstewart/alq_varlen_8.x/sys/dev/amr/amrvar.h
  user/lstewart/alq_varlen_8.x/sys/dev/an/if_an.c
  user/lstewart/alq_varlen_8.x/sys/dev/an/if_anreg.h
  user/lstewart/alq_varlen_8.x/sys/dev/ar/if_ar.c
  user/lstewart/alq_varlen_8.x/sys/dev/arcmsr/arcmsr.c
  user/lstewart/alq_varlen_8.x/sys/dev/asmc/asmc.c
  user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-cbus.c
  user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-disk.c
  user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-dma.c
  user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-pci.c
  user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-pci.h
  user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-queue.c
  user/lstewart/alq_varlen_8.x/sys/dev/ata/ata-usb.c
  user/lstewart/alq_varlen_8.x/sys/dev/ata/atapi-cam.c
  user/lstewart/alq_varlen_8.x/sys/dev/ata/atapi-cd.c
  user/lstewart/alq_varlen_8.x/sys/dev/ata/atapi-fd.c
  user/lstewart/alq_varlen_8.x/sys/dev/ata/atapi-tape.c
  user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-ahci.c
  user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-marvell.c
  user/lstewart/alq_varlen_8.x/sys/dev/ata/chipsets/ata-sis.c
  user/lstewart/alq_varlen_8.x/sys/dev/ath/ah_osdep.c
  user/lstewart/alq_varlen_8.x/sys/dev/ath/ah_osdep.h
  user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_rate/amrr/amrr.c
  user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_rate/onoe/onoe.c
  user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_rate/sample/sample.c
  user/lstewart/alq_varlen_8.x/sys/dev/ath/ath_rate/sample/sample.h
  user/lstewart/alq_varlen_8.x/sys/dev/ath/if_ath.c
  user/lstewart/alq_varlen_8.x/sys/dev/ath/if_ath_pci.c
  user/lstewart/alq_varlen_8.x/sys/dev/ath/if_athioctl.h
  user/lstewart/alq_varlen_8.x/sys/dev/ath/if_athrate.h
  user/lstewart/alq_varlen_8.x/sys/dev/ath/if_athvar.h
  user/lstewart/alq_varlen_8.x/sys/dev/atkbdc/atkbdc_isa.c
  user/lstewart/alq_varlen_8.x/sys/dev/atkbdc/psm.c
  user/lstewart/alq_varlen_8.x/sys/dev/bce/if_bce.c
  user/lstewart/alq_varlen_8.x/sys/dev/bce/if_bcereg.h
  user/lstewart/alq_varlen_8.x/sys/dev/bge/if_bge.c
  user/lstewart/alq_varlen_8.x/sys/dev/bm/if_bm.c
  user/lstewart/alq_varlen_8.x/sys/dev/cardbus/cardbus.c
  user/lstewart/alq_varlen_8.x/sys/dev/cardbus/cardbus_cis.c
  user/lstewart/alq_varlen_8.x/sys/dev/cardbus/cardbus_device.c
  user/lstewart/alq_varlen_8.x/sys/dev/cardbus/cardbusreg.h
  user/lstewart/alq_varlen_8.x/sys/dev/cardbus/cardbusvar.h
  user/lstewart/alq_varlen_8.x/sys/dev/ce/if_ce.c
  user/lstewart/alq_varlen_8.x/sys/dev/cfe/cfe_console.c
  user/lstewart/alq_varlen_8.x/sys/dev/cm/smc90cx6.c
  user/lstewart/alq_varlen_8.x/sys/dev/coretemp/coretemp.c
  user/lstewart/alq_varlen_8.x/sys/dev/cp/if_cp.c
  user/lstewart/alq_varlen_8.x/sys/dev/ctau/if_ct.c
  user/lstewart/alq_varlen_8.x/sys/dev/cxgb/common/cxgb_ael1002.c
  user/lstewart/alq_varlen_8.x/sys/dev/cxgb/common/cxgb_common.h
  user/lstewart/alq_varlen_8.x/sys/dev/cxgb/common/cxgb_ctl_defs.h
  user/lstewart/alq_varlen_8.x/sys/dev/cxgb/common/cxgb_t3_hw.c
  user/lstewart/alq_varlen_8.x/sys/dev/cxgb/common/cxgb_xgmac.c
  user/lstewart/alq_varlen_8.x/sys/dev/cxgb/cxgb_adapter.h
  user/lstewart/alq_varlen_8.x/sys/dev/cxgb/cxgb_config.h
  user/lstewart/alq_varlen_8.x/sys/dev/cxgb/cxgb_main.c
  user/lstewart/alq_varlen_8.x/sys/dev/cxgb/cxgb_multiq.c
  user/lstewart/alq_varlen_8.x/sys/dev/cxgb/cxgb_osdep.h
  user/lstewart/alq_varlen_8.x/sys/dev/cxgb/cxgb_sge.c
  user/lstewart/alq_varlen_8.x/sys/dev/cxgb/sys/cxgb_support.c
  user/lstewart/alq_varlen_8.x/sys/dev/cxgb/sys/uipc_mvec.c
  user/lstewart/alq_varlen_8.x/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
  user/lstewart/alq_varlen_8.x/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c
  user/lstewart/alq_varlen_8.x/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
  user/lstewart/alq_varlen_8.x/sys/dev/cxgb/ulp/tom/cxgb_l2t.c
  user/lstewart/alq_varlen_8.x/sys/dev/cxgb/ulp/tom/cxgb_l2t.h
  user/lstewart/alq_varlen_8.x/sys/dev/cxgb/ulp/tom/cxgb_tom.c
  user/lstewart/alq_varlen_8.x/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c
  user/lstewart/alq_varlen_8.x/sys/dev/dc/if_dc.c
  user/lstewart/alq_varlen_8.x/sys/dev/dc/if_dcreg.h
  user/lstewart/alq_varlen_8.x/sys/dev/dcons/dcons_crom.c
  user/lstewart/alq_varlen_8.x/sys/dev/dcons/dcons_os.c
  user/lstewart/alq_varlen_8.x/sys/dev/de/if_de.c
  user/lstewart/alq_varlen_8.x/sys/dev/drm/drmP.h
  user/lstewart/alq_varlen_8.x/sys/dev/drm/drm_drv.c
  user/lstewart/alq_varlen_8.x/sys/dev/drm/drm_fops.c
  user/lstewart/alq_varlen_8.x/sys/dev/drm/drm_lock.c
  user/lstewart/alq_varlen_8.x/sys/dev/drm/drm_scatter.c
  user/lstewart/alq_varlen_8.x/sys/dev/drm/i915_dma.c
  user/lstewart/alq_varlen_8.x/sys/dev/drm/radeon_cp.c
  user/lstewart/alq_varlen_8.x/sys/dev/drm/radeon_drv.h
  user/lstewart/alq_varlen_8.x/sys/dev/drm/radeon_irq.c
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/e1000_80003es2lan.c
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/e1000_82540.c
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/e1000_82541.c
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/e1000_82542.c
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/e1000_82543.c
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/e1000_82571.c
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/e1000_82575.c
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/e1000_82575.h
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/e1000_api.c
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/e1000_api.h
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/e1000_defines.h
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/e1000_hw.h
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/e1000_ich8lan.c
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/e1000_ich8lan.h
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/e1000_mac.c
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/e1000_mac.h
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/e1000_manage.c
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/e1000_nvm.c
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/e1000_osdep.c
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/e1000_osdep.h
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/e1000_phy.c
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/e1000_phy.h
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/e1000_regs.h
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/if_em.c
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/if_em.h
  user/lstewart/alq_varlen_8.x/sys/dev/e1000/if_igb.c
  user/lstewart/alq_varlen_8.x/sys/dev/en/midway.c
  user/lstewart/alq_varlen_8.x/sys/dev/exca/exca.c
  user/lstewart/alq_varlen_8.x/sys/dev/fb/s3_pci.c
  user/lstewart/alq_varlen_8.x/sys/dev/fdc/fdc.c
  user/lstewart/alq_varlen_8.x/sys/dev/fdc/fdc_pccard.c
  user/lstewart/alq_varlen_8.x/sys/dev/firewire/firewire.c
  user/lstewart/alq_varlen_8.x/sys/dev/firewire/firewire.h
  user/lstewart/alq_varlen_8.x/sys/dev/firewire/fwohci.c
  user/lstewart/alq_varlen_8.x/sys/dev/firewire/fwohci_pci.c
  user/lstewart/alq_varlen_8.x/sys/dev/firewire/fwohcireg.h
  user/lstewart/alq_varlen_8.x/sys/dev/firewire/fwohcivar.h
  user/lstewart/alq_varlen_8.x/sys/dev/firewire/fwphyreg.h
  user/lstewart/alq_varlen_8.x/sys/dev/firewire/if_fwe.c
  user/lstewart/alq_varlen_8.x/sys/dev/firewire/if_fwip.c
  user/lstewart/alq_varlen_8.x/sys/dev/firewire/sbp.c
  user/lstewart/alq_varlen_8.x/sys/dev/fxp/if_fxp.c
  user/lstewart/alq_varlen_8.x/sys/dev/fxp/if_fxpreg.h
  user/lstewart/alq_varlen_8.x/sys/dev/fxp/if_fxpvar.h
  user/lstewart/alq_varlen_8.x/sys/dev/glxsb/glxsb.c
  user/lstewart/alq_varlen_8.x/sys/dev/hifn/hifn7751.c
  user/lstewart/alq_varlen_8.x/sys/dev/hwpmc/hwpmc_amd.c
  user/lstewart/alq_varlen_8.x/sys/dev/hwpmc/hwpmc_amd.h
  user/lstewart/alq_varlen_8.x/sys/dev/hwpmc/hwpmc_arm.c
  user/lstewart/alq_varlen_8.x/sys/dev/hwpmc/hwpmc_ia64.c
  user/lstewart/alq_varlen_8.x/sys/dev/hwpmc/hwpmc_logging.c
  user/lstewart/alq_varlen_8.x/sys/dev/hwpmc/hwpmc_mod.c
  user/lstewart/alq_varlen_8.x/sys/dev/hwpmc/hwpmc_pentium.c
  user/lstewart/alq_varlen_8.x/sys/dev/hwpmc/hwpmc_pentium.h
  user/lstewart/alq_varlen_8.x/sys/dev/hwpmc/hwpmc_piv.c
  user/lstewart/alq_varlen_8.x/sys/dev/hwpmc/hwpmc_piv.h
  user/lstewart/alq_varlen_8.x/sys/dev/hwpmc/hwpmc_powerpc.c
  user/lstewart/alq_varlen_8.x/sys/dev/hwpmc/hwpmc_ppro.c
  user/lstewart/alq_varlen_8.x/sys/dev/hwpmc/hwpmc_ppro.h
  user/lstewart/alq_varlen_8.x/sys/dev/hwpmc/hwpmc_sparc64.c
  user/lstewart/alq_varlen_8.x/sys/dev/hwpmc/hwpmc_x86.c
  user/lstewart/alq_varlen_8.x/sys/dev/hwpmc/pmc_events.h
  user/lstewart/alq_varlen_8.x/sys/dev/ichsmb/ichsmb.c
  user/lstewart/alq_varlen_8.x/sys/dev/if_ndis/if_ndis.c
  user/lstewart/alq_varlen_8.x/sys/dev/if_ndis/if_ndis_pccard.c
  user/lstewart/alq_varlen_8.x/sys/dev/if_ndis/if_ndis_pci.c
  user/lstewart/alq_varlen_8.x/sys/dev/if_ndis/if_ndis_usb.c
  user/lstewart/alq_varlen_8.x/sys/dev/if_ndis/if_ndisvar.h
  user/lstewart/alq_varlen_8.x/sys/dev/iicbus/ad7418.c
  user/lstewart/alq_varlen_8.x/sys/dev/iicbus/ds1672.c
  user/lstewart/alq_varlen_8.x/sys/dev/iicbus/icee.c
  user/lstewart/alq_varlen_8.x/sys/dev/iicbus/if_ic.c
  user/lstewart/alq_varlen_8.x/sys/dev/iicbus/iic.c
  user/lstewart/alq_varlen_8.x/sys/dev/iicbus/iic.h
  user/lstewart/alq_varlen_8.x/sys/dev/iicbus/iicbb.c
  user/lstewart/alq_varlen_8.x/sys/dev/iicbus/iicbus.c
  user/lstewart/alq_varlen_8.x/sys/dev/iicbus/iicsmb.c
  user/lstewart/alq_varlen_8.x/sys/dev/ipmi/ipmi.c
  user/lstewart/alq_varlen_8.x/sys/dev/ipmi/ipmi_acpi.c
  user/lstewart/alq_varlen_8.x/sys/dev/ipmi/ipmi_smbios.c
  user/lstewart/alq_varlen_8.x/sys/dev/iscsi/initiator/isc_cam.c
  user/lstewart/alq_varlen_8.x/sys/dev/iscsi/initiator/isc_sm.c
  user/lstewart/alq_varlen_8.x/sys/dev/iscsi/initiator/isc_soc.c
  user/lstewart/alq_varlen_8.x/sys/dev/iscsi/initiator/isc_subr.c
  user/lstewart/alq_varlen_8.x/sys/dev/iscsi/initiator/iscsi.c
  user/lstewart/alq_varlen_8.x/sys/dev/iscsi/initiator/iscsi.h
  user/lstewart/alq_varlen_8.x/sys/dev/iscsi/initiator/iscsi_subr.c
  user/lstewart/alq_varlen_8.x/sys/dev/iscsi/initiator/iscsivar.h
  user/lstewart/alq_varlen_8.x/sys/dev/isp/isp.c
  user/lstewart/alq_varlen_8.x/sys/dev/ispfw/ispfw.c
  user/lstewart/alq_varlen_8.x/sys/dev/iwn/if_iwn.c
  user/lstewart/alq_varlen_8.x/sys/dev/ixgbe/ixgbe.c
  user/lstewart/alq_varlen_8.x/sys/dev/ixgbe/ixgbe.h
  user/lstewart/alq_varlen_8.x/sys/dev/ixgbe/ixgbe_82598.c
  user/lstewart/alq_varlen_8.x/sys/dev/ixgbe/ixgbe_api.c
  user/lstewart/alq_varlen_8.x/sys/dev/ixgbe/ixgbe_api.h
  user/lstewart/alq_varlen_8.x/sys/dev/ixgbe/ixgbe_common.c
  user/lstewart/alq_varlen_8.x/sys/dev/ixgbe/ixgbe_common.h
  user/lstewart/alq_varlen_8.x/sys/dev/ixgbe/ixgbe_osdep.h
  user/lstewart/alq_varlen_8.x/sys/dev/ixgbe/ixgbe_phy.c
  user/lstewart/alq_varlen_8.x/sys/dev/ixgbe/ixgbe_phy.h
  user/lstewart/alq_varlen_8.x/sys/dev/ixgbe/ixgbe_type.h
  user/lstewart/alq_varlen_8.x/sys/dev/jme/if_jme.c
  user/lstewart/alq_varlen_8.x/sys/dev/jme/if_jmereg.h
  user/lstewart/alq_varlen_8.x/sys/dev/jme/if_jmevar.h
  user/lstewart/alq_varlen_8.x/sys/dev/k8temp/k8temp.c
  user/lstewart/alq_varlen_8.x/sys/dev/kbdmux/kbdmux.c
  user/lstewart/alq_varlen_8.x/sys/dev/lmc/if_lmc.c
  user/lstewart/alq_varlen_8.x/sys/dev/lmc/if_lmc.h
  user/lstewart/alq_varlen_8.x/sys/dev/md/md.c
  user/lstewart/alq_varlen_8.x/sys/dev/mfi/mfi.c
  user/lstewart/alq_varlen_8.x/sys/dev/mfi/mfi_disk.c
  user/lstewart/alq_varlen_8.x/sys/dev/mfi/mfi_ioctl.h
  user/lstewart/alq_varlen_8.x/sys/dev/mfi/mfi_pci.c
  user/lstewart/alq_varlen_8.x/sys/dev/mfi/mfireg.h
  user/lstewart/alq_varlen_8.x/sys/dev/mfi/mfivar.h
  user/lstewart/alq_varlen_8.x/sys/dev/mge/if_mge.c
  user/lstewart/alq_varlen_8.x/sys/dev/mge/if_mgevar.h
  user/lstewart/alq_varlen_8.x/sys/dev/mii/atphy.c
  user/lstewart/alq_varlen_8.x/sys/dev/mii/ciphy.c
  user/lstewart/alq_varlen_8.x/sys/dev/mii/miidevs
  user/lstewart/alq_varlen_8.x/sys/dev/mii/truephy.c
  user/lstewart/alq_varlen_8.x/sys/dev/mmc/mmc.c
  user/lstewart/alq_varlen_8.x/sys/dev/mmc/mmcbrvar.h
  user/lstewart/alq_varlen_8.x/sys/dev/mmc/mmcreg.h
  user/lstewart/alq_varlen_8.x/sys/dev/mmc/mmcsd.c
  user/lstewart/alq_varlen_8.x/sys/dev/mmc/mmcvar.h
  user/lstewart/alq_varlen_8.x/sys/dev/mpt/mpt.c
  user/lstewart/alq_varlen_8.x/sys/dev/mpt/mpt.h
  user/lstewart/alq_varlen_8.x/sys/dev/mpt/mpt_cam.c
  user/lstewart/alq_varlen_8.x/sys/dev/mpt/mpt_raid.c
  user/lstewart/alq_varlen_8.x/sys/dev/mpt/mpt_user.c
  user/lstewart/alq_varlen_8.x/sys/dev/msk/if_msk.c
  user/lstewart/alq_varlen_8.x/sys/dev/msk/if_mskreg.h
  user/lstewart/alq_varlen_8.x/sys/dev/mxge/eth_z8e.h
  user/lstewart/alq_varlen_8.x/sys/dev/mxge/ethp_z8e.h
  user/lstewart/alq_varlen_8.x/sys/dev/mxge/if_mxge.c
  user/lstewart/alq_varlen_8.x/sys/dev/mxge/if_mxge_var.h
  user/lstewart/alq_varlen_8.x/sys/dev/mxge/rss_eth_z8e.h
  user/lstewart/alq_varlen_8.x/sys/dev/mxge/rss_ethp_z8e.h
  user/lstewart/alq_varlen_8.x/sys/dev/my/if_my.c
  user/lstewart/alq_varlen_8.x/sys/dev/nfe/if_nfe.c
  user/lstewart/alq_varlen_8.x/sys/dev/nmdm/nmdm.c
  user/lstewart/alq_varlen_8.x/sys/dev/nve/if_nve.c
  user/lstewart/alq_varlen_8.x/sys/dev/nxge/xge-osdep.h
  user/lstewart/alq_varlen_8.x/sys/dev/ofw/ofw_bus_subr.c
  user/lstewart/alq_varlen_8.x/sys/dev/ofw/ofw_bus_subr.h
  user/lstewart/alq_varlen_8.x/sys/dev/ofw/ofw_console.c
  user/lstewart/alq_varlen_8.x/sys/dev/ofw/openfirm.c
  user/lstewart/alq_varlen_8.x/sys/dev/ofw/openfirm.h
  user/lstewart/alq_varlen_8.x/sys/dev/ofw/openfirmio.c
  user/lstewart/alq_varlen_8.x/sys/dev/ofw/openpromio.c
  user/lstewart/alq_varlen_8.x/sys/dev/patm/if_patm_intr.c
  user/lstewart/alq_varlen_8.x/sys/dev/pccard/card_if.m
  user/lstewart/alq_varlen_8.x/sys/dev/pccard/pccard.c
  user/lstewart/alq_varlen_8.x/sys/dev/pccard/pccard_cis.c
  user/lstewart/alq_varlen_8.x/sys/dev/pccard/pccardvar.h
  user/lstewart/alq_varlen_8.x/sys/dev/pccard/pccardvarp.h
  user/lstewart/alq_varlen_8.x/sys/dev/pccbb/pccbb.c
  user/lstewart/alq_varlen_8.x/sys/dev/pccbb/pccbb_pci.c
  user/lstewart/alq_varlen_8.x/sys/dev/pccbb/pccbbvar.h
  user/lstewart/alq_varlen_8.x/sys/dev/pci/pci.c
  user/lstewart/alq_varlen_8.x/sys/dev/pci/pci_user.c
  user/lstewart/alq_varlen_8.x/sys/dev/pci/pcireg.h
  user/lstewart/alq_varlen_8.x/sys/dev/pcn/if_pcn.c
  user/lstewart/alq_varlen_8.x/sys/dev/ppbus/if_plip.c
  user/lstewart/alq_varlen_8.x/sys/dev/ppbus/immio.c
  user/lstewart/alq_varlen_8.x/sys/dev/ppbus/lpbb.c
  user/lstewart/alq_varlen_8.x/sys/dev/ppbus/lpt.c
  user/lstewart/alq_varlen_8.x/sys/dev/ppbus/lpt.h
  user/lstewart/alq_varlen_8.x/sys/dev/ppbus/pcfclock.c
  user/lstewart/alq_varlen_8.x/sys/dev/ppbus/ppb_1284.c
  user/lstewart/alq_varlen_8.x/sys/dev/ppbus/ppb_base.c
  user/lstewart/alq_varlen_8.x/sys/dev/ppbus/ppb_msq.c
  user/lstewart/alq_varlen_8.x/sys/dev/ppbus/ppbconf.c
  user/lstewart/alq_varlen_8.x/sys/dev/ppbus/ppbconf.h
  user/lstewart/alq_varlen_8.x/sys/dev/ppbus/ppi.c
  user/lstewart/alq_varlen_8.x/sys/dev/ppbus/ppi.h
  user/lstewart/alq_varlen_8.x/sys/dev/ppbus/pps.c
  user/lstewart/alq_varlen_8.x/sys/dev/ppbus/vpo.c
  user/lstewart/alq_varlen_8.x/sys/dev/ppbus/vpoio.c
  user/lstewart/alq_varlen_8.x/sys/dev/ppbus/vpoio.h
  user/lstewart/alq_varlen_8.x/sys/dev/ppc/ppc.c
  user/lstewart/alq_varlen_8.x/sys/dev/ppc/ppc_acpi.c
  user/lstewart/alq_varlen_8.x/sys/dev/ppc/ppc_isa.c
  user/lstewart/alq_varlen_8.x/sys/dev/ppc/ppc_pci.c
  user/lstewart/alq_varlen_8.x/sys/dev/ppc/ppc_puc.c
  user/lstewart/alq_varlen_8.x/sys/dev/ppc/ppcreg.h
  user/lstewart/alq_varlen_8.x/sys/dev/ppc/ppcvar.h
  user/lstewart/alq_varlen_8.x/sys/dev/puc/pucdata.c
  user/lstewart/alq_varlen_8.x/sys/dev/ral/rt2560.c
  user/lstewart/alq_varlen_8.x/sys/dev/ral/rt2661.c
  user/lstewart/alq_varlen_8.x/sys/dev/random/randomdev.c
  user/lstewart/alq_varlen_8.x/sys/dev/random/randomdev_soft.c
  user/lstewart/alq_varlen_8.x/sys/dev/ray/if_ray.c
  user/lstewart/alq_varlen_8.x/sys/dev/ray/if_rayvar.h
  user/lstewart/alq_varlen_8.x/sys/dev/re/if_re.c
  user/lstewart/alq_varlen_8.x/sys/dev/safe/safe.c
  user/lstewart/alq_varlen_8.x/sys/dev/scc/scc_if.m
  user/lstewart/alq_varlen_8.x/sys/dev/si/si.c
  user/lstewart/alq_varlen_8.x/sys/dev/sio/sio_pci.c
  user/lstewart/alq_varlen_8.x/sys/dev/sio/sio_puc.c
  user/lstewart/alq_varlen_8.x/sys/dev/sis/if_sis.c
  user/lstewart/alq_varlen_8.x/sys/dev/sis/if_sisreg.h
  user/lstewart/alq_varlen_8.x/sys/dev/smbus/smb.c
  user/lstewart/alq_varlen_8.x/sys/dev/snp/snp.c
  user/lstewart/alq_varlen_8.x/sys/dev/sound/pci/cmi.c
  user/lstewart/alq_varlen_8.x/sys/dev/sound/pci/ds1.c
  user/lstewart/alq_varlen_8.x/sys/dev/sound/pci/envy24.c
  user/lstewart/alq_varlen_8.x/sys/dev/sound/pci/envy24ht.c
  user/lstewart/alq_varlen_8.x/sys/dev/sound/pci/hda/hdac.c
  user/lstewart/alq_varlen_8.x/sys/dev/sound/pci/hda/hdac_private.h
  user/lstewart/alq_varlen_8.x/sys/dev/sound/pci/spicds.c
  user/lstewart/alq_varlen_8.x/sys/dev/sound/pcm/channel.c
  user/lstewart/alq_varlen_8.x/sys/dev/sound/pcm/channel.h
  user/lstewart/alq_varlen_8.x/sys/dev/sound/pcm/dsp.c
  user/lstewart/alq_varlen_8.x/sys/dev/sound/pcm/mixer.c
  user/lstewart/alq_varlen_8.x/sys/dev/sound/pcm/mixer.h
  user/lstewart/alq_varlen_8.x/sys/dev/sound/pcm/sound.c
  user/lstewart/alq_varlen_8.x/sys/dev/sound/pcm/sound.h
  user/lstewart/alq_varlen_8.x/sys/dev/speaker/spkr.c
  user/lstewart/alq_varlen_8.x/sys/dev/sr/if_sr.c
  user/lstewart/alq_varlen_8.x/sys/dev/streams/streams.c
  user/lstewart/alq_varlen_8.x/sys/dev/syscons/scterm.c
  user/lstewart/alq_varlen_8.x/sys/dev/syscons/syscons.c
  user/lstewart/alq_varlen_8.x/sys/dev/syscons/syscons.h
  user/lstewart/alq_varlen_8.x/sys/dev/syscons/sysmouse.c
  user/lstewart/alq_varlen_8.x/sys/dev/tl/if_tl.c
  user/lstewart/alq_varlen_8.x/sys/dev/tx/if_tx.c
  user/lstewart/alq_varlen_8.x/sys/dev/uart/uart_bus_pci.c
  user/lstewart/alq_varlen_8.x/sys/dev/uart/uart_cpu_mv.c
  user/lstewart/alq_varlen_8.x/sys/dev/uart/uart_dev_quicc.c
  user/lstewart/alq_varlen_8.x/sys/dev/uart/uart_tty.c
  user/lstewart/alq_varlen_8.x/sys/dev/usb/ehci.c
  user/lstewart/alq_varlen_8.x/sys/dev/usb/ehci_mbus.c
  user/lstewart/alq_varlen_8.x/sys/dev/usb/ehci_pci.c
  user/lstewart/alq_varlen_8.x/sys/dev/usb/ehcireg.h
  user/lstewart/alq_varlen_8.x/sys/dev/usb/ehcivar.h
  user/lstewart/alq_varlen_8.x/sys/dev/usb/if_aue.c
  user/lstewart/alq_varlen_8.x/sys/dev/usb/if_rum.c
  user/lstewart/alq_varlen_8.x/sys/dev/usb/if_upgt.c
  user/lstewart/alq_varlen_8.x/sys/dev/usb/if_ural.c
  user/lstewart/alq_varlen_8.x/sys/dev/usb/if_zyd.c
  user/lstewart/alq_varlen_8.x/sys/dev/usb/if_zydreg.h
  user/lstewart/alq_varlen_8.x/sys/dev/usb/rio500_usb.h
  user/lstewart/alq_varlen_8.x/sys/dev/usb/u3g.c
  user/lstewart/alq_varlen_8.x/sys/dev/usb/ubsa.c
  user/lstewart/alq_varlen_8.x/sys/dev/usb/ucom.c
  user/lstewart/alq_varlen_8.x/sys/dev/usb/ucomvar.h
  user/lstewart/alq_varlen_8.x/sys/dev/usb/udbp.c
  user/lstewart/alq_varlen_8.x/sys/dev/usb/ufoma.c
  user/lstewart/alq_varlen_8.x/sys/dev/usb/uftdi.c
  user/lstewart/alq_varlen_8.x/sys/dev/usb/ugen.c
  user/lstewart/alq_varlen_8.x/sys/dev/usb/uhci_pci.c
  user/lstewart/alq_varlen_8.x/sys/dev/usb/umass.c
  user/lstewart/alq_varlen_8.x/sys/dev/usb/usb.h
  user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_quirks.c
  user/lstewart/alq_varlen_8.x/sys/dev/usb/usb_subr.c
  user/lstewart/alq_varlen_8.x/sys/dev/usb/usbdevs
  user/lstewart/alq_varlen_8.x/sys/dev/usb/usbdi.c
  user/lstewart/alq_varlen_8.x/sys/dev/usb/usbdi.h
  user/lstewart/alq_varlen_8.x/sys/dev/usb/uscanner.c
  user/lstewart/alq_varlen_8.x/sys/dev/vge/if_vge.c
  user/lstewart/alq_varlen_8.x/sys/dev/vr/if_vr.c
  user/lstewart/alq_varlen_8.x/sys/dev/wpi/if_wpi.c
  user/lstewart/alq_varlen_8.x/sys/dev/xen/blkback/blkback.c
  user/lstewart/alq_varlen_8.x/sys/dev/xen/blkfront/blkfront.c
  user/lstewart/alq_varlen_8.x/sys/dev/xen/blkfront/block.h
  user/lstewart/alq_varlen_8.x/sys/dev/xen/console/console.c
  user/lstewart/alq_varlen_8.x/sys/dev/xen/console/xencons_ring.c
  user/lstewart/alq_varlen_8.x/sys/dev/xen/evtchn/evtchn_dev.c
  user/lstewart/alq_varlen_8.x/sys/dev/xen/netback/netback.c
  user/lstewart/alq_varlen_8.x/sys/dev/xen/netfront/netfront.c
  user/lstewart/alq_varlen_8.x/sys/fs/cd9660/cd9660_bmap.c
  user/lstewart/alq_varlen_8.x/sys/fs/cd9660/cd9660_lookup.c
  user/lstewart/alq_varlen_8.x/sys/fs/cd9660/cd9660_node.c
  user/lstewart/alq_varlen_8.x/sys/fs/cd9660/cd9660_node.h
  user/lstewart/alq_varlen_8.x/sys/fs/cd9660/cd9660_rrip.c
  user/lstewart/alq_varlen_8.x/sys/fs/cd9660/cd9660_vfsops.c
  user/lstewart/alq_varlen_8.x/sys/fs/cd9660/cd9660_vnops.c
  user/lstewart/alq_varlen_8.x/sys/fs/coda/cnode.h
  user/lstewart/alq_varlen_8.x/sys/fs/coda/coda_subr.c
  user/lstewart/alq_varlen_8.x/sys/fs/coda/coda_venus.c
  user/lstewart/alq_varlen_8.x/sys/fs/coda/coda_vfsops.c
  user/lstewart/alq_varlen_8.x/sys/fs/coda/coda_vnops.c
  user/lstewart/alq_varlen_8.x/sys/fs/deadfs/dead_vnops.c
  user/lstewart/alq_varlen_8.x/sys/fs/devfs/devfs_devs.c
  user/lstewart/alq_varlen_8.x/sys/fs/devfs/devfs_vnops.c
  user/lstewart/alq_varlen_8.x/sys/fs/fdescfs/fdesc_vfsops.c
  user/lstewart/alq_varlen_8.x/sys/fs/fdescfs/fdesc_vnops.c
  user/lstewart/alq_varlen_8.x/sys/fs/fifofs/fifo_vnops.c
  user/lstewart/alq_varlen_8.x/sys/fs/hpfs/hpfs_subr.c
  user/lstewart/alq_varlen_8.x/sys/fs/hpfs/hpfs_vfsops.c
  user/lstewart/alq_varlen_8.x/sys/fs/hpfs/hpfs_vnops.c
  user/lstewart/alq_varlen_8.x/sys/fs/msdosfs/msdosfs_conv.c
  user/lstewart/alq_varlen_8.x/sys/fs/msdosfs/msdosfs_denode.c
  user/lstewart/alq_varlen_8.x/sys/fs/msdosfs/msdosfs_vfsops.c
  user/lstewart/alq_varlen_8.x/sys/fs/msdosfs/msdosfs_vnops.c
  user/lstewart/alq_varlen_8.x/sys/fs/ntfs/ntfs_subr.c
  user/lstewart/alq_varlen_8.x/sys/fs/ntfs/ntfs_vfsops.c
  user/lstewart/alq_varlen_8.x/sys/fs/ntfs/ntfs_vnops.c
  user/lstewart/alq_varlen_8.x/sys/fs/nullfs/null_subr.c
  user/lstewart/alq_varlen_8.x/sys/fs/nullfs/null_vnops.c
  user/lstewart/alq_varlen_8.x/sys/fs/nwfs/nwfs_node.c
  user/lstewart/alq_varlen_8.x/sys/fs/nwfs/nwfs_subr.c
  user/lstewart/alq_varlen_8.x/sys/fs/nwfs/nwfs_vfsops.c
  user/lstewart/alq_varlen_8.x/sys/fs/nwfs/nwfs_vnops.c
  user/lstewart/alq_varlen_8.x/sys/fs/portalfs/portal_vfsops.c
  user/lstewart/alq_varlen_8.x/sys/fs/portalfs/portal_vnops.c
  user/lstewart/alq_varlen_8.x/sys/fs/procfs/procfs.c
  user/lstewart/alq_varlen_8.x/sys/fs/procfs/procfs_map.c
  user/lstewart/alq_varlen_8.x/sys/fs/pseudofs/pseudofs.c
  user/lstewart/alq_varlen_8.x/sys/fs/pseudofs/pseudofs_vncache.c
  user/lstewart/alq_varlen_8.x/sys/fs/pseudofs/pseudofs_vnops.c
  user/lstewart/alq_varlen_8.x/sys/fs/smbfs/smbfs_node.c
  user/lstewart/alq_varlen_8.x/sys/fs/smbfs/smbfs_vfsops.c
  user/lstewart/alq_varlen_8.x/sys/fs/smbfs/smbfs_vnops.c
  user/lstewart/alq_varlen_8.x/sys/fs/tmpfs/tmpfs.h
  user/lstewart/alq_varlen_8.x/sys/fs/tmpfs/tmpfs_subr.c
  user/lstewart/alq_varlen_8.x/sys/fs/tmpfs/tmpfs_vnops.c
  user/lstewart/alq_varlen_8.x/sys/fs/udf/ecma167-udf.h
  user/lstewart/alq_varlen_8.x/sys/fs/udf/udf.h
  user/lstewart/alq_varlen_8.x/sys/fs/udf/udf_vfsops.c
  user/lstewart/alq_varlen_8.x/sys/fs/udf/udf_vnops.c
  user/lstewart/alq_varlen_8.x/sys/fs/unionfs/union.h
  user/lstewart/alq_varlen_8.x/sys/fs/unionfs/union_subr.c
  user/lstewart/alq_varlen_8.x/sys/fs/unionfs/union_vfsops.c
  user/lstewart/alq_varlen_8.x/sys/fs/unionfs/union_vnops.c
  user/lstewart/alq_varlen_8.x/sys/geom/geom.h
  user/lstewart/alq_varlen_8.x/sys/geom/geom_bsd.c
  user/lstewart/alq_varlen_8.x/sys/geom/geom_ccd.c
  user/lstewart/alq_varlen_8.x/sys/geom/geom_dev.c
  user/lstewart/alq_varlen_8.x/sys/geom/geom_subr.c
  user/lstewart/alq_varlen_8.x/sys/geom/geom_vfs.c
  user/lstewart/alq_varlen_8.x/sys/geom/journal/g_journal.c
  user/lstewart/alq_varlen_8.x/sys/geom/journal/g_journal.h
  user/lstewart/alq_varlen_8.x/sys/geom/label/g_label_msdosfs.c
  user/lstewart/alq_varlen_8.x/sys/geom/part/g_part.c
  user/lstewart/alq_varlen_8.x/sys/geom/part/g_part.h
  user/lstewart/alq_varlen_8.x/sys/geom/part/g_part_apm.c
  user/lstewart/alq_varlen_8.x/sys/geom/part/g_part_bsd.c
  user/lstewart/alq_varlen_8.x/sys/geom/part/g_part_gpt.c
  user/lstewart/alq_varlen_8.x/sys/geom/part/g_part_if.m
  user/lstewart/alq_varlen_8.x/sys/geom/part/g_part_mbr.c
  user/lstewart/alq_varlen_8.x/sys/geom/part/g_part_pc98.c
  user/lstewart/alq_varlen_8.x/sys/geom/part/g_part_vtoc8.c
  user/lstewart/alq_varlen_8.x/sys/geom/vinum/geom_vinum.c
  user/lstewart/alq_varlen_8.x/sys/geom/vinum/geom_vinum.h
  user/lstewart/alq_varlen_8.x/sys/geom/vinum/geom_vinum_drive.c
  user/lstewart/alq_varlen_8.x/sys/geom/vinum/geom_vinum_init.c
  user/lstewart/alq_varlen_8.x/sys/geom/vinum/geom_vinum_list.c
  user/lstewart/alq_varlen_8.x/sys/geom/vinum/geom_vinum_move.c
  user/lstewart/alq_varlen_8.x/sys/geom/vinum/geom_vinum_plex.c
  user/lstewart/alq_varlen_8.x/sys/geom/vinum/geom_vinum_raid5.c
  user/lstewart/alq_varlen_8.x/sys/geom/vinum/geom_vinum_rename.c
  user/lstewart/alq_varlen_8.x/sys/geom/vinum/geom_vinum_rm.c
  user/lstewart/alq_varlen_8.x/sys/geom/vinum/geom_vinum_state.c
  user/lstewart/alq_varlen_8.x/sys/geom/vinum/geom_vinum_subr.c
  user/lstewart/alq_varlen_8.x/sys/geom/vinum/geom_vinum_volume.c
  user/lstewart/alq_varlen_8.x/sys/gnu/fs/ext2fs/ext2_bitops.h
  user/lstewart/alq_varlen_8.x/sys/gnu/fs/ext2fs/ext2_fs.h
  user/lstewart/alq_varlen_8.x/sys/gnu/fs/ext2fs/ext2_fs_sb.h
  user/lstewart/alq_varlen_8.x/sys/gnu/fs/ext2fs/ext2_inode.c
  user/lstewart/alq_varlen_8.x/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c
  user/lstewart/alq_varlen_8.x/sys/gnu/fs/ext2fs/ext2_lookup.c
  user/lstewart/alq_varlen_8.x/sys/gnu/fs/ext2fs/ext2_vfsops.c
  user/lstewart/alq_varlen_8.x/sys/gnu/fs/ext2fs/ext2_vnops.c
  user/lstewart/alq_varlen_8.x/sys/gnu/fs/reiserfs/reiserfs_inode.c
  user/lstewart/alq_varlen_8.x/sys/gnu/fs/reiserfs/reiserfs_vfsops.c
  user/lstewart/alq_varlen_8.x/sys/gnu/fs/reiserfs/reiserfs_vnops.c
  user/lstewart/alq_varlen_8.x/sys/gnu/fs/xfs/FreeBSD/xfs_super.c
  user/lstewart/alq_varlen_8.x/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h
  user/lstewart/alq_varlen_8.x/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
  user/lstewart/alq_varlen_8.x/sys/gnu/fs/xfs/xfs_dfrag.c
  user/lstewart/alq_varlen_8.x/sys/gnu/fs/xfs/xfs_inode.c
  user/lstewart/alq_varlen_8.x/sys/gnu/fs/xfs/xfs_inode.h
  user/lstewart/alq_varlen_8.x/sys/gnu/fs/xfs/xfs_vnodeops.c
  user/lstewart/alq_varlen_8.x/sys/i386/conf/DEFAULTS
  user/lstewart/alq_varlen_8.x/sys/i386/conf/GENERIC
  user/lstewart/alq_varlen_8.x/sys/i386/conf/NOTES
  user/lstewart/alq_varlen_8.x/sys/i386/conf/PAE
  user/lstewart/alq_varlen_8.x/sys/i386/conf/XEN
  user/lstewart/alq_varlen_8.x/sys/i386/cpufreq/est.c
  user/lstewart/alq_varlen_8.x/sys/i386/cpufreq/p4tcc.c
  user/lstewart/alq_varlen_8.x/sys/i386/cpufreq/powernow.c
  user/lstewart/alq_varlen_8.x/sys/i386/cpufreq/smist.c
  user/lstewart/alq_varlen_8.x/sys/i386/i386/apic_vector.s
  user/lstewart/alq_varlen_8.x/sys/i386/i386/bios.c
  user/lstewart/alq_varlen_8.x/sys/i386/i386/busdma_machdep.c
  user/lstewart/alq_varlen_8.x/sys/i386/i386/dump_machdep.c
  user/lstewart/alq_varlen_8.x/sys/i386/i386/elf_machdep.c
  user/lstewart/alq_varlen_8.x/sys/i386/i386/exception.s
  user/lstewart/alq_varlen_8.x/sys/i386/i386/genassym.c
  user/lstewart/alq_varlen_8.x/sys/i386/i386/i686_mem.c
  user/lstewart/alq_varlen_8.x/sys/i386/i386/identcpu.c
  user/lstewart/alq_varlen_8.x/sys/i386/i386/initcpu.c
  user/lstewart/alq_varlen_8.x/sys/i386/i386/intr_machdep.c
  user/lstewart/alq_varlen_8.x/sys/i386/i386/io_apic.c
  user/lstewart/alq_varlen_8.x/sys/i386/i386/k6_mem.c
  user/lstewart/alq_varlen_8.x/sys/i386/i386/local_apic.c
  user/lstewart/alq_varlen_8.x/sys/i386/i386/locore.s
  user/lstewart/alq_varlen_8.x/sys/i386/i386/longrun.c
  user/lstewart/alq_varlen_8.x/sys/i386/i386/machdep.c
  user/lstewart/alq_varlen_8.x/sys/i386/i386/minidump_machdep.c
  user/lstewart/alq_varlen_8.x/sys/i386/i386/mp_machdep.c
  user/lstewart/alq_varlen_8.x/sys/i386/i386/msi.c
  user/lstewart/alq_varlen_8.x/sys/i386/i386/pmap.c
  user/lstewart/alq_varlen_8.x/sys/i386/i386/swtch.s
  user/lstewart/alq_varlen_8.x/sys/i386/i386/sys_machdep.c
  user/lstewart/alq_varlen_8.x/sys/i386/i386/trap.c
  user/lstewart/alq_varlen_8.x/sys/i386/i386/tsc.c
  user/lstewart/alq_varlen_8.x/sys/i386/i386/vm_machdep.c
  user/lstewart/alq_varlen_8.x/sys/i386/ibcs2/ibcs2_misc.c
  user/lstewart/alq_varlen_8.x/sys/i386/ibcs2/ibcs2_sysi86.c
  user/lstewart/alq_varlen_8.x/sys/i386/ibcs2/ibcs2_sysvec.c
  user/lstewart/alq_varlen_8.x/sys/i386/include/apicreg.h
  user/lstewart/alq_varlen_8.x/sys/i386/include/apicvar.h
  user/lstewart/alq_varlen_8.x/sys/i386/include/atomic.h
  user/lstewart/alq_varlen_8.x/sys/i386/include/clock.h
  user/lstewart/alq_varlen_8.x/sys/i386/include/cpufunc.h
  user/lstewart/alq_varlen_8.x/sys/i386/include/cputypes.h
  user/lstewart/alq_varlen_8.x/sys/i386/include/elf.h
  user/lstewart/alq_varlen_8.x/sys/i386/include/intr_machdep.h
  user/lstewart/alq_varlen_8.x/sys/i386/include/md_var.h
  user/lstewart/alq_varlen_8.x/sys/i386/include/pcpu.h
  user/lstewart/alq_varlen_8.x/sys/i386/include/pmc_mdep.h
  user/lstewart/alq_varlen_8.x/sys/i386/include/smp.h
  user/lstewart/alq_varlen_8.x/sys/i386/include/specialreg.h
  user/lstewart/alq_varlen_8.x/sys/i386/include/xen/xen-os.h
  user/lstewart/alq_varlen_8.x/sys/i386/include/xen/xenfunc.h
  user/lstewart/alq_varlen_8.x/sys/i386/isa/npx.c
  user/lstewart/alq_varlen_8.x/sys/i386/isa/pmtimer.c
  user/lstewart/alq_varlen_8.x/sys/i386/isa/prof_machdep.c
  user/lstewart/alq_varlen_8.x/sys/i386/linux/linux.h
  user/lstewart/alq_varlen_8.x/sys/i386/linux/linux_locore.s
  user/lstewart/alq_varlen_8.x/sys/i386/linux/linux_machdep.c
  user/lstewart/alq_varlen_8.x/sys/i386/linux/linux_proto.h
  user/lstewart/alq_varlen_8.x/sys/i386/linux/linux_syscall.h
  user/lstewart/alq_varlen_8.x/sys/i386/linux/linux_sysent.c
  user/lstewart/alq_varlen_8.x/sys/i386/linux/linux_sysvec.c
  user/lstewart/alq_varlen_8.x/sys/i386/linux/syscalls.master
  user/lstewart/alq_varlen_8.x/sys/i386/svr4/svr4_locore.s
  user/lstewart/alq_varlen_8.x/sys/i386/xen/clock.c
  user/lstewart/alq_varlen_8.x/sys/i386/xen/exception.s
  user/lstewart/alq_varlen_8.x/sys/i386/xen/mp_machdep.c
  user/lstewart/alq_varlen_8.x/sys/i386/xen/mptable.c
  user/lstewart/alq_varlen_8.x/sys/i386/xen/pmap.c
  user/lstewart/alq_varlen_8.x/sys/i386/xen/xen_machdep.c
  user/lstewart/alq_varlen_8.x/sys/ia64/conf/GENERIC
  user/lstewart/alq_varlen_8.x/sys/ia64/conf/NOTES
  user/lstewart/alq_varlen_8.x/sys/ia64/ia64/busdma_machdep.c
  user/lstewart/alq_varlen_8.x/sys/ia64/ia64/elf_machdep.c
  user/lstewart/alq_varlen_8.x/sys/ia64/ia64/mca.c
  user/lstewart/alq_varlen_8.x/sys/ia64/ia64/mp_machdep.c
  user/lstewart/alq_varlen_8.x/sys/ia64/ia64/pmap.c
  user/lstewart/alq_varlen_8.x/sys/ia64/ia64/sscdisk.c
  user/lstewart/alq_varlen_8.x/sys/ia64/include/atomic.h
  user/lstewart/alq_varlen_8.x/sys/ia64/include/elf.h
  user/lstewart/alq_varlen_8.x/sys/ia64/include/mca.h
  user/lstewart/alq_varlen_8.x/sys/isa/isa_common.c
  user/lstewart/alq_varlen_8.x/sys/isa/isa_common.h
  user/lstewart/alq_varlen_8.x/sys/isa/isahint.c
  user/lstewart/alq_varlen_8.x/sys/isa/isavar.h
  user/lstewart/alq_varlen_8.x/sys/isa/pnp.c
  user/lstewart/alq_varlen_8.x/sys/kern/Make.tags.inc
  user/lstewart/alq_varlen_8.x/sys/kern/bus_if.m
  user/lstewart/alq_varlen_8.x/sys/kern/imgact_aout.c
  user/lstewart/alq_varlen_8.x/sys/kern/imgact_elf.c
  user/lstewart/alq_varlen_8.x/sys/kern/init_main.c
  user/lstewart/alq_varlen_8.x/sys/kern/init_sysent.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_clock.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_conf.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_cpu.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_cpuset.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_descrip.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_event.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_exec.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_exit.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_fork.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_jail.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_ktrace.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_linker.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_lock.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_lockf.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_malloc.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_mbuf.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_mib.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_module.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_mtxpool.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_poll.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_proc.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_prot.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_resource.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_rwlock.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_shutdown.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_synch.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_sysctl.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_thr.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_thread.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_time.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_timeout.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_uuid.c
  user/lstewart/alq_varlen_8.x/sys/kern/kern_xxx.c
  user/lstewart/alq_varlen_8.x/sys/kern/link_elf.c
  user/lstewart/alq_varlen_8.x/sys/kern/link_elf_obj.c
  user/lstewart/alq_varlen_8.x/sys/kern/sched_4bsd.c
  user/lstewart/alq_varlen_8.x/sys/kern/sched_ule.c
  user/lstewart/alq_varlen_8.x/sys/kern/subr_acl_posix1e.c
  user/lstewart/alq_varlen_8.x/sys/kern/subr_autoconf.c
  user/lstewart/alq_varlen_8.x/sys/kern/subr_blist.c
  user/lstewart/alq_varlen_8.x/sys/kern/subr_bus.c
  user/lstewart/alq_varlen_8.x/sys/kern/subr_clist.c
  user/lstewart/alq_varlen_8.x/sys/kern/subr_devstat.c
  user/lstewart/alq_varlen_8.x/sys/kern/subr_disk.c
  user/lstewart/alq_varlen_8.x/sys/kern/subr_firmware.c
  user/lstewart/alq_varlen_8.x/sys/kern/subr_kobj.c
  user/lstewart/alq_varlen_8.x/sys/kern/subr_param.c
  user/lstewart/alq_varlen_8.x/sys/kern/subr_pcpu.c
  user/lstewart/alq_varlen_8.x/sys/kern/subr_prf.c
  user/lstewart/alq_varlen_8.x/sys/kern/subr_prof.c
  user/lstewart/alq_varlen_8.x/sys/kern/subr_rman.c
  user/lstewart/alq_varlen_8.x/sys/kern/subr_rtc.c
  user/lstewart/alq_varlen_8.x/sys/kern/subr_sleepqueue.c
  user/lstewart/alq_varlen_8.x/sys/kern/subr_smp.c
  user/lstewart/alq_varlen_8.x/sys/kern/subr_stack.c
  user/lstewart/alq_varlen_8.x/sys/kern/subr_taskqueue.c
  user/lstewart/alq_varlen_8.x/sys/kern/subr_trap.c
  user/lstewart/alq_varlen_8.x/sys/kern/subr_witness.c
  user/lstewart/alq_varlen_8.x/sys/kern/sys_generic.c
  user/lstewart/alq_varlen_8.x/sys/kern/sys_pipe.c
  user/lstewart/alq_varlen_8.x/sys/kern/syscalls.c
  user/lstewart/alq_varlen_8.x/sys/kern/syscalls.master
  user/lstewart/alq_varlen_8.x/sys/kern/systrace_args.c
  user/lstewart/alq_varlen_8.x/sys/kern/sysv_sem.c
  user/lstewart/alq_varlen_8.x/sys/kern/tty.c
  user/lstewart/alq_varlen_8.x/sys/kern/tty_info.c
  user/lstewart/alq_varlen_8.x/sys/kern/tty_inq.c
  user/lstewart/alq_varlen_8.x/sys/kern/tty_outq.c
  user/lstewart/alq_varlen_8.x/sys/kern/tty_pts.c
  user/lstewart/alq_varlen_8.x/sys/kern/tty_pty.c
  user/lstewart/alq_varlen_8.x/sys/kern/tty_ttydisc.c
  user/lstewart/alq_varlen_8.x/sys/kern/uipc_accf.c
  user/lstewart/alq_varlen_8.x/sys/kern/uipc_cow.c
  user/lstewart/alq_varlen_8.x/sys/kern/uipc_debug.c
  user/lstewart/alq_varlen_8.x/sys/kern/uipc_domain.c
  user/lstewart/alq_varlen_8.x/sys/kern/uipc_mbuf.c
  user/lstewart/alq_varlen_8.x/sys/kern/uipc_mqueue.c
  user/lstewart/alq_varlen_8.x/sys/kern/uipc_shm.c
  user/lstewart/alq_varlen_8.x/sys/kern/uipc_socket.c
  user/lstewart/alq_varlen_8.x/sys/kern/uipc_syscalls.c
  user/lstewart/alq_varlen_8.x/sys/kern/uipc_usrreq.c
  user/lstewart/alq_varlen_8.x/sys/kern/vfs_aio.c
  user/lstewart/alq_varlen_8.x/sys/kern/vfs_bio.c
  user/lstewart/alq_varlen_8.x/sys/kern/vfs_cache.c
  user/lstewart/alq_varlen_8.x/sys/kern/vfs_default.c
  user/lstewart/alq_varlen_8.x/sys/kern/vfs_export.c
  user/lstewart/alq_varlen_8.x/sys/kern/vfs_extattr.c
  user/lstewart/alq_varlen_8.x/sys/kern/vfs_init.c
  user/lstewart/alq_varlen_8.x/sys/kern/vfs_lookup.c
  user/lstewart/alq_varlen_8.x/sys/kern/vfs_mount.c
  user/lstewart/alq_varlen_8.x/sys/kern/vfs_subr.c
  user/lstewart/alq_varlen_8.x/sys/kern/vfs_syscalls.c
  user/lstewart/alq_varlen_8.x/sys/kern/vfs_vnops.c
  user/lstewart/alq_varlen_8.x/sys/kern/vnode_if.src
  user/lstewart/alq_varlen_8.x/sys/libkern/crc32.c
  user/lstewart/alq_varlen_8.x/sys/libkern/iconv.c
  user/lstewart/alq_varlen_8.x/sys/mips/adm5120/adm5120_machdep.c
  user/lstewart/alq_varlen_8.x/sys/mips/conf/ADM5120
  user/lstewart/alq_varlen_8.x/sys/mips/conf/IDT
  user/lstewart/alq_varlen_8.x/sys/mips/conf/MALTA
  user/lstewart/alq_varlen_8.x/sys/mips/conf/QEMU
  user/lstewart/alq_varlen_8.x/sys/mips/conf/SENTRY5
  user/lstewart/alq_varlen_8.x/sys/mips/idt/idtpci.c
  user/lstewart/alq_varlen_8.x/sys/mips/idt/if_kr.c
  user/lstewart/alq_varlen_8.x/sys/mips/include/atomic.h
  user/lstewart/alq_varlen_8.x/sys/mips/include/elf.h
  user/lstewart/alq_varlen_8.x/sys/mips/include/fpu.h
  user/lstewart/alq_varlen_8.x/sys/mips/include/frame.h
  user/lstewart/alq_varlen_8.x/sys/mips/include/pmap.h
  user/lstewart/alq_varlen_8.x/sys/mips/malta/gt_pci.c
  user/lstewart/alq_varlen_8.x/sys/mips/mips/busdma_machdep.c
  user/lstewart/alq_varlen_8.x/sys/mips/mips/cpu.c
  user/lstewart/alq_varlen_8.x/sys/mips/mips/elf_machdep.c
  user/lstewart/alq_varlen_8.x/sys/mips/mips/in_cksum.c
  user/lstewart/alq_varlen_8.x/sys/mips/mips/machdep.c
  user/lstewart/alq_varlen_8.x/sys/mips/mips/nexus.c
  user/lstewart/alq_varlen_8.x/sys/mips/mips/pmap.c
  user/lstewart/alq_varlen_8.x/sys/modules/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/acpi/acpi/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/agp/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/aio/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/amr/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/ath/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/bridgestp/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/cxgb/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/cxgb/cxgb/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/cxgb/iw_cxgb/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/cxgb/toecore/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/dtrace/dtrace/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/em/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/geom/geom_part/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/hwpmc/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/if_ef/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/if_vlan/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/igb/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/ip_mroute_mod/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/ipfw/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/iwnfw/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/krpc/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/libalias/libalias/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/linprocfs/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/linux/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/mac_bsdextended/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/ndis/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/netgraph/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/netgraph/atm/atm/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/netgraph/ether/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/netgraph/gif/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/nfsclient/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/nfsserver/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/pf/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/powermac_nvram/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/snp/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/sound/driver/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/svr4/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/u3g/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/uart/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/wlan/Makefile
  user/lstewart/alq_varlen_8.x/sys/modules/zfs/Makefile
  user/lstewart/alq_varlen_8.x/sys/net/bpf.c
  user/lstewart/alq_varlen_8.x/sys/net/bridgestp.c
  user/lstewart/alq_varlen_8.x/sys/net/bsd_comp.c
  user/lstewart/alq_varlen_8.x/sys/net/ieee8023ad_lacp.c
  user/lstewart/alq_varlen_8.x/sys/net/if.c
  user/lstewart/alq_varlen_8.x/sys/net/if.h
  user/lstewart/alq_varlen_8.x/sys/net/if_arcsubr.c
  user/lstewart/alq_varlen_8.x/sys/net/if_atmsubr.c
  user/lstewart/alq_varlen_8.x/sys/net/if_bridge.c
  user/lstewart/alq_varlen_8.x/sys/net/if_ef.c
  user/lstewart/alq_varlen_8.x/sys/net/if_ethersubr.c
  user/lstewart/alq_varlen_8.x/sys/net/if_faith.c
  user/lstewart/alq_varlen_8.x/sys/net/if_fddisubr.c
  user/lstewart/alq_varlen_8.x/sys/net/if_fwsubr.c
  user/lstewart/alq_varlen_8.x/sys/net/if_gif.c
  user/lstewart/alq_varlen_8.x/sys/net/if_gif.h
  user/lstewart/alq_varlen_8.x/sys/net/if_gre.c
  user/lstewart/alq_varlen_8.x/sys/net/if_iso88025subr.c
  user/lstewart/alq_varlen_8.x/sys/net/if_lagg.c
  user/lstewart/alq_varlen_8.x/sys/net/if_loop.c
  user/lstewart/alq_varlen_8.x/sys/net/if_media.h
  user/lstewart/alq_varlen_8.x/sys/net/if_mib.c
  user/lstewart/alq_varlen_8.x/sys/net/if_ppp.c
  user/lstewart/alq_varlen_8.x/sys/net/if_sl.c
  user/lstewart/alq_varlen_8.x/sys/net/if_spppsubr.c
  user/lstewart/alq_varlen_8.x/sys/net/if_stf.c
  user/lstewart/alq_varlen_8.x/sys/net/if_tap.c
  user/lstewart/alq_varlen_8.x/sys/net/if_tun.c
  user/lstewart/alq_varlen_8.x/sys/net/if_var.h
  user/lstewart/alq_varlen_8.x/sys/net/if_vlan.c
  user/lstewart/alq_varlen_8.x/sys/net/pfil.c
  user/lstewart/alq_varlen_8.x/sys/net/pfil.h
  user/lstewart/alq_varlen_8.x/sys/net/ppp_deflate.c
  user/lstewart/alq_varlen_8.x/sys/net/radix.c
  user/lstewart/alq_varlen_8.x/sys/net/radix.h
  user/lstewart/alq_varlen_8.x/sys/net/radix_mpath.c
  user/lstewart/alq_varlen_8.x/sys/net/raw_cb.c
  user/lstewart/alq_varlen_8.x/sys/net/raw_cb.h
  user/lstewart/alq_varlen_8.x/sys/net/raw_usrreq.c
  user/lstewart/alq_varlen_8.x/sys/net/route.c
  user/lstewart/alq_varlen_8.x/sys/net/route.h
  user/lstewart/alq_varlen_8.x/sys/net/rtsock.c
  user/lstewart/alq_varlen_8.x/sys/net/vnet.h
  user/lstewart/alq_varlen_8.x/sys/net80211/_ieee80211.h
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211.c
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211.h
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_acl.c
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_adhoc.c
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_crypto.c
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_crypto.h
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_crypto_ccmp.c
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_crypto_tkip.c
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_crypto_wep.c
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_ddb.c
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_dfs.h
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_freebsd.c
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_freebsd.h
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_hostap.c
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_ht.c
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_ht.h
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_input.c
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_input.h
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_ioctl.c
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_ioctl.h
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_node.c
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_node.h
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_output.c
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_power.c
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_power.h
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_proto.c
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_proto.h
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_regdomain.c
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_regdomain.h
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_scan.c
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_scan.h
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_scan_sta.c
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_sta.c
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_var.h
  user/lstewart/alq_varlen_8.x/sys/net80211/ieee80211_wds.c
  user/lstewart/alq_varlen_8.x/sys/netatalk/ddp_pcb.c
  user/lstewart/alq_varlen_8.x/sys/netatalk/ddp_usrreq.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/atm/ng_atm.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/atm/sscfu/ng_sscfu_cust.h
  user/lstewart/alq_varlen_8.x/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/bluetooth/hci/ng_hci_main.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/bluetooth/hci/ng_hci_misc.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
  user/lstewart/alq_varlen_8.x/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/netflow/netflow.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/netflow/ng_netflow.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/netgraph.h
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_UI.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_async.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_atmllc.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_base.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_bpf.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_bridge.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_cisco.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_deflate.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_device.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_eiface.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_etf.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_ether.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_fec.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_frame_relay.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_gif.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_gif_demux.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_hole.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_iface.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_iface.h
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_ipfw.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_ksocket.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_l2tp.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_lmi.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_message.h
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_mppc.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_nat.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_one2many.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_parse.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_pipe.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_ppp.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_pptpgre.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_pred1.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_rfc1490.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_sample.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_socket.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_split.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_sppp.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_tag.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_tcpmss.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_tee.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_tty.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_tty.h
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_vjc.c
  user/lstewart/alq_varlen_8.x/sys/netgraph/ng_vlan.c
  user/lstewart/alq_varlen_8.x/sys/netinet/icmp6.h
  user/lstewart/alq_varlen_8.x/sys/netinet/icmp_var.h
  user/lstewart/alq_varlen_8.x/sys/netinet/if_atm.c
  user/lstewart/alq_varlen_8.x/sys/netinet/if_ether.c
  user/lstewart/alq_varlen_8.x/sys/netinet/if_ether.h
  user/lstewart/alq_varlen_8.x/sys/netinet/igmp.c
  user/lstewart/alq_varlen_8.x/sys/netinet/in.c
  user/lstewart/alq_varlen_8.x/sys/netinet/in.h
  user/lstewart/alq_varlen_8.x/sys/netinet/in_gif.c
  user/lstewart/alq_varlen_8.x/sys/netinet/in_mcast.c
  user/lstewart/alq_varlen_8.x/sys/netinet/in_pcb.c
  user/lstewart/alq_varlen_8.x/sys/netinet/in_pcb.h
  user/lstewart/alq_varlen_8.x/sys/netinet/in_proto.c
  user/lstewart/alq_varlen_8.x/sys/netinet/in_rmx.c
  user/lstewart/alq_varlen_8.x/sys/netinet/in_systm.h
  user/lstewart/alq_varlen_8.x/sys/netinet/in_var.h
  user/lstewart/alq_varlen_8.x/sys/netinet/ip.h
  user/lstewart/alq_varlen_8.x/sys/netinet/ip6.h
  user/lstewart/alq_varlen_8.x/sys/netinet/ip_carp.c
  user/lstewart/alq_varlen_8.x/sys/netinet/ip_divert.c
  user/lstewart/alq_varlen_8.x/sys/netinet/ip_dummynet.c
  user/lstewart/alq_varlen_8.x/sys/netinet/ip_dummynet.h
  user/lstewart/alq_varlen_8.x/sys/netinet/ip_fastfwd.c
  user/lstewart/alq_varlen_8.x/sys/netinet/ip_fw.h
  user/lstewart/alq_varlen_8.x/sys/netinet/ip_fw2.c
  user/lstewart/alq_varlen_8.x/sys/netinet/ip_fw_nat.c
  user/lstewart/alq_varlen_8.x/sys/netinet/ip_fw_pfil.c
  user/lstewart/alq_varlen_8.x/sys/netinet/ip_icmp.c
  user/lstewart/alq_varlen_8.x/sys/netinet/ip_icmp.h
  user/lstewart/alq_varlen_8.x/sys/netinet/ip_input.c
  user/lstewart/alq_varlen_8.x/sys/netinet/ip_ipsec.c
  user/lstewart/alq_varlen_8.x/sys/netinet/ip_mroute.c
  user/lstewart/alq_varlen_8.x/sys/netinet/ip_options.c
  user/lstewart/alq_varlen_8.x/sys/netinet/ip_output.c
  user/lstewart/alq_varlen_8.x/sys/netinet/ip_var.h
  user/lstewart/alq_varlen_8.x/sys/netinet/libalias/alias.c
  user/lstewart/alq_varlen_8.x/sys/netinet/libalias/alias_db.c
  user/lstewart/alq_varlen_8.x/sys/netinet/libalias/alias_ftp.c
  user/lstewart/alq_varlen_8.x/sys/netinet/libalias/alias_irc.c
  user/lstewart/alq_varlen_8.x/sys/netinet/libalias/alias_local.h
  user/lstewart/alq_varlen_8.x/sys/netinet/libalias/alias_nbt.c
  user/lstewart/alq_varlen_8.x/sys/netinet/raw_ip.c
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp.h
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp_asconf.c
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp_asconf.h
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp_auth.c
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp_auth.h
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp_constants.h
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp_crc32.c
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp_crc32.h
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp_header.h
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp_indata.c
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp_indata.h
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp_input.c
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp_os_bsd.h
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp_output.c
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp_output.h
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp_pcb.c
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp_pcb.h
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp_structs.h
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp_sysctl.c
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp_sysctl.h
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp_timer.c
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp_timer.h
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp_uio.h
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp_usrreq.c
  user/lstewart/alq_varlen_8.x/sys/netinet/sctp_var.h
  user/lstewart/alq_varlen_8.x/sys/netinet/sctputil.c
  user/lstewart/alq_varlen_8.x/sys/netinet/sctputil.h
  user/lstewart/alq_varlen_8.x/sys/netinet/tcp_debug.h
  user/lstewart/alq_varlen_8.x/sys/netinet/tcp_hostcache.c
  user/lstewart/alq_varlen_8.x/sys/netinet/tcp_input.c
  user/lstewart/alq_varlen_8.x/sys/netinet/tcp_offload.c
  user/lstewart/alq_varlen_8.x/sys/netinet/tcp_output.c
  user/lstewart/alq_varlen_8.x/sys/netinet/tcp_reass.c
  user/lstewart/alq_varlen_8.x/sys/netinet/tcp_sack.c
  user/lstewart/alq_varlen_8.x/sys/netinet/tcp_subr.c
  user/lstewart/alq_varlen_8.x/sys/netinet/tcp_syncache.c
  user/lstewart/alq_varlen_8.x/sys/netinet/tcp_syncache.h
  user/lstewart/alq_varlen_8.x/sys/netinet/tcp_timer.c
  user/lstewart/alq_varlen_8.x/sys/netinet/tcp_timewait.c
  user/lstewart/alq_varlen_8.x/sys/netinet/tcp_usrreq.c
  user/lstewart/alq_varlen_8.x/sys/netinet/tcp_var.h
  user/lstewart/alq_varlen_8.x/sys/netinet/udp_usrreq.c
  user/lstewart/alq_varlen_8.x/sys/netinet/udp_var.h
  user/lstewart/alq_varlen_8.x/sys/netinet/vinet.h
  user/lstewart/alq_varlen_8.x/sys/netinet6/dest6.c
  user/lstewart/alq_varlen_8.x/sys/netinet6/frag6.c
  user/lstewart/alq_varlen_8.x/sys/netinet6/icmp6.c
  user/lstewart/alq_varlen_8.x/sys/netinet6/in6.c
  user/lstewart/alq_varlen_8.x/sys/netinet6/in6_gif.c
  user/lstewart/alq_varlen_8.x/sys/netinet6/in6_ifattach.c
  user/lstewart/alq_varlen_8.x/sys/netinet6/in6_pcb.c
  user/lstewart/alq_varlen_8.x/sys/netinet6/in6_pcb.h
  user/lstewart/alq_varlen_8.x/sys/netinet6/in6_proto.c
  user/lstewart/alq_varlen_8.x/sys/netinet6/in6_rmx.c
  user/lstewart/alq_varlen_8.x/sys/netinet6/in6_src.c
  user/lstewart/alq_varlen_8.x/sys/netinet6/in6_var.h
  user/lstewart/alq_varlen_8.x/sys/netinet6/ip6_forward.c
  user/lstewart/alq_varlen_8.x/sys/netinet6/ip6_input.c
  user/lstewart/alq_varlen_8.x/sys/netinet6/ip6_ipsec.c
  user/lstewart/alq_varlen_8.x/sys/netinet6/ip6_mroute.c
  user/lstewart/alq_varlen_8.x/sys/netinet6/ip6_output.c
  user/lstewart/alq_varlen_8.x/sys/netinet6/ip6_var.h
  user/lstewart/alq_varlen_8.x/sys/netinet6/ip6protosw.h
  user/lstewart/alq_varlen_8.x/sys/netinet6/mld6.c
  user/lstewart/alq_varlen_8.x/sys/netinet6/nd6.c
  user/lstewart/alq_varlen_8.x/sys/netinet6/nd6.h
  user/lstewart/alq_varlen_8.x/sys/netinet6/nd6_nbr.c
  user/lstewart/alq_varlen_8.x/sys/netinet6/nd6_rtr.c
  user/lstewart/alq_varlen_8.x/sys/netinet6/raw_ip6.c
  user/lstewart/alq_varlen_8.x/sys/netinet6/raw_ip6.h
  user/lstewart/alq_varlen_8.x/sys/netinet6/route6.c
  user/lstewart/alq_varlen_8.x/sys/netinet6/scope6.c
  user/lstewart/alq_varlen_8.x/sys/netinet6/sctp6_usrreq.c
  user/lstewart/alq_varlen_8.x/sys/netinet6/tcp6_var.h
  user/lstewart/alq_varlen_8.x/sys/netinet6/udp6_usrreq.c
  user/lstewart/alq_varlen_8.x/sys/netinet6/vinet6.h
  user/lstewart/alq_varlen_8.x/sys/netipsec/ipip_var.h
  user/lstewart/alq_varlen_8.x/sys/netipsec/ipsec.c
  user/lstewart/alq_varlen_8.x/sys/netipsec/ipsec.h
  user/lstewart/alq_varlen_8.x/sys/netipsec/ipsec6.h
  user/lstewart/alq_varlen_8.x/sys/netipsec/ipsec_input.c
  user/lstewart/alq_varlen_8.x/sys/netipsec/ipsec_mbuf.c
  user/lstewart/alq_varlen_8.x/sys/netipsec/ipsec_output.c
  user/lstewart/alq_varlen_8.x/sys/netipsec/key.c
  user/lstewart/alq_varlen_8.x/sys/netipsec/keysock.c
  user/lstewart/alq_varlen_8.x/sys/netipsec/keysock.h
  user/lstewart/alq_varlen_8.x/sys/netipsec/vipsec.h
  user/lstewart/alq_varlen_8.x/sys/netipsec/xform_ah.c
  user/lstewart/alq_varlen_8.x/sys/netipsec/xform_esp.c
  user/lstewart/alq_varlen_8.x/sys/netipsec/xform_ipcomp.c
  user/lstewart/alq_varlen_8.x/sys/netipsec/xform_ipip.c
  user/lstewart/alq_varlen_8.x/sys/netipx/ipx_pcb.c
  user/lstewart/alq_varlen_8.x/sys/netipx/ipx_usrreq.c
  user/lstewart/alq_varlen_8.x/sys/netipx/spx_usrreq.c
  user/lstewart/alq_varlen_8.x/sys/netnatm/natm.c
  user/lstewart/alq_varlen_8.x/sys/netnatm/natm_pcb.c
  user/lstewart/alq_varlen_8.x/sys/netncp/ncp_conn.c
  user/lstewart/alq_varlen_8.x/sys/netncp/ncp_rq.c
  user/lstewart/alq_varlen_8.x/sys/netncp/ncp_sock.c
  user/lstewart/alq_varlen_8.x/sys/netncp/ncp_subr.c
  user/lstewart/alq_varlen_8.x/sys/netsmb/smb_conn.c
  user/lstewart/alq_varlen_8.x/sys/netsmb/smb_conn.h
  user/lstewart/alq_varlen_8.x/sys/netsmb/smb_dev.c
  user/lstewart/alq_varlen_8.x/sys/netsmb/smb_rq.c
  user/lstewart/alq_varlen_8.x/sys/netsmb/smb_trantcp.c
  user/lstewart/alq_varlen_8.x/sys/nfs4client/nfs4_dev.c
  user/lstewart/alq_varlen_8.x/sys/nfs4client/nfs4_idmap.c
  user/lstewart/alq_varlen_8.x/sys/nfs4client/nfs4_socket.c
  user/lstewart/alq_varlen_8.x/sys/nfs4client/nfs4_subs.c
  user/lstewart/alq_varlen_8.x/sys/nfs4client/nfs4_vfsops.c
  user/lstewart/alq_varlen_8.x/sys/nfs4client/nfs4_vn_subs.c
  user/lstewart/alq_varlen_8.x/sys/nfs4client/nfs4_vnops.c
  user/lstewart/alq_varlen_8.x/sys/nfsclient/bootp_subr.c
  user/lstewart/alq_varlen_8.x/sys/nfsclient/krpc_subr.c
  user/lstewart/alq_varlen_8.x/sys/nfsclient/nfs.h
  user/lstewart/alq_varlen_8.x/sys/nfsclient/nfs_diskless.c
  user/lstewart/alq_varlen_8.x/sys/nfsclient/nfs_lock.c
  user/lstewart/alq_varlen_8.x/sys/nfsclient/nfs_nfsiod.c
  user/lstewart/alq_varlen_8.x/sys/nfsclient/nfs_node.c
  user/lstewart/alq_varlen_8.x/sys/nfsclient/nfs_socket.c
  user/lstewart/alq_varlen_8.x/sys/nfsclient/nfs_subs.c
  user/lstewart/alq_varlen_8.x/sys/nfsclient/nfs_vfsops.c
  user/lstewart/alq_varlen_8.x/sys/nfsclient/nfs_vnops.c
  user/lstewart/alq_varlen_8.x/sys/nfsclient/nfsmount.h
  user/lstewart/alq_varlen_8.x/sys/nfsserver/nfs.h
  user/lstewart/alq_varlen_8.x/sys/nfsserver/nfs_serv.c
  user/lstewart/alq_varlen_8.x/sys/nfsserver/nfs_srvcache.c
  user/lstewart/alq_varlen_8.x/sys/nfsserver/nfs_srvsock.c
  user/lstewart/alq_varlen_8.x/sys/nfsserver/nfs_srvsubs.c
  user/lstewart/alq_varlen_8.x/sys/nfsserver/nfs_syscalls.c
  user/lstewart/alq_varlen_8.x/sys/nfsserver/nfsm_subs.h
  user/lstewart/alq_varlen_8.x/sys/nfsserver/nfsrvcache.h
  user/lstewart/alq_varlen_8.x/sys/nlm/nlm.h
  user/lstewart/alq_varlen_8.x/sys/nlm/nlm_advlock.c
  user/lstewart/alq_varlen_8.x/sys/nlm/nlm_prot_impl.c
  user/lstewart/alq_varlen_8.x/sys/nlm/nlm_prot_svc.c
  user/lstewart/alq_varlen_8.x/sys/opencrypto/cryptodev.c
  user/lstewart/alq_varlen_8.x/sys/opencrypto/cryptosoft.c
  user/lstewart/alq_varlen_8.x/sys/opencrypto/deflate.c
  user/lstewart/alq_varlen_8.x/sys/opencrypto/xform.c
  user/lstewart/alq_varlen_8.x/sys/pc98/cbus/scterm-sck.c
  user/lstewart/alq_varlen_8.x/sys/pc98/conf/DEFAULTS
  user/lstewart/alq_varlen_8.x/sys/pc98/conf/GENERIC
  user/lstewart/alq_varlen_8.x/sys/pc98/conf/NOTES
  user/lstewart/alq_varlen_8.x/sys/pc98/pc98/pc98_machdep.c
  user/lstewart/alq_varlen_8.x/sys/pc98/pc98/pc98_machdep.h
  user/lstewart/alq_varlen_8.x/sys/pci/if_rl.c
  user/lstewart/alq_varlen_8.x/sys/pci/if_rlreg.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/aim/locore.S
  user/lstewart/alq_varlen_8.x/sys/powerpc/aim/machdep.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/aim/ofw_machdep.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/booke/interrupt.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/booke/locore.S
  user/lstewart/alq_varlen_8.x/sys/powerpc/booke/machdep.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/booke/pmap.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/booke/trap.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/booke/trap_subr.S
  user/lstewart/alq_varlen_8.x/sys/powerpc/conf/GENERIC
  user/lstewart/alq_varlen_8.x/sys/powerpc/conf/MPC85XX
  user/lstewart/alq_varlen_8.x/sys/powerpc/conf/NOTES
  user/lstewart/alq_varlen_8.x/sys/powerpc/include/atomic.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/include/cpu.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/include/cpufunc.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/include/elf.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/include/endian.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/include/float.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/include/ofw_machdep.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/include/param.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/include/pcpu.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/include/pmap.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/include/profile.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/include/pte.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/include/spr.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/include/tlb.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/mpc85xx/mpc85xx.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/mpc85xx/nexus.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/mpc85xx/ocpbus.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/ofw/ofw_pcib_pci.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/ofw/ofw_pcibus.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/ofw/ofw_syscons.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/ofw/ofw_syscons.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/powermac/ata_dbdma.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/powermac/ata_kauai.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/powermac/ata_macio.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/powermac/dbdma.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/powermac/dbdmavar.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/powermac/grackle.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/powermac/gracklevar.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/powermac/macio.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/powermac/uninorth.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/powermac/uninorthvar.h
  user/lstewart/alq_varlen_8.x/sys/powerpc/powerpc/elf_machdep.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/powerpc/genassym.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/powerpc/intr_machdep.c
  user/lstewart/alq_varlen_8.x/sys/powerpc/powerpc/pmap_dispatch.c
  user/lstewart/alq_varlen_8.x/sys/rpc/auth.h
  user/lstewart/alq_varlen_8.x/sys/rpc/auth_none.c
  user/lstewart/alq_varlen_8.x/sys/rpc/auth_unix.c
  user/lstewart/alq_varlen_8.x/sys/rpc/clnt.h
  user/lstewart/alq_varlen_8.x/sys/rpc/clnt_dg.c
  user/lstewart/alq_varlen_8.x/sys/rpc/clnt_rc.c
  user/lstewart/alq_varlen_8.x/sys/rpc/clnt_vc.c
  user/lstewart/alq_varlen_8.x/sys/rpc/rpc_com.h
  user/lstewart/alq_varlen_8.x/sys/rpc/rpc_generic.c
  user/lstewart/alq_varlen_8.x/sys/rpc/rpc_msg.h
  user/lstewart/alq_varlen_8.x/sys/rpc/rpc_prot.c
  user/lstewart/alq_varlen_8.x/sys/rpc/rpcclnt.c
  user/lstewart/alq_varlen_8.x/sys/rpc/svc.c
  user/lstewart/alq_varlen_8.x/sys/rpc/svc.h
  user/lstewart/alq_varlen_8.x/sys/rpc/svc_auth.c
  user/lstewart/alq_varlen_8.x/sys/rpc/svc_auth.h
  user/lstewart/alq_varlen_8.x/sys/rpc/svc_auth_unix.c
  user/lstewart/alq_varlen_8.x/sys/rpc/svc_dg.c
  user/lstewart/alq_varlen_8.x/sys/rpc/svc_generic.c
  user/lstewart/alq_varlen_8.x/sys/rpc/svc_vc.c
  user/lstewart/alq_varlen_8.x/sys/rpc/xdr.h
  user/lstewart/alq_varlen_8.x/sys/security/audit/audit.c
  user/lstewart/alq_varlen_8.x/sys/security/audit/audit.h
  user/lstewart/alq_varlen_8.x/sys/security/audit/audit_arg.c
  user/lstewart/alq_varlen_8.x/sys/security/audit/audit_bsm.c
  user/lstewart/alq_varlen_8.x/sys/security/audit/audit_bsm_klib.c
  user/lstewart/alq_varlen_8.x/sys/security/audit/audit_bsm_token.c
  user/lstewart/alq_varlen_8.x/sys/security/audit/audit_pipe.c
  user/lstewart/alq_varlen_8.x/sys/security/audit/audit_private.h
  user/lstewart/alq_varlen_8.x/sys/security/audit/audit_syscalls.c
  user/lstewart/alq_varlen_8.x/sys/security/audit/audit_worker.c
  user/lstewart/alq_varlen_8.x/sys/security/mac/mac_audit.c
  user/lstewart/alq_varlen_8.x/sys/security/mac/mac_framework.c
  user/lstewart/alq_varlen_8.x/sys/security/mac/mac_framework.h
  user/lstewart/alq_varlen_8.x/sys/security/mac/mac_inet6.c
  user/lstewart/alq_varlen_8.x/sys/security/mac/mac_internal.h
  user/lstewart/alq_varlen_8.x/sys/security/mac/mac_policy.h
  user/lstewart/alq_varlen_8.x/sys/security/mac/mac_priv.c
  user/lstewart/alq_varlen_8.x/sys/security/mac/mac_process.c
  user/lstewart/alq_varlen_8.x/sys/security/mac/mac_syscalls.c
  user/lstewart/alq_varlen_8.x/sys/security/mac/mac_vfs.c
  user/lstewart/alq_varlen_8.x/sys/security/mac_biba/mac_biba.c
  user/lstewart/alq_varlen_8.x/sys/security/mac_bsdextended/mac_bsdextended.c
  user/lstewart/alq_varlen_8.x/sys/security/mac_ifoff/mac_ifoff.c
  user/lstewart/alq_varlen_8.x/sys/security/mac_lomac/mac_lomac.c
  user/lstewart/alq_varlen_8.x/sys/security/mac_mls/mac_mls.c
  user/lstewart/alq_varlen_8.x/sys/security/mac_none/mac_none.c
  user/lstewart/alq_varlen_8.x/sys/security/mac_partition/mac_partition.c
  user/lstewart/alq_varlen_8.x/sys/security/mac_portacl/mac_portacl.c
  user/lstewart/alq_varlen_8.x/sys/security/mac_seeotheruids/mac_seeotheruids.c
  user/lstewart/alq_varlen_8.x/sys/security/mac_stub/mac_stub.c
  user/lstewart/alq_varlen_8.x/sys/security/mac_test/mac_test.c
  user/lstewart/alq_varlen_8.x/sys/sparc64/conf/DEFAULTS
  user/lstewart/alq_varlen_8.x/sys/sparc64/conf/GENERIC
  user/lstewart/alq_varlen_8.x/sys/sparc64/ebus/ebus.c
  user/lstewart/alq_varlen_8.x/sys/sparc64/include/atomic.h
  user/lstewart/alq_varlen_8.x/sys/sparc64/include/bus_private.h
  user/lstewart/alq_varlen_8.x/sys/sparc64/include/elf.h
  user/lstewart/alq_varlen_8.x/sys/sparc64/include/intr_machdep.h
  user/lstewart/alq_varlen_8.x/sys/sparc64/include/iommureg.h
  user/lstewart/alq_varlen_8.x/sys/sparc64/include/iommuvar.h
  user/lstewart/alq_varlen_8.x/sys/sparc64/include/ofw_machdep.h
  user/lstewart/alq_varlen_8.x/sys/sparc64/include/tlb.h
  user/lstewart/alq_varlen_8.x/sys/sparc64/include/vmparam.h
  user/lstewart/alq_varlen_8.x/sys/sparc64/isa/ofw_isa.c
  user/lstewart/alq_varlen_8.x/sys/sparc64/pci/apb.c
  user/lstewart/alq_varlen_8.x/sys/sparc64/pci/ofw_pci.h
  user/lstewart/alq_varlen_8.x/sys/sparc64/pci/ofw_pcib.c
  user/lstewart/alq_varlen_8.x/sys/sparc64/pci/ofw_pcib_subr.c
  user/lstewart/alq_varlen_8.x/sys/sparc64/pci/ofw_pcibus.c
  user/lstewart/alq_varlen_8.x/sys/sparc64/pci/psycho.c
  user/lstewart/alq_varlen_8.x/sys/sparc64/pci/schizo.c
  user/lstewart/alq_varlen_8.x/sys/sparc64/pci/schizoreg.h
  user/lstewart/alq_varlen_8.x/sys/sparc64/pci/schizovar.h
  user/lstewart/alq_varlen_8.x/sys/sparc64/sbus/sbus.c
  user/lstewart/alq_varlen_8.x/sys/sparc64/sparc64/db_trace.c
  user/lstewart/alq_varlen_8.x/sys/sparc64/sparc64/elf_machdep.c
  user/lstewart/alq_varlen_8.x/sys/sparc64/sparc64/intr_machdep.c
  user/lstewart/alq_varlen_8.x/sys/sparc64/sparc64/iommu.c
  user/lstewart/alq_varlen_8.x/sys/sparc64/sparc64/machdep.c
  user/lstewart/alq_varlen_8.x/sys/sparc64/sparc64/mp_machdep.c
  user/lstewart/alq_varlen_8.x/sys/sparc64/sparc64/nexus.c
  user/lstewart/alq_varlen_8.x/sys/sparc64/sparc64/ofw_machdep.c
  user/lstewart/alq_varlen_8.x/sys/sparc64/sparc64/pmap.c
  user/lstewart/alq_varlen_8.x/sys/sparc64/sparc64/stack_machdep.c
  user/lstewart/alq_varlen_8.x/sys/sparc64/sparc64/support.S
  user/lstewart/alq_varlen_8.x/sys/sparc64/sparc64/trap.c
  user/lstewart/alq_varlen_8.x/sys/sparc64/sparc64/vm_machdep.c
  user/lstewart/alq_varlen_8.x/sys/sun4v/conf/DEFAULTS
  user/lstewart/alq_varlen_8.x/sys/sun4v/conf/GENERIC
  user/lstewart/alq_varlen_8.x/sys/sun4v/include/atomic.h
  user/lstewart/alq_varlen_8.x/sys/sun4v/include/elf.h
  user/lstewart/alq_varlen_8.x/sys/sun4v/include/ofw_machdep.h
  user/lstewart/alq_varlen_8.x/sys/sun4v/include/pcpu.h
  user/lstewart/alq_varlen_8.x/sys/sun4v/include/vmparam.h
  user/lstewart/alq_varlen_8.x/sys/sun4v/sun4v/db_trace.c
  user/lstewart/alq_varlen_8.x/sys/sun4v/sun4v/machdep.c
  user/lstewart/alq_varlen_8.x/sys/sun4v/sun4v/mp_machdep.c
  user/lstewart/alq_varlen_8.x/sys/sun4v/sun4v/stack_machdep.c
  user/lstewart/alq_varlen_8.x/sys/sun4v/sun4v/support.S
  user/lstewart/alq_varlen_8.x/sys/sun4v/sun4v/trap.c
  user/lstewart/alq_varlen_8.x/sys/sys/_null.h
  user/lstewart/alq_varlen_8.x/sys/sys/_types.h
  user/lstewart/alq_varlen_8.x/sys/sys/aio.h
  user/lstewart/alq_varlen_8.x/sys/sys/bus_dma.h
  user/lstewart/alq_varlen_8.x/sys/sys/cdefs.h
  user/lstewart/alq_varlen_8.x/sys/sys/clist.h
  user/lstewart/alq_varlen_8.x/sys/sys/conf.h
  user/lstewart/alq_varlen_8.x/sys/sys/cons.h
  user/lstewart/alq_varlen_8.x/sys/sys/copyright.h
  user/lstewart/alq_varlen_8.x/sys/sys/cpuset.h
  user/lstewart/alq_varlen_8.x/sys/sys/disklabel.h
  user/lstewart/alq_varlen_8.x/sys/sys/elf64.h
  user/lstewart/alq_varlen_8.x/sys/sys/elf_common.h
  user/lstewart/alq_varlen_8.x/sys/sys/elf_generic.h
  user/lstewart/alq_varlen_8.x/sys/sys/extattr.h
  user/lstewart/alq_varlen_8.x/sys/sys/file.h
  user/lstewart/alq_varlen_8.x/sys/sys/imgact_elf.h
  user/lstewart/alq_varlen_8.x/sys/sys/jail.h
  user/lstewart/alq_varlen_8.x/sys/sys/kernel.h
  user/lstewart/alq_varlen_8.x/sys/sys/kobj.h
  user/lstewart/alq_varlen_8.x/sys/sys/ktr.h
  user/lstewart/alq_varlen_8.x/sys/sys/libkern.h
  user/lstewart/alq_varlen_8.x/sys/sys/link_elf.h
  user/lstewart/alq_varlen_8.x/sys/sys/lock.h
  user/lstewart/alq_varlen_8.x/sys/sys/lockmgr.h
  user/lstewart/alq_varlen_8.x/sys/sys/malloc.h
  user/lstewart/alq_varlen_8.x/sys/sys/mbuf.h
  user/lstewart/alq_varlen_8.x/sys/sys/module.h
  user/lstewart/alq_varlen_8.x/sys/sys/mount.h
  user/lstewart/alq_varlen_8.x/sys/sys/namei.h
  user/lstewart/alq_varlen_8.x/sys/sys/param.h
  user/lstewart/alq_varlen_8.x/sys/sys/pciio.h
  user/lstewart/alq_varlen_8.x/sys/sys/pcpu.h
  user/lstewart/alq_varlen_8.x/sys/sys/pmc.h
  user/lstewart/alq_varlen_8.x/sys/sys/pmclog.h
  user/lstewart/alq_varlen_8.x/sys/sys/priv.h
  user/lstewart/alq_varlen_8.x/sys/sys/proc.h
  user/lstewart/alq_varlen_8.x/sys/sys/protosw.h
  user/lstewart/alq_varlen_8.x/sys/sys/resource.h
  user/lstewart/alq_varlen_8.x/sys/sys/rwlock.h
  user/lstewart/alq_varlen_8.x/sys/sys/sched.h
  user/lstewart/alq_varlen_8.x/sys/sys/soundcard.h
  user/lstewart/alq_varlen_8.x/sys/sys/syscall.h
  user/lstewart/alq_varlen_8.x/sys/sys/syscall.mk
  user/lstewart/alq_varlen_8.x/sys/sys/syscallsubr.h
  user/lstewart/alq_varlen_8.x/sys/sys/sysctl.h
  user/lstewart/alq_varlen_8.x/sys/sys/sysent.h
  user/lstewart/alq_varlen_8.x/sys/sys/sysproto.h
  user/lstewart/alq_varlen_8.x/sys/sys/termios.h
  user/lstewart/alq_varlen_8.x/sys/sys/tree.h
  user/lstewart/alq_varlen_8.x/sys/sys/tty.h
  user/lstewart/alq_varlen_8.x/sys/sys/ttydefaults.h
  user/lstewart/alq_varlen_8.x/sys/sys/ttyhook.h
  user/lstewart/alq_varlen_8.x/sys/sys/ttyqueue.h
  user/lstewart/alq_varlen_8.x/sys/sys/types.h
  user/lstewart/alq_varlen_8.x/sys/sys/unistd.h
  user/lstewart/alq_varlen_8.x/sys/sys/user.h
  user/lstewart/alq_varlen_8.x/sys/sys/vimage.h
  user/lstewart/alq_varlen_8.x/sys/sys/vnode.h
  user/lstewart/alq_varlen_8.x/sys/sys/vtoc.h
  user/lstewart/alq_varlen_8.x/sys/tools/vnode_if.awk
  user/lstewart/alq_varlen_8.x/sys/ufs/ffs/ffs_alloc.c
  user/lstewart/alq_varlen_8.x/sys/ufs/ffs/ffs_balloc.c
  user/lstewart/alq_varlen_8.x/sys/ufs/ffs/ffs_extern.h
  user/lstewart/alq_varlen_8.x/sys/ufs/ffs/ffs_inode.c
  user/lstewart/alq_varlen_8.x/sys/ufs/ffs/ffs_snapshot.c
  user/lstewart/alq_varlen_8.x/sys/ufs/ffs/ffs_softdep.c
  user/lstewart/alq_varlen_8.x/sys/ufs/ffs/ffs_vfsops.c
  user/lstewart/alq_varlen_8.x/sys/ufs/ffs/ffs_vnops.c
  user/lstewart/alq_varlen_8.x/sys/ufs/ufs/ufs_acl.c
  user/lstewart/alq_varlen_8.x/sys/ufs/ufs/ufs_dirhash.c
  user/lstewart/alq_varlen_8.x/sys/ufs/ufs/ufs_extattr.c
  user/lstewart/alq_varlen_8.x/sys/ufs/ufs/ufs_lookup.c
  user/lstewart/alq_varlen_8.x/sys/ufs/ufs/ufs_quota.c
  user/lstewart/alq_varlen_8.x/sys/ufs/ufs/ufs_vfsops.c
  user/lstewart/alq_varlen_8.x/sys/ufs/ufs/ufs_vnops.c
  user/lstewart/alq_varlen_8.x/sys/vm/uma.h
  user/lstewart/alq_varlen_8.x/sys/vm/uma_core.c
  user/lstewart/alq_varlen_8.x/sys/vm/uma_dbg.c
  user/lstewart/alq_varlen_8.x/sys/vm/uma_int.h
  user/lstewart/alq_varlen_8.x/sys/vm/vm_fault.c
  user/lstewart/alq_varlen_8.x/sys/vm/vm_kern.c
  user/lstewart/alq_varlen_8.x/sys/vm/vm_map.c
  user/lstewart/alq_varlen_8.x/sys/vm/vm_map.h
  user/lstewart/alq_varlen_8.x/sys/vm/vm_meter.c
  user/lstewart/alq_varlen_8.x/sys/vm/vm_mmap.c
  user/lstewart/alq_varlen_8.x/sys/vm/vm_object.c
  user/lstewart/alq_varlen_8.x/sys/vm/vm_object.h
  user/lstewart/alq_varlen_8.x/sys/vm/vm_page.c
  user/lstewart/alq_varlen_8.x/sys/vm/vm_page.h
  user/lstewart/alq_varlen_8.x/sys/vm/vm_pageout.c
  user/lstewart/alq_varlen_8.x/sys/vm/vm_unix.c
  user/lstewart/alq_varlen_8.x/sys/vm/vnode_pager.c
  user/lstewart/alq_varlen_8.x/sys/vm/vnode_pager.h
  user/lstewart/alq_varlen_8.x/sys/xdr/xdr_mbuf.c
  user/lstewart/alq_varlen_8.x/sys/xen/evtchn/evtchn.c
  user/lstewart/alq_varlen_8.x/sys/xen/evtchn/evtchn_dev.c
  user/lstewart/alq_varlen_8.x/sys/xen/features.c
  user/lstewart/alq_varlen_8.x/sys/xen/gnttab.c
  user/lstewart/alq_varlen_8.x/sys/xen/gnttab.h
  user/lstewart/alq_varlen_8.x/sys/xen/xenbus/xenbus_client.c
  user/lstewart/alq_varlen_8.x/sys/xen/xenbus/xenbus_comms.c
  user/lstewart/alq_varlen_8.x/sys/xen/xenbus/xenbus_comms.h
  user/lstewart/alq_varlen_8.x/sys/xen/xenbus/xenbus_dev.c
  user/lstewart/alq_varlen_8.x/sys/xen/xenbus/xenbus_probe.c
  user/lstewart/alq_varlen_8.x/sys/xen/xenbus/xenbus_probe_backend.c
  user/lstewart/alq_varlen_8.x/sys/xen/xenbus/xenbus_xs.c
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/Makefile
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/fstest.c
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/chflags/00.t
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/chflags/01.t
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/chflags/02.t
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/chflags/03.t
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/chflags/04.t
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/chflags/05.t
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/chflags/06.t
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/chflags/07.t
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/chflags/08.t
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/chflags/09.t
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/chflags/11.t
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/chflags/12.t
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/chflags/13.t
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/chown/00.t
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/chown/05.t
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/chown/07.t
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/conf
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/link/00.t
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/misc.sh
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/open/16.t
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/open/23.t
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/rename/19.t
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/rmdir/12.t
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/truncate/13.t
  user/lstewart/alq_varlen_8.x/tools/regression/fstest/tests/unlink/08.t
  user/lstewart/alq_varlen_8.x/tools/regression/lib/libc/stdio/test-printfloat.c
  user/lstewart/alq_varlen_8.x/tools/regression/lib/libutil/test-flopen.c
  user/lstewart/alq_varlen_8.x/tools/regression/lib/msun/Makefile
  user/lstewart/alq_varlen_8.x/tools/regression/usr.bin/jot/regress.sh
  user/lstewart/alq_varlen_8.x/tools/regression/usr.bin/sed/regress.sh
  user/lstewart/alq_varlen_8.x/tools/sched/schedgraph.py
  user/lstewart/alq_varlen_8.x/tools/tools/README
  user/lstewart/alq_varlen_8.x/tools/tools/ath/Makefile
  user/lstewart/alq_varlen_8.x/tools/tools/ath/athdebug/Makefile
  user/lstewart/alq_varlen_8.x/tools/tools/ath/athdebug/athdebug.c
  user/lstewart/alq_varlen_8.x/tools/tools/ath/athstats/Makefile
  user/lstewart/alq_varlen_8.x/tools/tools/ath/athstats/athstats.c
  user/lstewart/alq_varlen_8.x/tools/tools/ath/athstats/athstats.h
  user/lstewart/alq_varlen_8.x/tools/tools/ath/athstats/main.c
  user/lstewart/alq_varlen_8.x/tools/tools/mctest/mctest.1
  user/lstewart/alq_varlen_8.x/tools/tools/nanobsd/gateworks/Files/   (props changed)
  user/lstewart/alq_varlen_8.x/tools/tools/nanobsd/gateworks/Files/root/   (props changed)
  user/lstewart/alq_varlen_8.x/tools/tools/nanobsd/gateworks/cfg/   (props changed)
  user/lstewart/alq_varlen_8.x/tools/tools/nanobsd/gateworks/cfg/ssh/   (props changed)
  user/lstewart/alq_varlen_8.x/tools/tools/nanobsd/nanobsd.sh
  user/lstewart/alq_varlen_8.x/tools/tools/net80211/Makefile
  user/lstewart/alq_varlen_8.x/tools/tools/net80211/wlanstats/main.c
  user/lstewart/alq_varlen_8.x/tools/tools/net80211/wlanstats/wlanstats.c
  user/lstewart/alq_varlen_8.x/tools/tools/usb/print-usb-if-vids.sh
  user/lstewart/alq_varlen_8.x/usr.bin/Makefile
  user/lstewart/alq_varlen_8.x/usr.bin/basename/basename.1
  user/lstewart/alq_varlen_8.x/usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c
  user/lstewart/alq_varlen_8.x/usr.bin/calendar/calendars/calendar.freebsd
  user/lstewart/alq_varlen_8.x/usr.bin/cpio/Makefile
  user/lstewart/alq_varlen_8.x/usr.bin/cpio/cmdline.c
  user/lstewart/alq_varlen_8.x/usr.bin/cpio/config_freebsd.h
  user/lstewart/alq_varlen_8.x/usr.bin/cpio/cpio.c
  user/lstewart/alq_varlen_8.x/usr.bin/cpio/cpio.h
  user/lstewart/alq_varlen_8.x/usr.bin/cpio/cpio_platform.h
  user/lstewart/alq_varlen_8.x/usr.bin/cpio/test/test_option_tv.stdout.uu
  user/lstewart/alq_varlen_8.x/usr.bin/cpuset/cpuset.1
  user/lstewart/alq_varlen_8.x/usr.bin/cpuset/cpuset.c
  user/lstewart/alq_varlen_8.x/usr.bin/csplit/csplit.1
  user/lstewart/alq_varlen_8.x/usr.bin/csup/   (props changed)
  user/lstewart/alq_varlen_8.x/usr.bin/csup/Makefile
  user/lstewart/alq_varlen_8.x/usr.bin/dirname/dirname.c
  user/lstewart/alq_varlen_8.x/usr.bin/du/du.1
  user/lstewart/alq_varlen_8.x/usr.bin/du/du.c
  user/lstewart/alq_varlen_8.x/usr.bin/elf2aout/Makefile
  user/lstewart/alq_varlen_8.x/usr.bin/fetch/fetch.1
  user/lstewart/alq_varlen_8.x/usr.bin/fetch/fetch.c
  user/lstewart/alq_varlen_8.x/usr.bin/file/config.h
  user/lstewart/alq_varlen_8.x/usr.bin/fstat/zfs.c
  user/lstewart/alq_varlen_8.x/usr.bin/fstat/zfs/Makefile
  user/lstewart/alq_varlen_8.x/usr.bin/gprof/gprof.1
  user/lstewart/alq_varlen_8.x/usr.bin/gprof/gprof.c
  user/lstewart/alq_varlen_8.x/usr.bin/ipcs/ipcs.c
  user/lstewart/alq_varlen_8.x/usr.bin/killall/killall.c
  user/lstewart/alq_varlen_8.x/usr.bin/lsvfs/lsvfs.c
  user/lstewart/alq_varlen_8.x/usr.bin/mail/Makefile
  user/lstewart/alq_varlen_8.x/usr.bin/make/Makefile
  user/lstewart/alq_varlen_8.x/usr.bin/make/buf.c
  user/lstewart/alq_varlen_8.x/usr.bin/make/for.c
  user/lstewart/alq_varlen_8.x/usr.bin/make/globals.h
  user/lstewart/alq_varlen_8.x/usr.bin/make/job.c
  user/lstewart/alq_varlen_8.x/usr.bin/make/job.h
  user/lstewart/alq_varlen_8.x/usr.bin/make/main.c
  user/lstewart/alq_varlen_8.x/usr.bin/make/make.1
  user/lstewart/alq_varlen_8.x/usr.bin/make/make.c
  user/lstewart/alq_varlen_8.x/usr.bin/make/make.h
  user/lstewart/alq_varlen_8.x/usr.bin/make/parse.c
  user/lstewart/alq_varlen_8.x/usr.bin/make/suff.c
  user/lstewart/alq_varlen_8.x/usr.bin/make/var.c
  user/lstewart/alq_varlen_8.x/usr.bin/ncal/ncal.1
  user/lstewart/alq_varlen_8.x/usr.bin/ncal/ncal.c
  user/lstewart/alq_varlen_8.x/usr.bin/netstat/Makefile
  user/lstewart/alq_varlen_8.x/usr.bin/netstat/inet.c
  user/lstewart/alq_varlen_8.x/usr.bin/netstat/inet6.c
  user/lstewart/alq_varlen_8.x/usr.bin/netstat/main.c
  user/lstewart/alq_varlen_8.x/usr.bin/netstat/netstat.1
  user/lstewart/alq_varlen_8.x/usr.bin/netstat/netstat.h
  user/lstewart/alq_varlen_8.x/usr.bin/netstat/route.c
  user/lstewart/alq_varlen_8.x/usr.bin/netstat/unix.c
  user/lstewart/alq_varlen_8.x/usr.bin/nsupdate/Makefile
  user/lstewart/alq_varlen_8.x/usr.bin/procstat/   (props changed)
  user/lstewart/alq_varlen_8.x/usr.bin/procstat/Makefile
  user/lstewart/alq_varlen_8.x/usr.bin/procstat/procstat.1
  user/lstewart/alq_varlen_8.x/usr.bin/procstat/procstat.c
  user/lstewart/alq_varlen_8.x/usr.bin/procstat/procstat_args.c
  user/lstewart/alq_varlen_8.x/usr.bin/procstat/procstat_basic.c
  user/lstewart/alq_varlen_8.x/usr.bin/procstat/procstat_bin.c
  user/lstewart/alq_varlen_8.x/usr.bin/procstat/procstat_cred.c
  user/lstewart/alq_varlen_8.x/usr.bin/procstat/procstat_files.c
  user/lstewart/alq_varlen_8.x/usr.bin/procstat/procstat_kstack.c
  user/lstewart/alq_varlen_8.x/usr.bin/procstat/procstat_threads.c
  user/lstewart/alq_varlen_8.x/usr.bin/procstat/procstat_vm.c
  user/lstewart/alq_varlen_8.x/usr.bin/sed/compile.c
  user/lstewart/alq_varlen_8.x/usr.bin/sockstat/sockstat.c
  user/lstewart/alq_varlen_8.x/usr.bin/split/split.1
  user/lstewart/alq_varlen_8.x/usr.bin/stat/stat.c
  user/lstewart/alq_varlen_8.x/usr.bin/tar/Makefile
  user/lstewart/alq_varlen_8.x/usr.bin/tar/bsdtar.1
  user/lstewart/alq_varlen_8.x/usr.bin/tar/bsdtar.c
  user/lstewart/alq_varlen_8.x/usr.bin/tar/bsdtar.h
  user/lstewart/alq_varlen_8.x/usr.bin/tar/bsdtar_platform.h
  user/lstewart/alq_varlen_8.x/usr.bin/tar/config_freebsd.h
  user/lstewart/alq_varlen_8.x/usr.bin/tar/subst.c
  user/lstewart/alq_varlen_8.x/usr.bin/tar/test/Makefile
  user/lstewart/alq_varlen_8.x/usr.bin/tar/test/main.c
  user/lstewart/alq_varlen_8.x/usr.bin/tar/tree.c
  user/lstewart/alq_varlen_8.x/usr.bin/tar/tree.h
  user/lstewart/alq_varlen_8.x/usr.bin/tar/util.c
  user/lstewart/alq_varlen_8.x/usr.bin/tar/write.c
  user/lstewart/alq_varlen_8.x/usr.bin/top/machine.c
  user/lstewart/alq_varlen_8.x/usr.bin/truss/extern.h
  user/lstewart/alq_varlen_8.x/usr.bin/truss/main.c
  user/lstewart/alq_varlen_8.x/usr.bin/truss/truss.1
  user/lstewart/alq_varlen_8.x/usr.bin/usbhidaction/usbhidaction.c
  user/lstewart/alq_varlen_8.x/usr.bin/usbhidctl/usbhid.c
  user/lstewart/alq_varlen_8.x/usr.bin/vmstat/vmstat.c
  user/lstewart/alq_varlen_8.x/usr.bin/wc/wc.1
  user/lstewart/alq_varlen_8.x/usr.bin/wc/wc.c
  user/lstewart/alq_varlen_8.x/usr.bin/window/wwend.c
  user/lstewart/alq_varlen_8.x/usr.sbin/Makefile
  user/lstewart/alq_varlen_8.x/usr.sbin/arp/arp.8
  user/lstewart/alq_varlen_8.x/usr.sbin/arp/arp.c
  user/lstewart/alq_varlen_8.x/usr.sbin/audit/Makefile
  user/lstewart/alq_varlen_8.x/usr.sbin/auditd/Makefile
  user/lstewart/alq_varlen_8.x/usr.sbin/bluetooth/Makefile
  user/lstewart/alq_varlen_8.x/usr.sbin/bluetooth/hcsecd/hcsecd.c
  user/lstewart/alq_varlen_8.x/usr.sbin/bluetooth/hcseriald/hcseriald.c
  user/lstewart/alq_varlen_8.x/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c
  user/lstewart/alq_varlen_8.x/usr.sbin/bluetooth/sdpd/sd.c
  user/lstewart/alq_varlen_8.x/usr.sbin/boot0cfg/boot0cfg.8
  user/lstewart/alq_varlen_8.x/usr.sbin/boot0cfg/boot0cfg.c
  user/lstewart/alq_varlen_8.x/usr.sbin/burncd/Makefile
  user/lstewart/alq_varlen_8.x/usr.sbin/burncd/burncd.c
  user/lstewart/alq_varlen_8.x/usr.sbin/ckdist/ckdist.c
  user/lstewart/alq_varlen_8.x/usr.sbin/config/config.5
  user/lstewart/alq_varlen_8.x/usr.sbin/config/config.8
  user/lstewart/alq_varlen_8.x/usr.sbin/config/config.h
  user/lstewart/alq_varlen_8.x/usr.sbin/config/config.y
  user/lstewart/alq_varlen_8.x/usr.sbin/config/configvers.h
  user/lstewart/alq_varlen_8.x/usr.sbin/config/lang.l
  user/lstewart/alq_varlen_8.x/usr.sbin/config/main.c
  user/lstewart/alq_varlen_8.x/usr.sbin/config/mkmakefile.c
  user/lstewart/alq_varlen_8.x/usr.sbin/cpucontrol/cpucontrol.8
  user/lstewart/alq_varlen_8.x/usr.sbin/cron/cron/cron.h
  user/lstewart/alq_varlen_8.x/usr.sbin/cron/crontab/Makefile
  user/lstewart/alq_varlen_8.x/usr.sbin/cron/crontab/crontab.5
  user/lstewart/alq_varlen_8.x/usr.sbin/cron/crontab/crontab.c
  user/lstewart/alq_varlen_8.x/usr.sbin/cron/lib/Makefile
  user/lstewart/alq_varlen_8.x/usr.sbin/cron/lib/entry.c
  user/lstewart/alq_varlen_8.x/usr.sbin/cron/lib/misc.c
  user/lstewart/alq_varlen_8.x/usr.sbin/crunch/crunchgen/crunchgen.c
  user/lstewart/alq_varlen_8.x/usr.sbin/fifolog/lib/fifolog_int.c
  user/lstewart/alq_varlen_8.x/usr.sbin/fifolog/lib/fifolog_reader.c
  user/lstewart/alq_varlen_8.x/usr.sbin/fifolog/lib/fifolog_write_poll.c
  user/lstewart/alq_varlen_8.x/usr.sbin/fwcontrol/fwcontrol.c
  user/lstewart/alq_varlen_8.x/usr.sbin/fwcontrol/fwdv.c
  user/lstewart/alq_varlen_8.x/usr.sbin/fwcontrol/fwmpegts.c
  user/lstewart/alq_varlen_8.x/usr.sbin/ifmcstat/ifmcstat.8
  user/lstewart/alq_varlen_8.x/usr.sbin/ifmcstat/ifmcstat.c
  user/lstewart/alq_varlen_8.x/usr.sbin/inetd/inetd.c
  user/lstewart/alq_varlen_8.x/usr.sbin/jail/Makefile
  user/lstewart/alq_varlen_8.x/usr.sbin/jail/jail.8
  user/lstewart/alq_varlen_8.x/usr.sbin/jail/jail.c
  user/lstewart/alq_varlen_8.x/usr.sbin/jexec/Makefile
  user/lstewart/alq_varlen_8.x/usr.sbin/jexec/jexec.8
  user/lstewart/alq_varlen_8.x/usr.sbin/jexec/jexec.c
  user/lstewart/alq_varlen_8.x/usr.sbin/jls/Makefile
  user/lstewart/alq_varlen_8.x/usr.sbin/jls/jls.8
  user/lstewart/alq_varlen_8.x/usr.sbin/jls/jls.c
  user/lstewart/alq_varlen_8.x/usr.sbin/kldxref/ef_i386.c
  user/lstewart/alq_varlen_8.x/usr.sbin/kldxref/ef_obj.c
  user/lstewart/alq_varlen_8.x/usr.sbin/kldxref/fileformat
  user/lstewart/alq_varlen_8.x/usr.sbin/kldxref/kldxref.c
  user/lstewart/alq_varlen_8.x/usr.sbin/mergemaster/mergemaster.8
  user/lstewart/alq_varlen_8.x/usr.sbin/mergemaster/mergemaster.sh
  user/lstewart/alq_varlen_8.x/usr.sbin/mld6query/mld6query.8
  user/lstewart/alq_varlen_8.x/usr.sbin/mountd/exports.5
  user/lstewart/alq_varlen_8.x/usr.sbin/mountd/mountd.c
  user/lstewart/alq_varlen_8.x/usr.sbin/mtree/create.c
  user/lstewart/alq_varlen_8.x/usr.sbin/mtree/mtree.5
  user/lstewart/alq_varlen_8.x/usr.sbin/mtree/mtree.8
  user/lstewart/alq_varlen_8.x/usr.sbin/mtree/spec.c
  user/lstewart/alq_varlen_8.x/usr.sbin/ndiscvt/inf.c
  user/lstewart/alq_varlen_8.x/usr.sbin/ndiscvt/windrv_stub.c
  user/lstewart/alq_varlen_8.x/usr.sbin/ndp/ndp.c
  user/lstewart/alq_varlen_8.x/usr.sbin/nfsd/nfsd.c
  user/lstewart/alq_varlen_8.x/usr.sbin/nscd/agents/group.c
  user/lstewart/alq_varlen_8.x/usr.sbin/nscd/agents/passwd.c
  user/lstewart/alq_varlen_8.x/usr.sbin/nscd/agents/services.c
  user/lstewart/alq_varlen_8.x/usr.sbin/nscd/cachelib.c
  user/lstewart/alq_varlen_8.x/usr.sbin/nscd/nscd.c
  user/lstewart/alq_varlen_8.x/usr.sbin/nscd/nscd.conf.5
  user/lstewart/alq_varlen_8.x/usr.sbin/nscd/nscdcli.c
  user/lstewart/alq_varlen_8.x/usr.sbin/ntp/doc/ntp-keygen.8
  user/lstewart/alq_varlen_8.x/usr.sbin/pciconf/cap.c
  user/lstewart/alq_varlen_8.x/usr.sbin/pciconf/pciconf.8
  user/lstewart/alq_varlen_8.x/usr.sbin/pciconf/pciconf.c
  user/lstewart/alq_varlen_8.x/usr.sbin/pkg_install/add/main.c
  user/lstewart/alq_varlen_8.x/usr.sbin/pkg_install/add/pkg_add.1
  user/lstewart/alq_varlen_8.x/usr.sbin/pkg_install/lib/lib.h
  user/lstewart/alq_varlen_8.x/usr.sbin/pmccontrol/pmccontrol.8
  user/lstewart/alq_varlen_8.x/usr.sbin/pmccontrol/pmccontrol.c
  user/lstewart/alq_varlen_8.x/usr.sbin/pmcstat/pmcstat.8
  user/lstewart/alq_varlen_8.x/usr.sbin/pmcstat/pmcstat.c
  user/lstewart/alq_varlen_8.x/usr.sbin/pmcstat/pmcstat.h
  user/lstewart/alq_varlen_8.x/usr.sbin/pmcstat/pmcstat_log.c
  user/lstewart/alq_varlen_8.x/usr.sbin/powerd/powerd.8
  user/lstewart/alq_varlen_8.x/usr.sbin/powerd/powerd.c
  user/lstewart/alq_varlen_8.x/usr.sbin/ppp/route.c
  user/lstewart/alq_varlen_8.x/usr.sbin/pstat/pstat.8
  user/lstewart/alq_varlen_8.x/usr.sbin/pstat/pstat.c
  user/lstewart/alq_varlen_8.x/usr.sbin/route6d/route6d.c
  user/lstewart/alq_varlen_8.x/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
  user/lstewart/alq_varlen_8.x/usr.sbin/rrenumd/rrenumd.8
  user/lstewart/alq_varlen_8.x/usr.sbin/rtadvd/rtadvd.8
  user/lstewart/alq_varlen_8.x/usr.sbin/rtsold/rtsold.8
  user/lstewart/alq_varlen_8.x/usr.sbin/sade/disks.c
  user/lstewart/alq_varlen_8.x/usr.sbin/sysinstall/Makefile
  user/lstewart/alq_varlen_8.x/usr.sbin/sysinstall/cdrom.c
  user/lstewart/alq_varlen_8.x/usr.sbin/sysinstall/config.c
  user/lstewart/alq_varlen_8.x/usr.sbin/sysinstall/devices.c
  user/lstewart/alq_varlen_8.x/usr.sbin/sysinstall/disks.c
  user/lstewart/alq_varlen_8.x/usr.sbin/sysinstall/dispatch.c
  user/lstewart/alq_varlen_8.x/usr.sbin/sysinstall/dist.c
  user/lstewart/alq_varlen_8.x/usr.sbin/sysinstall/dist.h
  user/lstewart/alq_varlen_8.x/usr.sbin/sysinstall/install.c
  user/lstewart/alq_varlen_8.x/usr.sbin/sysinstall/label.c
  user/lstewart/alq_varlen_8.x/usr.sbin/sysinstall/main.c
  user/lstewart/alq_varlen_8.x/usr.sbin/sysinstall/media.c
  user/lstewart/alq_varlen_8.x/usr.sbin/sysinstall/menus.c
  user/lstewart/alq_varlen_8.x/usr.sbin/sysinstall/options.c
  user/lstewart/alq_varlen_8.x/usr.sbin/sysinstall/package.c
  user/lstewart/alq_varlen_8.x/usr.sbin/sysinstall/sysinstall.8
  user/lstewart/alq_varlen_8.x/usr.sbin/sysinstall/sysinstall.h
  user/lstewart/alq_varlen_8.x/usr.sbin/sysinstall/system.c
  user/lstewart/alq_varlen_8.x/usr.sbin/sysinstall/tcpip.c
  user/lstewart/alq_varlen_8.x/usr.sbin/sysinstall/user.c
  user/lstewart/alq_varlen_8.x/usr.sbin/syslogd/Makefile
  user/lstewart/alq_varlen_8.x/usr.sbin/syslogd/syslog.conf.5
  user/lstewart/alq_varlen_8.x/usr.sbin/syslogd/syslogd.8
  user/lstewart/alq_varlen_8.x/usr.sbin/syslogd/syslogd.c
  user/lstewart/alq_varlen_8.x/usr.sbin/traceroute6/traceroute6.8
  user/lstewart/alq_varlen_8.x/usr.sbin/ugidfw/ugidfw.c
  user/lstewart/alq_varlen_8.x/usr.sbin/usbdevs/usbdevs.c
  user/lstewart/alq_varlen_8.x/usr.sbin/wlandebug/wlandebug.c
  user/lstewart/alq_varlen_8.x/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5
  user/lstewart/alq_varlen_8.x/usr.sbin/zic/   (props changed)
  user/lstewart/alq_varlen_8.x/usr.sbin/zic/zic.8

Modified: user/lstewart/alq_varlen_8.x/COPYRIGHT
==============================================================================
--- user/lstewart/alq_varlen_8.x/COPYRIGHT	Wed Feb 18 06:43:03 2009	(r188747)
+++ user/lstewart/alq_varlen_8.x/COPYRIGHT	Wed Feb 18 07:09:47 2009	(r188748)
@@ -4,7 +4,7 @@
 The compilation of software known as FreeBSD is distributed under the
 following terms:
 
-Copyright (C) 1992-2008 The FreeBSD Project. All rights reserved.
+Copyright (c) 1992-2009 The FreeBSD Project. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -15,10 +15,10 @@ are met:
    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 AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+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 AUTHOR OR CONTRIBUTORS BE LIABLE
+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)

Modified: user/lstewart/alq_varlen_8.x/Makefile
==============================================================================
--- user/lstewart/alq_varlen_8.x/Makefile	Wed Feb 18 06:43:03 2009	(r188747)
+++ user/lstewart/alq_varlen_8.x/Makefile	Wed Feb 18 07:09:47 2009	(r188748)
@@ -267,6 +267,10 @@ make: .PHONY
 		${MMAKE} all && \
 		${MMAKE} install DESTDIR=${MAKEPATH} BINDIR=
 
+tinderbox:
+	cd ${.CURDIR} && \
+		DOING_TINDERBOX=YES ${MAKE} ${JFLAG} universe
+
 #
 # universe
 #
@@ -274,17 +278,27 @@ make: .PHONY
 # with a reasonable chance of success, regardless of how old your
 # existing system is.
 #
-.if make(universe)
+.if make(universe) || make(tinderbox)
 TARGETS?=amd64 arm i386 ia64 pc98 powerpc sparc64 sun4v
 
+.if defined(DOING_TINDERBOX)
+FAILFILE=tinderbox.failed
+MAKEFAIL=tee -a ${FAILFILE}
+.else
+MAKEFAIL=cat
+.endif
+
 universe: universe_prologue
 universe_prologue:
 	@echo "--------------------------------------------------------------"
 	@echo ">>> make universe started on ${STARTTIME}"
 	@echo "--------------------------------------------------------------"
+.if defined(DOING_TINDERBOX)
+	rm -f ${FAILFILE}
+.endif
 .for target in ${TARGETS}
 KERNCONFS!=	cd ${.CURDIR}/sys/${target}/conf && \
-		find [A-Z]*[A-Z] -type f -maxdepth 0 \
+		find [A-Z0-9]*[A-Z0-9] -type f -maxdepth 0 \
 		! -name DEFAULTS ! -name LINT
 KERNCONFS:=	${KERNCONFS:S/^NOTES$/LINT/}
 universe: universe_${target}
@@ -292,22 +306,28 @@ universe: universe_${target}
 universe_${target}:
 .if !defined(MAKE_JUST_KERNELS)
 	@echo ">> ${target} started on `LC_ALL=C date`"
-	-cd ${.CURDIR} && ${MAKE} ${JFLAG} buildworld \
+	@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
+	    ${MAKE} ${JFLAG} buildworld \
 	    TARGET=${target} \
-	    __MAKE_CONF=/dev/null \
-	    > _.${target}.buildworld 2>&1
+	    > _.${target}.buildworld 2>&1 || \
+	    (echo "${target} world failed," \
+	    "check _.${target}.buildworld for details" | ${MAKEFAIL}))
 	@echo ">> ${target} buildworld completed on `LC_ALL=C date`"
 .endif
 .if exists(${.CURDIR}/sys/${target}/conf/NOTES)
-	-cd ${.CURDIR}/sys/${target}/conf && ${MAKE} LINT \
-	    > ${.CURDIR}/_.${target}.makeLINT 2>&1
+	@(cd ${.CURDIR}/sys/${target}/conf && env __MAKE_CONF=/dev/null \
+	    ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
+	    (echo "${target} 'make LINT' failed," \
+	    "check _.${target}.makeLINT for details"| ${MAKEFAIL}))
 .endif
 .for kernel in ${KERNCONFS}
-	-cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernel \
+	@(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \
+	    ${MAKE} ${JFLAG} buildkernel \
 	    TARGET=${target} \
 	    KERNCONF=${kernel} \
-	    __MAKE_CONF=/dev/null \
-	    > _.${target}.${kernel} 2>&1
+	    > _.${target}.${kernel} 2>&1 || \
+	    (echo "${target} ${kernel} kernel failed," \
+	    "check _.${target}.${kernel} for details"| ${MAKEFAIL}))
 .endfor
 	@echo ">> ${target} completed on `LC_ALL=C date`"
 .endfor
@@ -317,4 +337,11 @@ universe_epilogue:
 	@echo ">>> make universe completed on `LC_ALL=C date`"
 	@echo "                      (started ${STARTTIME})"
 	@echo "--------------------------------------------------------------"
+.if defined(DOING_TINDERBOX)
+	@if [ -e ${FAILFILE} ] ; then \
+		echo "Tinderbox failed:" ;\
+		cat ${FAILFILE} ;\
+		exit 1 ;\
+	fi
+.endif
 .endif

Modified: user/lstewart/alq_varlen_8.x/Makefile.inc1
==============================================================================
--- user/lstewart/alq_varlen_8.x/Makefile.inc1	Wed Feb 18 06:43:03 2009	(r188747)
+++ user/lstewart/alq_varlen_8.x/Makefile.inc1	Wed Feb 18 07:09:47 2009	(r188748)
@@ -5,6 +5,7 @@
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
 #	-DNO_CLEAN do not clean at all
 #	-DNO_SHARE do not go into share subdir
+#	-DKERNFAST define NO_KERNELCONFIG, NO_KERNELCLEAN and NO_KERNELCONFIG
 #	-DNO_KERNELCONFIG do not run config in ${MAKE} buildkernel
 #	-DNO_KERNELCLEAN do not run ${MAKE} clean in ${MAKE} buildkernel
 #	-DNO_KERNELDEPEND do not run ${MAKE} depend in ${MAKE} buildkernel
@@ -506,6 +507,9 @@ distribute32 install32:
 .if ${MK_CRYPT} != "no"
 	cd ${.CURDIR}/secure/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
 .endif
+.if ${MK_KERBEROS} != "no"
+	cd ${.CURDIR}/kerberos5/lib; ${LIB32IMAKE} ${.TARGET:S/32$//}
+.endif
 	cd ${.CURDIR}/libexec/rtld-elf; \
 	    PROG=ld-elf32.so.1 ${LIB32IMAKE} ${.TARGET:S/32$//}
 	cd ${.CURDIR}/usr.bin/ldd; PROG=ldd32 ${LIB32IMAKE} ${.TARGET:S/32$//}
@@ -694,6 +698,15 @@ distrib-dirs distribution:
 # be set to cross-build, we have to make sure TARGET is set
 # properly.
 
+.if defined(KERNFAST)
+NO_KERNELCLEAN=	t
+NO_KERNELCONFIG=	t
+NO_KERNELDEPEND=	t
+# Shortcut for KERNCONF=Blah -DKERNFAST is now KERNFAST=Blah
+.if !defined(KERNCONF) && ${KERNFAST} != "1"
+KERNCONF=${KERNFAST}
+.endif
+.endif
 .if !defined(KERNCONF) && defined(KERNEL)
 KERNCONF=	${KERNEL}
 KERNWARN=

Modified: user/lstewart/alq_varlen_8.x/ObsoleteFiles.inc
==============================================================================
--- user/lstewart/alq_varlen_8.x/ObsoleteFiles.inc	Wed Feb 18 06:43:03 2009	(r188747)
+++ user/lstewart/alq_varlen_8.x/ObsoleteFiles.inc	Wed Feb 18 07:09:47 2009	(r188748)
@@ -14,6 +14,26 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20090203: removal of pccard header files
+OLD_FILES+=usr/include/pccard/cardinfo.h
+OLD_FILES+=usr/include/pccard/cis.h
+OLD_DIRS+=usr/include/pccard
+# 20090203: adding_user.8 moved to adding_user.7
+OLD_FILES+=usr/share/man/man8/adding_user.8.gz
+# 20090122: tzdata2009a import
+OLD_FILES+=usr/share/zoneinfo/Asia/Katmandu
+# 20090102: file 4.26 import
+OLD_FILES+=usr/share/misc/magic.mime
+OLD_FILES+=usr/share/misc/magic.mime.mgc
+# 20081223: bind 9.4.3 import, nsupdate.8 moved to nsupdate.1
+OLD_FILES+=usr/share/man/man8/nsupdate.8.gz
+# 20081223: ipprotosw.h removed
+OLD_FILES+=usr/include/netinet/ipprotosw.h
+# 20081123: vfs_mountedon.9 removed
+OLD_FILES+=usr/share/man/man9/vfs_mountedon.9.gz
+# 20081023: FREE.9 and MALLOC.9 removed
+OLD_FILES+=usr/share/man/man9/FREE.9.gz
+OLD_FILES+=usr/share/man/man9/MALLOC.9.gz
 # 20080928: removal of inaccurate device_ids(9) manual page
 OLD_FILES+=usr/share/man/man9/device_ids.9.gz
 OLD_FILES+=usr/share/man/man9/major.9.gz
@@ -1654,7 +1674,7 @@ OLD_FILES+=usr/lib/libpam_ssh.a
 OLD_FILES+=usr/lib/libpam_ssh_p.a
 OLD_FILES+=usr/bin/help
 OLD_FILES+=usr/bin/sccs
-.if ${TARGET_ARCH} != "i386"
+.if ${TARGET_ARCH} != "arm" && ${TARGET_ARCH} != "i386"
 OLD_FILES+=usr/bin/gdbserver
 .endif
 OLD_FILES+=usr/bin/ssh-keysign

Modified: user/lstewart/alq_varlen_8.x/UPDATING
==============================================================================
--- user/lstewart/alq_varlen_8.x/UPDATING	Wed Feb 18 06:43:03 2009	(r188747)
+++ user/lstewart/alq_varlen_8.x/UPDATING	Wed Feb 18 07:09:47 2009	(r188748)
@@ -22,6 +22,102 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+20090216:
+	xorg 7.4 wants to configure its input devices via hald which does not
+	yet work with USB2. If the keyboard/mouse does not work in xorg then
+	add
+		Option "AllowEmptyInput" "off"
+	to your ServerLayout section.  This will cause X to use the configured
+	kbd and mouse sections from your xorg.conf
+
+20090215:
+	The GENERIC kernels for all architectures now default to the new USB2
+	stack. No kernel config options or code have been removed so if a
+	problem arises please report it and optionally revert to the old USB
+	stack. If you are loading USB kernel modules or have a custom kernel
+	that includes GENERIC then ensure that usb names are also changed over,
+	eg uftdi -> usb2_serial_ftdi
+
+20090203:
+	The ichsmb(4) driver has been changed to require SMBus slave
+	addresses be left-justified (xxxxxxx0b) rather than right-justified.
+	All of the other SMBus controller drivers require left-justified
+	slave addresses, so this change makes all the drivers provide the
+	same interface.
+
+20090201:
+	INET6 statistics (struct ip6stat) was updated.
+	netstat(1) needs to be recompiled.
+
+20090119:
+	NTFS has been removed from GENERIC kernel on amd64 to match
+	GENERIC on i386. Should not cause any issues since mount_ntfs(8)
+	will load ntfs.ko module automatically when NTFS support is
+	actually needed, unless ntfs.ko is not installed or security
+	level prohibits loading kernel modules. If either is the case,
+	"options NTFS" has to be added into kernel config.
+
+20090115:
+	TCP Appropriate Byte Counting (RFC 3465) support added to kernel.
+	New field in struct tcpcb breaks ABI, so bump __FreeBSD_version to
+	800061. User space tools that rely on the size of struct tcpcb in
+	tcp_var.h (e.g. sockstat) need to be recompiled.
+
+20081225:
+	ng_tty(4) module updated to match the new TTY subsystem.
+	Due to API change, user-level applications must be updated.
+	New API support added to mpd5 CVS and expected to be present
+	in next mpd5.3 release.
+
+20081219:
+	With __FreeBSD_version 800060 the makefs tool is part of
+	the base system (it was a port).
+
+20081216:
+	The afdata and ifnet locks have been changed from mutexes to 
+	rwlocks, network modules will need to be re-compiled.
+
+20081214:
+	__FreeBSD_version 800059 incorporates the new arp-v2 rewrite.
+	RTF_CLONING, RTF_LLINFO and RTF_WASCLONED flags are eliminated.
+	The new code reduced struct rtentry{} by 16 bytes on 32-bit 
+	architecture and 40 bytes on 64-bit architecture. The userland
+	applications "arp" and "ndp" have been updated accordingly.
+	The output from "netstat -r" shows only routing entries and
+	none of the L2 information.
+
+20081130:
+	__FreeBSD_version 800057 marks the switchover from the
+	binary ath hal to source code. Users must add the line:
+
+	options	AH_SUPPORT_AR5416
+
+	to their kernel config files when specifying:
+
+	device	ath_hal
+
+	The ath_hal module no longer exists; the code is now compiled
+	together with the driver in the ath module.  It is now
+	possible to tailor chip support (i.e. reduce the set of chips
+	and thereby the code size); consult ath_hal(4) for details.
+
+20081121:
+	__FreeBSD_version 800054 adds memory barriers to
+	<machine/atomic.h>, new interfaces to ifnet to facilitate
+	multiple hardware transmit queues for cards that support
+	them, and a lock-less ring-buffer implementation to
+	enable drivers to more efficiently manage queueing of
+	packets.
+
+20081117:
+	A new version of ZFS (version 13) has been merged to -HEAD.
+	This version has zpool attribute "listsnapshots" off by
+	default, which means "zfs list" does not show snapshots,
+	and is the same as Solaris behavior.
+
+20081028:
+	dummynet(4) ABI has changed. ipfw(8) needs to be recompiled.
+
 20081009:
 	The uhci, ohci, ehci and slhci USB Host controller drivers have
 	been put into separate modules. If you load the usb module
@@ -255,11 +351,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	be recompiled; this includes the hal and xorg-server ports.
 
 20070928:
-        The caching daemon (cached) was renamed to nscd. nscd.conf
-        configuration file should be used instead of cached.conf and
-        nscd_enable, nscd_pidfile and nscd_flags options should be used
-        instead of cached_enable, cached_pidfile and cached_flags in
-        rc.conf.
+	The caching daemon (cached) was renamed to nscd. nscd.conf
+	configuration file should be used instead of cached.conf and
+	nscd_enable, nscd_pidfile and nscd_flags options should be used
+	instead of cached_enable, cached_pidfile and cached_flags in
+	rc.conf.
 
 20070921:
 	The getfacl(1) utility now prints owning user and group name
@@ -267,7 +363,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	This is the same behavior as getfacl(1) on Solaris and Linux.
 
 20070704:
-        The new IPsec code is now compiled in using the IPSEC option.  The
+	The new IPsec code is now compiled in using the IPSEC option.  The
 	IPSEC option now requires "device crypto" be defined in your kernel
 	configuration.  The FAST_IPSEC kernel option is now deprecated.
 
@@ -570,10 +666,10 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	If you have such a file, you need old utility to decrypt it.
 
 20060709:
- 	The interface version of the i4b kernel part has changed. So
- 	after updating the kernel sources and compiling a new kernel,
- 	the i4b user space tools in "/usr/src/usr.sbin/i4b" must also
- 	be rebuilt, and vice versa.
+	The interface version of the i4b kernel part has changed. So
+	after updating the kernel sources and compiling a new kernel,
+	the i4b user space tools in "/usr/src/usr.sbin/i4b" must also
+	be rebuilt, and vice versa.
 
 20060627:
 	The XBOX kernel now defaults to the nfe(4) driver instead of
@@ -1039,7 +1135,7 @@ COMMON ITEMS:
 	<reboot into current>
 	<do a "native" rebuild/install as described in the previous section>
 	<maybe install compatibility libraries from ports/misc/compat*>
- 	<reboot>
+	<reboot>
 
 
 	To upgrade in-place from 5.x-stable to current

Modified: user/lstewart/alq_varlen_8.x/bin/cat/cat.c
==============================================================================
--- user/lstewart/alq_varlen_8.x/bin/cat/cat.c	Wed Feb 18 06:43:03 2009	(r188747)
+++ user/lstewart/alq_varlen_8.x/bin/cat/cat.c	Wed Feb 18 07:09:47 2009	(r188748)
@@ -77,6 +77,17 @@ static void raw_cat(int);
 static int udom_open(const char *path, int flags);
 #endif
 
+/* Memory strategy threshold, in pages: if physmem is larger then this, use a 
+ * large buffer */
+#define PHYSPAGES_THRESHOLD (32*1024)
+
+/* Maximum buffer size in bytes - do not allow it to grow larger than this */
+#define BUFSIZE_MAX (2*1024*1024)
+
+/* Small (default) buffer size in bytes. It's inefficient for this to be
+ * smaller than MAXPHYS */
+#define BUFSIZE_SMALL (MAXPHYS)
+
 int
 main(int argc, char *argv[])
 {
@@ -247,9 +258,17 @@ raw_cat(int rfd)
 	if (buf == NULL) {
 		if (fstat(wfd, &sbuf))
 			err(1, "%s", filename);
-		bsize = MAX(sbuf.st_blksize, 1024);
+		if (S_ISREG(sbuf.st_mode)) {
+			/* If there's plenty of RAM, use a large copy buffer */
+			if (sysconf(_SC_PHYS_PAGES) > PHYSPAGES_THRESHOLD)
+				bsize = MIN(BUFSIZE_MAX, MAXPHYS*8);
+			else
+				bsize = BUFSIZE_SMALL;
+		} else
+			bsize = MAX(sbuf.st_blksize, 
+					(blksize_t)sysconf(_SC_PAGESIZE));
 		if ((buf = malloc(bsize)) == NULL)
-			err(1, "buffer");
+			err(1, "malloc() failure of IO buffer");
 	}
 	while ((nr = read(rfd, buf, bsize)) > 0)
 		for (off = 0; nr; nr -= nw, off += nw)

Modified: user/lstewart/alq_varlen_8.x/bin/chio/chio.c
==============================================================================
--- user/lstewart/alq_varlen_8.x/bin/chio/chio.c	Wed Feb 18 06:43:03 2009	(r188747)
+++ user/lstewart/alq_varlen_8.x/bin/chio/chio.c	Wed Feb 18 07:09:47 2009	(r188748)
@@ -69,7 +69,7 @@ static	const char *bits_to_string(ces_st
 
 static	void find_element(char *, uint16_t *, uint16_t *);
 static	struct changer_element_status *get_element_status
-	   (unsigned int, unsigned int);
+	   (unsigned int, unsigned int, int);
 
 static	int do_move(const char *, int, char **);
 static	int do_exchange(const char *, int, char **);
@@ -969,7 +969,8 @@ do_return(const char *cname, int argc, c
 	++argv; --argc;
 
 	/* Get the status */
-	ces = get_element_status((unsigned int)type, (unsigned int)element);
+	ces = get_element_status((unsigned int)type, (unsigned int)element,
+	    CHET_VT == type);
 
 	if (NULL == ces)
 		errx(1, "%s: null element status pointer", cname);
@@ -1004,7 +1005,7 @@ usage:
  * should free() it when done.
  */
 static struct changer_element_status *
-get_element_status(unsigned int type, unsigned int element)
+get_element_status(unsigned int type, unsigned int element, int use_voltags)
 {
 	struct changer_element_status_request cesr;
 	struct changer_element_status *ces;
@@ -1020,7 +1021,8 @@ get_element_status(unsigned int type, un
 	cesr.cesr_element_type = (uint16_t)type;
 	cesr.cesr_element_base = (uint16_t)element;
 	cesr.cesr_element_count = 1;		/* Only this one element */
-	cesr.cesr_flags |= CESR_VOLTAGS;	/* Grab voltags as well */
+	if (use_voltags)
+		cesr.cesr_flags |= CESR_VOLTAGS; /* Grab voltags as well */
 	cesr.cesr_element_status = ces;
 
 	if (ioctl(changer_fd, CHIOGSTATUS, (char *)&cesr) == -1) {

Modified: user/lstewart/alq_varlen_8.x/bin/chmod/chmod.1
==============================================================================
--- user/lstewart/alq_varlen_8.x/bin/chmod/chmod.1	Wed Feb 18 06:43:03 2009	(r188747)
+++ user/lstewart/alq_varlen_8.x/bin/chmod/chmod.1	Wed Feb 18 07:09:47 2009	(r188748)
@@ -32,7 +32,7 @@
 .\"	@(#)chmod.1	8.4 (Berkeley) 3/31/94
 .\" $FreeBSD$
 .\"
-.Dd December 22, 2006
+.Dd January 26, 2009
 .Dt CHMOD 1
 .Os
 .Sh NAME
@@ -281,6 +281,10 @@ Operations upon the other permissions on
 ``o'' by itself), in combination with the
 .Ar perm
 symbols ``s'' or ``t'', are ignored.
+.Pp
+The ``w'' permission on directories will permit file creation, relocation,
+and copy into that directory.
+Files created within the directory itself will inherit its group ID.
 .Sh EXAMPLES
 .Bl -tag -width "u=rwx,go=u-w" -compact
 .It Li 644
@@ -343,4 +347,4 @@ command appeared in
 .Sh BUGS
 There is no
 .Ar perm
-option for the naughty bits.
+option for the naughty bits of a horse.

Modified: user/lstewart/alq_varlen_8.x/bin/cp/utils.c
==============================================================================
--- user/lstewart/alq_varlen_8.x/bin/cp/utils.c	Wed Feb 18 06:43:03 2009	(r188747)
+++ user/lstewart/alq_varlen_8.x/bin/cp/utils.c	Wed Feb 18 07:09:47 2009	(r188748)
@@ -57,10 +57,22 @@ __FBSDID("$FreeBSD$");
 
 #define	cp_pct(x, y)	((y == 0) ? 0 : (int)(100.0 * (x) / (y)))
 
+/* Memory strategy threshold, in pages: if physmem is larger then this, use a 
+ * large buffer */
+#define PHYSPAGES_THRESHOLD (32*1024)
+
+/* Maximum buffer size in bytes - do not allow it to grow larger than this */
+#define BUFSIZE_MAX (2*1024*1024)
+
+/* Small (default) buffer size in bytes. It's inefficient for this to be
+ * smaller than MAXPHYS */
+#define BUFSIZE_SMALL (MAXPHYS)
+
 int
 copy_file(const FTSENT *entp, int dne)
 {
-	static char buf[MAXBSIZE];
+	static char *buf = NULL;
+	static size_t bufsize;
 	struct stat *fs;
 	ssize_t wcount;
 	size_t wresid;
@@ -137,47 +149,60 @@ copy_file(const FTSENT *entp, int dne)
 		 * Mmap and write if less than 8M (the limit is so we don't totally
 		 * trash memory on big files.  This is really a minor hack, but it
 		 * wins some CPU back.
+		 * Some filesystems, such as smbnetfs, don't support mmap,
+		 * so this is a best-effort attempt.
 		 */
 #ifdef VM_AND_BUFFER_CACHE_SYNCHRONIZED
 		if (S_ISREG(fs->st_mode) && fs->st_size > 0 &&
-	    	fs->st_size <= 8 * 1048576) {
-			if ((p = mmap(NULL, (size_t)fs->st_size, PROT_READ,
-		    	MAP_SHARED, from_fd, (off_t)0)) == MAP_FAILED) {
+	    	    fs->st_size <= 8 * 1024 * 1024 &&
+		    (p = mmap(NULL, (size_t)fs->st_size, PROT_READ,
+		    MAP_SHARED, from_fd, (off_t)0)) != MAP_FAILED) {
+			wtotal = 0;
+			for (bufp = p, wresid = fs->st_size; ;
+			bufp += wcount, wresid -= (size_t)wcount) {
+				wcount = write(to_fd, bufp, wresid);
+				if (wcount <= 0)
+					break;
+				wtotal += wcount;
+				if (info) {
+					info = 0;
+					(void)fprintf(stderr,
+					    "%s -> %s %3d%%\n",
+					    entp->fts_path, to.p_path,
+					    cp_pct(wtotal, fs->st_size));
+				}
+				if (wcount >= (ssize_t)wresid)
+					break;
+			}
+			if (wcount != (ssize_t)wresid) {
+				warn("%s", to.p_path);
+				rval = 1;
+			}
+			/* Some systems don't unmap on close(2). */
+			if (munmap(p, fs->st_size) < 0) {
 				warn("%s", entp->fts_path);
 				rval = 1;
-			} else {
-				wtotal = 0;
-				for (bufp = p, wresid = fs->st_size; ;
-			    	bufp += wcount, wresid -= (size_t)wcount) {
-					wcount = write(to_fd, bufp, wresid);
-					if (wcount <= 0)
-						break;
-					wtotal += wcount;
-					if (info) {
-						info = 0;
-						(void)fprintf(stderr,
-						    "%s -> %s %3d%%\n",
-						    entp->fts_path, to.p_path,
-						    cp_pct(wtotal, fs->st_size));
-					}
-					if (wcount >= (ssize_t)wresid)
-						break;
-				}
-				if (wcount != (ssize_t)wresid) {
-					warn("%s", to.p_path);
-					rval = 1;
-				}
-				/* Some systems don't unmap on close(2). */
-				if (munmap(p, fs->st_size) < 0) {
-					warn("%s", entp->fts_path);
-					rval = 1;
-				}
 			}
 		} else
 #endif
 		{
+			if (buf == NULL) {
+				/*
+				 * Note that buf and bufsize are static. If
+				 * malloc() fails, it will fail at the start
+				 * and not copy only some files. 
+				 */ 
+				if (sysconf(_SC_PHYS_PAGES) > 
+				    PHYSPAGES_THRESHOLD)
+					bufsize = MIN(BUFSIZE_MAX, MAXPHYS * 8);
+				else
+					bufsize = BUFSIZE_SMALL;
+				buf = malloc(bufsize);
+				if (buf == NULL)
+					err(1, "Not enough memory");
+			}
 			wtotal = 0;
-			while ((rcount = read(from_fd, buf, MAXBSIZE)) > 0) {
+			while ((rcount = read(from_fd, buf, bufsize)) > 0) {
 				for (bufp = buf, wresid = rcount; ;
 			    	bufp += wcount, wresid -= wcount) {
 					wcount = write(to_fd, bufp, wresid);

Modified: user/lstewart/alq_varlen_8.x/bin/dd/dd.1
==============================================================================
--- user/lstewart/alq_varlen_8.x/bin/dd/dd.1	Wed Feb 18 06:43:03 2009	(r188747)
+++ user/lstewart/alq_varlen_8.x/bin/dd/dd.1	Wed Feb 18 07:09:47 2009	(r188748)
@@ -32,7 +32,7 @@
 .\"     @(#)dd.1	8.2 (Berkeley) 1/13/94
 .\" $FreeBSD$
 .\"
-.Dd August 15, 2004
+.Dd January 23, 2009
 .Dt DD 1
 .Os
 .Sh NAME
@@ -392,6 +392,11 @@ Remove parity bit from a file:
 Check for (even) parity errors on a file:
 .Pp
 .Dl "dd if=file conv=pareven | cmp -x - file"
+.Pp
+To create an image of a Mode-1 CD-ROM, which is a commonly used format
+for data CD-ROM disks, use a block size of 2048 bytes:
+.Pp
+.Dl "dd if=/dev/acd0 of=filename.iso bs=2048"
 .Sh SEE ALSO
 .Xr cp 1 ,
 .Xr mt 1 ,

Modified: user/lstewart/alq_varlen_8.x/bin/df/df.1
==============================================================================
--- user/lstewart/alq_varlen_8.x/bin/df/df.1	Wed Feb 18 06:43:03 2009	(r188747)
+++ user/lstewart/alq_varlen_8.x/bin/df/df.1	Wed Feb 18 07:09:47 2009	(r188748)
@@ -29,7 +29,7 @@
 .\"     @(#)df.1	8.3 (Berkeley) 5/8/95
 .\" $FreeBSD$
 .\"
-.Dd April 22, 2004
+.Dd November 23, 2008
 .Dt DF 1
 .Os
 .Sh NAME
@@ -38,7 +38,7 @@
 .Sh SYNOPSIS
 .Nm
 .Op Fl b | g | H | h | k | m | P
-.Op Fl aciln
+.Op Fl acilnT
 .Op Fl t Ar type
 .Op Ar file | filesystem ...
 .Sh DESCRIPTION
@@ -140,6 +140,8 @@ The
 .Xr lsvfs 1
 command can be used to find out the types of file systems
 that are available on the system.
+.It Fl T
+Include file system type.
 .El
 .Sh ENVIRONMENT
 .Bl -tag -width BLOCKSIZE

Modified: user/lstewart/alq_varlen_8.x/bin/df/df.c
==============================================================================
--- user/lstewart/alq_varlen_8.x/bin/df/df.c	Wed Feb 18 06:43:03 2009	(r188747)
+++ user/lstewart/alq_varlen_8.x/bin/df/df.c	Wed Feb 18 07:09:47 2009	(r188748)
@@ -68,6 +68,7 @@ __FBSDID("$FreeBSD$");
 /* Maximum widths of various fields. */
 struct maxwidths {
 	int	mntfrom;
+	int	fstype;
 	int	total;
 	int	used;
 	int	avail;
@@ -93,7 +94,7 @@ imax(int a, int b)
 	return (a > b ? a : b);
 }
 
-static int	aflag = 0, cflag, hflag, iflag, kflag, lflag = 0, nflag;
+static int	aflag = 0, cflag, hflag, iflag, kflag, lflag = 0, nflag, Tflag;
 static struct	ufs_args mdev;
 
 int
@@ -115,7 +116,7 @@ main(int argc, char *argv[])
 	totalbuf.f_bsize = DEV_BSIZE;
 	strlcpy(totalbuf.f_mntfromname, "total", MNAMELEN);
 	vfslist = NULL;
-	while ((ch = getopt(argc, argv, "abcgHhiklmnPt:")) != -1)
+	while ((ch = getopt(argc, argv, "abcgHhiklmnPt:T")) != -1)
 		switch (ch) {
 		case 'a':
 			aflag = 1;
@@ -176,6 +177,9 @@ main(int argc, char *argv[])
 			fstype = optarg;
 			vfslist = makevfslist(optarg);
 			break;
+		case 'T':
+			Tflag = 1;
+			break;
 		case '?':
 		default:
 			usage();
@@ -391,6 +395,7 @@ prtstat(struct statfs *sfsp, struct maxw
 
 	if (++timesthrough == 1) {
 		mwp->mntfrom = imax(mwp->mntfrom, (int)strlen("Filesystem"));
+		mwp->fstype = imax(mwp->fstype, (int)strlen("Type"));
 		if (hflag) {
 			header = "   Size";
 			mwp->total = mwp->used = mwp->avail =
@@ -402,8 +407,10 @@ prtstat(struct statfs *sfsp, struct maxw
 		mwp->used = imax(mwp->used, (int)strlen("Used"));
 		mwp->avail = imax(mwp->avail, (int)strlen("Avail"));
 
-		(void)printf("%-*s %-*s %*s %*s Capacity",
-		    mwp->mntfrom, "Filesystem", mwp->total, header,
+		(void)printf("%-*s", mwp->mntfrom, "Filesystem");
+		if (Tflag)
+			(void)printf("  %-*s", mwp->fstype, "Type");
+		(void)printf(" %-*s %*s %*s Capacity", mwp->total, header,
 		    mwp->used, "Used", mwp->avail, "Avail");
 		if (iflag) {
 			mwp->iused = imax(mwp->iused, (int)strlen("  iused"));
@@ -414,6 +421,8 @@ prtstat(struct statfs *sfsp, struct maxw
 		(void)printf("  Mounted on\n");
 	}
 	(void)printf("%-*s", mwp->mntfrom, sfsp->f_mntfromname);
+	if (Tflag)
+		(void)printf("  %-*s", mwp->fstype, sfsp->f_fstypename);
 	used = sfsp->f_blocks - sfsp->f_bfree;
 	availblks = sfsp->f_bavail + used;
 	if (hflag) {
@@ -468,6 +477,7 @@ update_maxwidths(struct maxwidths *mwp, 
 		getbsize(&dummy, &blocksize);
 
 	mwp->mntfrom = imax(mwp->mntfrom, (int)strlen(sfsp->f_mntfromname));
+	mwp->fstype = imax(mwp->fstype, (int)strlen(sfsp->f_fstypename));
 	mwp->total = imax(mwp->total, int64width(
 	    fsbtoblk((int64_t)sfsp->f_blocks, sfsp->f_bsize, blocksize)));
 	mwp->used = imax(mwp->used,
@@ -505,7 +515,7 @@ usage(void)
 {
 
 	(void)fprintf(stderr,
-"usage: df [-b | -g | -H | -h | -k | -m | -P] [-aciln] [-t type] [file | filesystem ...]\n");
+"usage: df [-b | -g | -H | -h | -k | -m | -P] [-acilnT] [-t type] [file | filesystem ...]\n");
 	exit(EX_USAGE);
 }
 

Modified: user/lstewart/alq_varlen_8.x/bin/kenv/kenv.1
==============================================================================
--- user/lstewart/alq_varlen_8.x/bin/kenv/kenv.1	Wed Feb 18 06:43:03 2009	(r188747)
+++ user/lstewart/alq_varlen_8.x/bin/kenv/kenv.1	Wed Feb 18 07:09:47 2009	(r188748)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd September 13, 2005
+.Dd January 13, 2009
 .Dt KENV 1
 .Os
 .Sh NAME
@@ -67,8 +67,28 @@ If the
 .Fl q
 option is set, warnings normally printed as a result of being unable to
 perform the requested operation will be suppressed.
+.Pp
+Variables can be added to the kernel environment using the
+.Xr /boot/loader.conf
+file, or also statically compiled into the kernel using the statement
+.Pp
+.Dl Ic env Ar filename
+.Pp
+in the kernel config file.
+The file can contain lines of the form
+.Pp
+.Dl name = "value"  # this is a comment
+.Pp
+where whitespace around name and '=', and
+everything after a '#' character, are ignored.  Almost any printable
+character except '=' is acceptable as part of a name.  Quotes
+are optional and necessary only if the value contains
+whitespace.
+.Pp
 .Sh SEE ALSO
 .Xr kenv 2 ,
+.Xr config 5 ,
+.Xr loader.conf 5 ,
 .Xr loader 8
 .Sh HISTORY
 The

Modified: user/lstewart/alq_varlen_8.x/bin/ln/ln.1
==============================================================================
--- user/lstewart/alq_varlen_8.x/bin/ln/ln.1	Wed Feb 18 06:43:03 2009	(r188747)
+++ user/lstewart/alq_varlen_8.x/bin/ln/ln.1	Wed Feb 18 07:09:47 2009	(r188748)
@@ -38,7 +38,7 @@
 .Sh NAME
 .Nm ln ,
 .Nm link
-.Nd make links
+.Nd link files
 .Sh SYNOPSIS
 .Nm
 .Op Fl s Op Fl F
@@ -57,8 +57,13 @@
 .Sh DESCRIPTION
 The
 .Nm
-utility creates a new directory entry (linked file) which has the
-same modes as the original file.
+utility creates a new directory entry (linked file) for the file name
+specified by
+.Ar target_file .
+The
+.Ar target_file
+will be created with the same file modes as the
+.Ar source_file .
 It is useful for maintaining multiple copies of a file in many places
 at once without using up storage for the
 .Dq copies ;
@@ -148,7 +153,7 @@ links.
 A hard link to a file is indistinguishable from the original directory entry;
 any changes to a file are effectively independent of the name used to reference
 the file.
-Hard links may not normally refer to directories and may not span file systems.
+Directories may not be hardlinked, and hard links may not span file systems.
 .Pp
 A symbolic link contains the name of the file to
 which it is linked.

Modified: user/lstewart/alq_varlen_8.x/bin/pax/file_subs.c
==============================================================================
--- user/lstewart/alq_varlen_8.x/bin/pax/file_subs.c	Wed Feb 18 06:43:03 2009	(r188747)
+++ user/lstewart/alq_varlen_8.x/bin/pax/file_subs.c	Wed Feb 18 07:09:47 2009	(r188748)
@@ -425,19 +425,11 @@ node_creat(ARCHD *arcn)
 	 * we were able to create the node. set uid/gid, modes and times
 	 */
 	if (pids)
-		res = ((arcn->type == PAX_SLK) ?
-		    set_lids(arcn->name, arcn->sb.st_uid, arcn->sb.st_gid) :
-		    set_ids(arcn->name, arcn->sb.st_uid, arcn->sb.st_gid));
+		res = set_ids(arcn->name, arcn->sb.st_uid, arcn->sb.st_gid);
 	else
 		res = 0;
 
 	/*
-	 * symlinks are done now.
-	 */
-	if (arcn->type == PAX_SLK)
-		return(0);
-
-	/*
 	 * IMPORTANT SECURITY NOTE:
 	 * if not preserving mode or we cannot set uid/gid, then PROHIBIT any
 	 * set uid/gid bits
@@ -632,7 +624,7 @@ chk_path( char *name, uid_t st_uid, gid_
  *	used by -t to reset access times).
  *	When ign is zero, only those times the user has asked for are set, the
  *	other ones are left alone. We do not assume the un-documented feature
- *	of many utimes() implementations that consider a 0 time value as a do
+ *	of many lutimes() implementations that consider a 0 time value as a do
  *	not set request.
  */
 
@@ -661,7 +653,7 @@ set_ftime(char *fnm, time_t mtime, time_
 	/*
 	 * set the times
 	 */
-	if (utimes(fnm, tv) < 0)
+	if (lutimes(fnm, tv) < 0)
 		syswarn(1, errno, "Access/modification time set failed on: %s",
 		    fnm);
 	return;
@@ -677,30 +669,6 @@ set_ftime(char *fnm, time_t mtime, time_
 int
 set_ids(char *fnm, uid_t uid, gid_t gid)
 {
-	if (chown(fnm, uid, gid) < 0) {
-		/*
-		 * ignore EPERM unless in verbose mode or being run by root.
-		 * if running as pax, POSIX requires a warning.
-		 */
-		if (strcmp(NM_PAX, argv0) == 0 || errno != EPERM || vflag ||
-		    geteuid() == 0)
-			syswarn(1, errno, "Unable to set file uid/gid of %s",
-			    fnm);
-		return(-1);
-	}
-	return(0);
-}
-
-/*
- * set_lids()
- *	set the uid and gid of a file system node
- * Return:
- *	0 when set, -1 on failure
- */
-
-int
-set_lids(char *fnm, uid_t uid, gid_t gid)
-{
 	if (lchown(fnm, uid, gid) < 0) {
 		/*
 		 * ignore EPERM unless in verbose mode or being run by root.
@@ -724,7 +692,7 @@ void
 set_pmode(char *fnm, mode_t mode)
 {
 	mode &= ABITS;
-	if (chmod(fnm, mode) < 0)
+	if (lchmod(fnm, mode) < 0)
 		syswarn(1, errno, "Could not set permissions on %s", fnm);
 	return;
 }

Modified: user/lstewart/alq_varlen_8.x/bin/ps/print.c
==============================================================================
--- user/lstewart/alq_varlen_8.x/bin/ps/print.c	Wed Feb 18 06:43:03 2009	(r188747)
+++ user/lstewart/alq_varlen_8.x/bin/ps/print.c	Wed Feb 18 07:09:47 2009	(r188748)
@@ -196,9 +196,8 @@ tdnam(KINFO *k, VARENT *ve)
 	v = ve->var;
 	if (showthreads && k->ki_p->ki_numthreads > 1)
 		(void)printf("%-*s", v->width, k->ki_p->ki_ocomm);
-        else
-		(void)printf("%-*s", v->width, "      " );
-		
+	else
+		(void)printf("%-*s", v->width, "      ");
 }
 
 void

Modified: user/lstewart/alq_varlen_8.x/bin/rcp/rcp.c
==============================================================================
--- user/lstewart/alq_varlen_8.x/bin/rcp/rcp.c	Wed Feb 18 06:43:03 2009	(r188747)
+++ user/lstewart/alq_varlen_8.x/bin/rcp/rcp.c	Wed Feb 18 07:09:47 2009	(r188748)
@@ -789,6 +789,4 @@ run_err(const char *fmt, ...)
 		vwarnx(fmt, ap);
 		va_end(ap);
 	}
-
-	va_end(ap);
 }

Modified: user/lstewart/alq_varlen_8.x/bin/sh/eval.c
==============================================================================
--- user/lstewart/alq_varlen_8.x/bin/sh/eval.c	Wed Feb 18 06:43:03 2009	(r188747)
+++ user/lstewart/alq_varlen_8.x/bin/sh/eval.c	Wed Feb 18 07:09:47 2009	(r188748)
@@ -791,6 +791,7 @@ evalcommand(union node *cmd, int flags, 
 		for (sp = varlist.list ; sp ; sp = sp->next)
 			mklocal(sp->text);
 		funcnest++;
+		exitstatus = oexitstatus;
 		if (flags & EV_TESTED)
 			evaltree(cmdentry.u.func, EV_TESTED);
 		else

Modified: user/lstewart/alq_varlen_8.x/bin/sh/exec.c
==============================================================================
--- user/lstewart/alq_varlen_8.x/bin/sh/exec.c	Wed Feb 18 06:43:03 2009	(r188747)
+++ user/lstewart/alq_varlen_8.x/bin/sh/exec.c	Wed Feb 18 07:09:47 2009	(r188748)
@@ -728,9 +728,6 @@ typecmd_impl(int argc, char **argv, int 
 	extern char *const parsekwd[];
 
 	for (i = 1; i < argc; i++) {
-		if (cmd != TYPECMD_SMALLV)
-			out1str(argv[i]);
-
 		/* First look at the keywords */
 		for (pp = (char **)parsekwd; *pp; pp++)
 			if (**pp == *argv[i] && equal(*pp, argv[i]))
@@ -740,7 +737,7 @@ typecmd_impl(int argc, char **argv, int 
 			if (cmd == TYPECMD_SMALLV)
 				out1fmt("%s\n", argv[i]);
 			else
-				out1str(" is a shell keyword\n");
+				out1fmt("%s is a shell keyword\n", argv[i]);
 			continue;
 		}
 
@@ -749,7 +746,8 @@ typecmd_impl(int argc, char **argv, int 
 			if (cmd == TYPECMD_SMALLV)
 				out1fmt("alias %s='%s'\n", argv[i], ap->val);
 			else
-				out1fmt(" is an alias for %s\n", ap->val);
+				out1fmt("%s is an alias for %s\n", argv[i],
+				    ap->val);
 			continue;
 		}
 
@@ -775,7 +773,7 @@ typecmd_impl(int argc, char **argv, int 
 				if (cmd == TYPECMD_SMALLV)
 					out1fmt("%s\n", name);
 				else
-					out1fmt(" is%s %s\n",
+					out1fmt("%s is%s %s\n", argv[i],
 					    (cmdp && cmd == TYPECMD_TYPE) ?
 						" a tracked alias for" : "",
 					    name);
@@ -784,11 +782,12 @@ typecmd_impl(int argc, char **argv, int 
 					if (cmd == TYPECMD_SMALLV)
 						out1fmt("%s\n", argv[i]);
 					else
-						out1fmt(" is %s\n", argv[i]);
+						out1fmt("%s is %s\n", argv[i],
+						    argv[i]);
 				} else {
 					if (cmd != TYPECMD_SMALLV)
-						out1fmt(": %s\n",
-						    strerror(errno));
+						outfmt(out2, "%s: %s\n",
+						    argv[i], strerror(errno));
 					error |= 127;
 				}
 			}
@@ -798,19 +797,19 @@ typecmd_impl(int argc, char **argv, int 
 			if (cmd == TYPECMD_SMALLV)
 				out1fmt("%s\n", argv[i]);
 			else
-				out1str(" is a shell function\n");
+				out1fmt("%s is a shell function\n", argv[i]);
 			break;
 
 		case CMDBUILTIN:
 			if (cmd == TYPECMD_SMALLV)
 				out1fmt("%s\n", argv[i]);
 			else
-				out1str(" is a shell builtin\n");
+				out1fmt("%s is a shell builtin\n", argv[i]);
 			break;
 
 		default:
 			if (cmd != TYPECMD_SMALLV)
-				out1str(": not found\n");
+				outfmt(out2, "%s: not found\n", argv[i]);
 			error |= 127;
 			break;
 		}

Modified: user/lstewart/alq_varlen_8.x/bin/test/test.1
==============================================================================
--- user/lstewart/alq_varlen_8.x/bin/test/test.1	Wed Feb 18 06:43:03 2009	(r188747)
+++ user/lstewart/alq_varlen_8.x/bin/test/test.1	Wed Feb 18 07:09:47 2009	(r188748)
@@ -310,7 +310,7 @@ are evaluated consistently according to 
 standards document.
 All other cases are subject to the ambiguity in the
 command semantics.
-.Sh RETURN VALUES
+.Sh EXIT STATUS
 The
 .Nm
 utility exits with one of the following values:

Modified: user/lstewart/alq_varlen_8.x/cddl/Makefile.inc
==============================================================================
--- user/lstewart/alq_varlen_8.x/cddl/Makefile.inc	Wed Feb 18 06:43:03 2009	(r188747)
+++ user/lstewart/alq_varlen_8.x/cddl/Makefile.inc	Wed Feb 18 07:09:47 2009	(r188748)
@@ -4,3 +4,5 @@ OPENSOLARIS_USR_DISTDIR= ${.CURDIR}/../.
 OPENSOLARIS_SYS_DISTDIR= ${.CURDIR}/../../../sys/cddl/contrib/opensolaris
 
 IGNORE_PRAGMA=	YES
+
+CFLAGS+=	-DNEED_SOLARIS_BOOLEAN

Copied: user/lstewart/alq_varlen_8.x/cddl/compat/opensolaris/include/libshare.h (from r188705, head/cddl/compat/opensolaris/include/libshare.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/lstewart/alq_varlen_8.x/cddl/compat/opensolaris/include/libshare.h	Wed Feb 18 07:09:47 2009	(r188748, copy of r188705, head/cddl/compat/opensolaris/include/libshare.h)
@@ -0,0 +1,36 @@
+/*-

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

From owner-svn-src-user@FreeBSD.ORG  Wed Feb 18 18:27:48 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D113B106564A;
	Wed, 18 Feb 2009 18:27:48 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B3DCA8FC16;
	Wed, 18 Feb 2009 18:27:48 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1IIRmRb071294;
	Wed, 18 Feb 2009 18:27:48 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1IIRmJA071293;
	Wed, 18 Feb 2009 18:27:48 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200902181827.n1IIRmJA071293@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Wed, 18 Feb 2009 18:27:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188754 - user/dfr/xenhvm/7/sys/dev/xen/netfront
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Feb 2009 18:27:49 -0000

Author: dfr
Date: Wed Feb 18 18:27:48 2009
New Revision: 188754
URL: http://svn.freebsd.org/changeset/base/188754

Log:
  Eliminate the data copy on transmit and start getting ready to support TSO.

Modified:
  user/dfr/xenhvm/7/sys/dev/xen/netfront/netfront.c

Modified: user/dfr/xenhvm/7/sys/dev/xen/netfront/netfront.c
==============================================================================
--- user/dfr/xenhvm/7/sys/dev/xen/netfront/netfront.c	Wed Feb 18 18:25:16 2009	(r188753)
+++ user/dfr/xenhvm/7/sys/dev/xen/netfront/netfront.c	Wed Feb 18 18:27:48 2009	(r188754)
@@ -95,6 +95,7 @@ static const int MODPARM_rx_copy = 1;
 static const int MODPARM_rx_flip = 0;
 #endif
 
+#define MAX_SKB_FRAGS	(65536/PAGE_SIZE + 2)
 #define RX_COPY_THRESHOLD 256
 
 #define net_ratelimit() 0
@@ -339,28 +340,6 @@ xennet_get_rx_ref(struct netfront_info *
 #define DPRINTK(fmt, args...)
 #endif
 
-static __inline struct mbuf* 
-makembuf (struct mbuf *buf)
-{
-	struct mbuf *m = NULL;
-	
-        MGETHDR (m, M_DONTWAIT, MT_DATA);
-	
-        if (! m)
-		return 0;
-		
-	M_MOVE_PKTHDR(m, buf);
-
-	m_cljget(m, M_DONTWAIT, MJUMPAGESIZE);
-        m->m_pkthdr.len = buf->m_pkthdr.len;
-        m->m_len = buf->m_len;
-	m_copydata(buf, 0, buf->m_pkthdr.len, mtod(m,caddr_t) );
-
-	m->m_ext.ext_args = (caddr_t *)(uintptr_t)(vtophys(mtod(m,caddr_t)) >> PAGE_SHIFT);
-
-       	return m;
-}
-
 /**
  * Read the 'mac' node at the given device's node in the store, and parse that
  * as colon-separated octets, placing result the given mac array.  mac must be
@@ -500,7 +479,7 @@ talk_to_backend(device_t dev, struct net
 		message = "writing feature-sg";
 		goto abort_transaction;
 	}
-#ifdef HAVE_TSO
+#if __FreeBSD_version >= 700000
 	err = xenbus_printf(xbt, node, "feature-gso-tcpv4", "%d", 1);
 	if (err) {
 		message = "writing feature-gso-tcpv4";
@@ -1007,7 +986,12 @@ xn_txeof(struct netfront_info *np)
 			id = RING_GET_RESPONSE(&np->tx, i)->id;
 			m = np->xn_cdata.xn_tx_chain[id]; 
 			
-			ifp->if_opackets++;
+			/*
+			 * Increment packet count if this is the last
+			 * mbuf of the chain.
+			 */
+			if (!m->m_next)
+				ifp->if_opackets++;
 			KASSERT(m != NULL, ("mbuf not found in xn_tx_chain"));
 			M_ASSERTVALID(m);
 			if (unlikely(gnttab_query_foreign_access(
@@ -1025,7 +1009,7 @@ xn_txeof(struct netfront_info *np)
 			
 			np->xn_cdata.xn_tx_chain[id] = NULL;
 			add_id_to_freelist(np->xn_cdata.xn_tx_chain, id);
-			m_freem(m);
+			m_free(m);
 		}
 		np->tx.rsp_cons = prod;
 		
@@ -1320,13 +1304,14 @@ xn_start_locked(struct ifnet *ifp) 
 {
 	int otherend_id;
 	unsigned short id;
-	struct mbuf *m_head, *new_m;
+	struct mbuf *m_head, *m;
 	struct netfront_info *sc;
 	netif_tx_request_t *tx;
+	netif_extra_info_t *extra;
 	RING_IDX i;
 	grant_ref_t ref;
 	u_long mfn, tx_bytes;
-	int notify;
+	int notify, nfrags;
 
 	sc = ifp->if_softc;
 	otherend_id = xenbus_get_otherend_id(sc->xbdev);
@@ -1346,36 +1331,95 @@ xn_start_locked(struct ifnet *ifp) 
 			break;
 		}
 		
-		id = get_id_from_freelist(sc->xn_cdata.xn_tx_chain);
+
+		/*
+		 * Defragment the mbuf if necessary.
+		 */
+		for (m = m_head, nfrags = 0; m; m = m->m_next)
+			nfrags++;
+		if (nfrags > MAX_SKB_FRAGS) {
+			m = m_defrag(m_head, M_DONTWAIT);
+			if (!m) {
+				m_freem(m_head);
+				break;
+			}
+			m_head = m;
+		}
 
 		/*
 		 * Start packing the mbufs in this chain into
 		 * the fragment pointers. Stop when we run out
 		 * of fragments or hit the end of the mbuf chain.
 		 */
-		new_m = makembuf(m_head);
-		tx = RING_GET_REQUEST(&sc->tx, i);
-		tx->id = id;
-		ref = gnttab_claim_grant_reference(&sc->gref_tx_head);
-		KASSERT((short)ref >= 0, ("Negative ref"));
-		mfn = virt_to_mfn(mtod(new_m, vm_offset_t));
-		gnttab_grant_foreign_access_ref(ref, otherend_id,
-		    mfn, GNTMAP_readonly);
-		tx->gref = sc->grant_tx_ref[id] = ref;
-		tx->size = new_m->m_pkthdr.len;
-		if (new_m->m_pkthdr.csum_flags & CSUM_DELAY_DATA)
-			tx->flags = NETTXF_csum_blank | NETTXF_data_validated;
-		else
+		m = m_head;
+		extra = NULL;
+		for (m = m_head; m; m = m->m_next) {
+			tx = RING_GET_REQUEST(&sc->tx, i);
+			id = get_id_from_freelist(sc->xn_cdata.xn_tx_chain);
+			sc->xn_cdata.xn_tx_chain[id] = m;
+			tx->id = id;
+			ref = gnttab_claim_grant_reference(&sc->gref_tx_head);
+			KASSERT((short)ref >= 0, ("Negative ref"));
+			mfn = virt_to_mfn(mtod(m, vm_offset_t));
+			gnttab_grant_foreign_access_ref(ref, otherend_id,
+			    mfn, GNTMAP_readonly);
+			tx->gref = sc->grant_tx_ref[id] = ref;
+			tx->offset = mtod(m, vm_offset_t) & (PAGE_SIZE - 1);
 			tx->flags = 0;
-		new_m->m_next = NULL;
-		new_m->m_nextpkt = NULL;
+			if (m == m_head) {
+				/*
+				 * The first fragment has the entire packet
+				 * size, subsequent fragments have just the
+				 * fragment size. The backend works out the
+				 * true size of the first fragment by
+				 * subtracting the sizes of the other
+				 * fragments.
+				 */
+				tx->size = m->m_pkthdr.len;
 
-		m_freem(m_head);
+				/*
+				 * The first fragment contains the
+				 * checksum flags and is optionally
+				 * followed by extra data for TSO etc.
+				 */
+				if (m->m_pkthdr.csum_flags
+				    & CSUM_DELAY_DATA) {
+					tx->flags |= (NETTXF_csum_blank
+					    | NETTXF_data_validated);
+				}
+#if __FreeBSD_version >= 700000
+				if (m->m_pkthdr.csum_flags & CSUM_TSO) {
+					struct netif_extra_info *gso =
+						(struct netif_extra_info *)
+						RING_GET_REQUEST(&sc->tx, ++i);
+
+					if (extra)
+						extra->flags |= XEN_NETIF_EXTRA_FLAG_MORE;
+					else
+						tx->flags |= NETTXF_extra_info;
+
+					gso->u.gso.size = m->m_pkthdr.len;
+					gso->u.gso.type = XEN_NETIF_GSO_TYPE_TCPV4;
+					gso->u.gso.pad = 0;
+					gso->u.gso.features = 0;
+
+					gso->type = XEN_NETIF_EXTRA_TYPE_GSO;
+					gso->flags = 0;
+					extra = gso;
+				}
+#endif
+			} else {
+				tx->size = m->m_len;
+			}
+			if (m->m_next) {
+				tx->flags |= NETTXF_more_data;
+				i++;
+			}
+		}
 
-		sc->xn_cdata.xn_tx_chain[id] = new_m;
-		BPF_MTAP(ifp, new_m);
+		BPF_MTAP(ifp, m_head);
 
-		sc->stats.tx_bytes += new_m->m_pkthdr.len;
+		sc->stats.tx_bytes += m_head->m_pkthdr.len;
 		sc->stats.tx_packets++;
 	}
 
@@ -1518,11 +1562,14 @@ xn_ioctl(struct ifnet *ifp, u_long cmd, 
 	case SIOCSIFCAP:
 		mask = ifr->ifr_reqcap ^ ifp->if_capenable;
 		if (mask & IFCAP_HWCSUM) {
-			if (IFCAP_HWCSUM & ifp->if_capenable)
-				ifp->if_capenable &= ~IFCAP_HWCSUM;
-			else
-				ifp->if_capenable |= IFCAP_HWCSUM;
+			ifp->if_capenable ^= IFCAP_HWCSUM;
 		}
+#if __FreeBSD_version >= 700000
+		if (mask & IFCAP_TSO4) {
+			ifp->if_capenable ^= IFCAP_TSO4;
+			/* XXX inform backend? */
+		}
+#endif
 		error = 0;
 		break;
 	case SIOCADDMULTI:
@@ -1733,6 +1780,9 @@ create_netdev(device_t dev)
 	
     	ifp->if_hwassist = XN_CSUM_FEATURES;
     	ifp->if_capabilities = IFCAP_HWCSUM;
+#if __FreeBSD_version >= 700000
+	//ifp->if_capabilities |= IFCAP_TSO4;
+#endif
     	ifp->if_capenable = ifp->if_capabilities;
 	
     	ether_ifattach(ifp, np->mac);

From owner-svn-src-user@FreeBSD.ORG  Wed Feb 18 18:58:02 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F28C61065670;
	Wed, 18 Feb 2009 18:58:02 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E16C68FC08;
	Wed, 18 Feb 2009 18:58:02 +0000 (UTC) (envelope-from dfr@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1IIw2Zh072041;
	Wed, 18 Feb 2009 18:58:02 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1IIw2UV072040;
	Wed, 18 Feb 2009 18:58:02 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200902181858.n1IIw2UV072040@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Wed, 18 Feb 2009 18:58:02 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188757 - user/dfr/xenhvm/7/sys/dev/xen/netfront
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 18 Feb 2009 18:58:03 -0000

Author: dfr
Date: Wed Feb 18 18:58:02 2009
New Revision: 188757
URL: http://svn.freebsd.org/changeset/base/188757

Log:
  Enable TSO for IPv4.

Modified:
  user/dfr/xenhvm/7/sys/dev/xen/netfront/netfront.c

Modified: user/dfr/xenhvm/7/sys/dev/xen/netfront/netfront.c
==============================================================================
--- user/dfr/xenhvm/7/sys/dev/xen/netfront/netfront.c	Wed Feb 18 18:41:34 2009	(r188756)
+++ user/dfr/xenhvm/7/sys/dev/xen/netfront/netfront.c	Wed Feb 18 18:58:02 2009	(r188757)
@@ -76,7 +76,7 @@ __FBSDID("$FreeBSD$");
 
 #include "xenbus_if.h"
 
-#define XN_CSUM_FEATURES	(CSUM_TCP | CSUM_UDP)
+#define XN_CSUM_FEATURES	(CSUM_TCP | CSUM_UDP | CSUM_TSO)
 
 #define GRANT_INVALID_REF	0
 
@@ -968,6 +968,7 @@ xn_txeof(struct netfront_info *np)
 	RING_IDX i, prod;
 	unsigned short id;
 	struct ifnet *ifp;
+	netif_tx_response_t *txr;
 	struct mbuf *m;
 	
 	XN_TX_LOCK_ASSERT(np);
@@ -983,7 +984,11 @@ xn_txeof(struct netfront_info *np)
 		rmb(); /* Ensure we see responses up to 'rp'. */
 		
 		for (i = np->tx.rsp_cons; i != prod; i++) {
-			id = RING_GET_RESPONSE(&np->tx, i)->id;
+			txr = RING_GET_RESPONSE(&np->tx, i);
+			if (txr->status == NETIF_RSP_NULL)
+				continue;
+
+			id = txr->id;
 			m = np->xn_cdata.xn_tx_chain[id]; 
 			
 			/*
@@ -1398,8 +1403,9 @@ xn_start_locked(struct ifnet *ifp) 
 					else
 						tx->flags |= NETTXF_extra_info;
 
-					gso->u.gso.size = m->m_pkthdr.len;
-					gso->u.gso.type = XEN_NETIF_GSO_TYPE_TCPV4;
+					gso->u.gso.size = m->m_pkthdr.tso_segsz;
+					gso->u.gso.type =
+						XEN_NETIF_GSO_TYPE_TCPV4;
 					gso->u.gso.pad = 0;
 					gso->u.gso.features = 0;
 
@@ -1781,7 +1787,7 @@ create_netdev(device_t dev)
     	ifp->if_hwassist = XN_CSUM_FEATURES;
     	ifp->if_capabilities = IFCAP_HWCSUM;
 #if __FreeBSD_version >= 700000
-	//ifp->if_capabilities |= IFCAP_TSO4;
+	ifp->if_capabilities |= IFCAP_TSO4;
 #endif
     	ifp->if_capenable = ifp->if_capabilities;
 	

From owner-svn-src-user@FreeBSD.ORG  Thu Feb 19 08:25:29 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C624D1065673;
	Thu, 19 Feb 2009 08:25:29 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B45898FC19;
	Thu, 19 Feb 2009 08:25:29 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1J8PTcJ090176;
	Thu, 19 Feb 2009 08:25:29 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1J8PTYF090171;
	Thu, 19 Feb 2009 08:25:29 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200902190825.n1J8PTYF090171@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Thu, 19 Feb 2009 08:25:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188811 - in user/alc/pagelock/sys: amd64/amd64 kern vm
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 Feb 2009 08:25:30 -0000

Author: alc
Date: Thu Feb 19 08:25:29 2009
New Revision: 188811
URL: http://svn.freebsd.org/changeset/base/188811

Log:
  Replace PG_WRITEABLE by VPO_WRITEABLE.  Eliminate unnecessary page queues
  locking.

Modified:
  user/alc/pagelock/sys/amd64/amd64/pmap.c
  user/alc/pagelock/sys/kern/vfs_bio.c
  user/alc/pagelock/sys/vm/vm_page.c
  user/alc/pagelock/sys/vm/vm_page.h
  user/alc/pagelock/sys/vm/vm_pageout.c

Modified: user/alc/pagelock/sys/amd64/amd64/pmap.c
==============================================================================
--- user/alc/pagelock/sys/amd64/amd64/pmap.c	Thu Feb 19 06:25:29 2009	(r188810)
+++ user/alc/pagelock/sys/amd64/amd64/pmap.c	Thu Feb 19 08:25:29 2009	(r188811)
@@ -1471,11 +1471,9 @@ _pmap_allocpte(pmap_t pmap, vm_pindex_t 
 	    VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) {
 		if (flags & M_WAITOK) {
 			PMAP_UNLOCK(pmap);
-			vm_page_unlock_queues();
 			vm_object_unlock_all(object);
 			VM_WAIT;
 			vm_object_lock_all(object);
-			vm_page_lock_queues();
 			PMAP_LOCK(pmap);
 		}
 
@@ -1907,7 +1905,7 @@ pmap_collect(pmap_t locked_pmap, struct 
 			if (TAILQ_EMPTY(&m->md.pv_list)) {
 				pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
 				if (TAILQ_EMPTY(&pvh->pv_list))
-					vm_page_flag_clear(m, PG_WRITEABLE);
+					m->oflags &= ~VPO_WRITEABLE;	/* XXX */
 			}
 			free_pv_entry(pmap, pv);
 			if (pmap != locked_pmap)
@@ -1949,7 +1947,8 @@ free_pv_entry(pmap_t pmap, pv_entry_t pv
 	TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list);
 	m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc));
 	dump_drop_page(m->phys_addr);
-	vm_page_unwire(m, 0);
+	m->wire_count--;
+	atomic_subtract_int(&cnt.v_wire_count, 1);
 	vm_page_free(m);
 }
 
@@ -2164,7 +2163,7 @@ pmap_remove_entry(pmap_t pmap, vm_page_t
 	if (TAILQ_EMPTY(&m->md.pv_list)) {
 		pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
 		if (TAILQ_EMPTY(&pvh->pv_list))
-			vm_page_flag_clear(m, PG_WRITEABLE);
+			m->oflags &= ~VPO_WRITEABLE;
 	}
 }
 
@@ -2375,8 +2374,10 @@ pmap_remove_pde(pmap_t pmap, pd_entry_t 
 				m->oflags |= VPO_REFERENCED;
 			}
 			if (TAILQ_EMPTY(&m->md.pv_list) &&
-			    TAILQ_EMPTY(&pvh->pv_list))
-				vm_page_flag_clear(m, PG_WRITEABLE);
+			    TAILQ_EMPTY(&pvh->pv_list)) {
+				VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
+				m->oflags &= ~VPO_WRITEABLE;
+			}
 		}
 	}
 	if (pmap == kernel_pmap) {
@@ -2473,7 +2474,6 @@ pmap_remove(pmap_t pmap, vm_offset_t sva
 
 	anyvalid = 0;
 
-	vm_page_lock_queues();
 	PMAP_LOCK(pmap);
 
 	/*
@@ -2576,7 +2576,6 @@ pmap_remove(pmap_t pmap, vm_offset_t sva
 out:
 	if (anyvalid)
 		pmap_invalidate_all(pmap);
-	vm_page_unlock_queues();	
 	PMAP_UNLOCK(pmap);
 	pmap_free_zero_pages(free);
 }
@@ -2644,7 +2643,7 @@ pmap_remove_all(vm_page_t m)
 		free_pv_entry(pmap, pv);
 		PMAP_UNLOCK(pmap);
 	}
-	vm_page_flag_clear(m, PG_WRITEABLE);
+	m->oflags &= ~VPO_WRITEABLE;
 }
 
 /*
@@ -2967,7 +2966,6 @@ pmap_enter(pmap_t pmap, vm_offset_t va, 
 
 	mpte = NULL;
 
-	vm_page_lock_queues();
 	PMAP_LOCK(pmap);
 
 	/*
@@ -3065,7 +3063,8 @@ validate:
 	newpte = (pt_entry_t)(pa | PG_V);
 	if ((prot & VM_PROT_WRITE) != 0) {
 		newpte |= PG_RW;
-		vm_page_flag_set(m, PG_WRITEABLE);
+		VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
+		m->oflags |= VPO_WRITEABLE;
 	}
 	if ((prot & VM_PROT_EXECUTE) == 0)
 		newpte |= pg_nx;
@@ -3117,7 +3116,6 @@ validate:
 	    pg_ps_enabled && vm_reserv_level_iffullpop(m) == 0)
 		pmap_promote_pde(pmap, pde, va);
 
-	vm_page_unlock_queues();
 	PMAP_UNLOCK(pmap);
 }
 
@@ -3913,7 +3911,7 @@ restart:
 					if (TAILQ_EMPTY(&pvh->pv_list)) {
 						for (mt = m; mt < &m[NBPDR / PAGE_SIZE]; mt++)
 							if (TAILQ_EMPTY(&mt->md.pv_list))
-								vm_page_flag_clear(mt, PG_WRITEABLE);
+								mt->oflags &= ~VPO_WRITEABLE;
 					}
 					mpte = pmap_lookup_pt_page(pmap, pv->pv_va);
 					if (mpte != NULL) {
@@ -3932,7 +3930,7 @@ restart:
 					if (TAILQ_EMPTY(&m->md.pv_list)) {
 						pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
 						if (TAILQ_EMPTY(&pvh->pv_list))
-							vm_page_flag_clear(m, PG_WRITEABLE);
+							m->oflags &= ~VPO_WRITEABLE;
 					}
 					pmap_unuse_pt(pmap, pv->pv_va, *pde, &free);
 				}
@@ -3949,7 +3947,8 @@ restart:
 			TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list);
 			m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc));
 			dump_drop_page(m->phys_addr);
-			vm_page_unwire(m, 0);
+			m->wire_count--;
+			atomic_subtract_int(&cnt.v_wire_count, 1);
 			vm_page_free(m);
 		}
 	}
@@ -4041,7 +4040,7 @@ pmap_remove_write(vm_page_t m)
 	vm_offset_t va;
 
 	if ((m->flags & PG_FICTITIOUS) != 0 ||
-	    (m->flags & PG_WRITEABLE) == 0)
+	    (m->oflags & VPO_WRITEABLE) == 0)
 		return;
 	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	pvh = pa_to_pvh(VM_PAGE_TO_PHYS(m));
@@ -4073,7 +4072,7 @@ retry:
 		}
 		PMAP_UNLOCK(pmap);
 	}
-	vm_page_flag_clear(m, PG_WRITEABLE);
+	m->oflags &= ~VPO_WRITEABLE;
 }
 
 /*

Modified: user/alc/pagelock/sys/kern/vfs_bio.c
==============================================================================
--- user/alc/pagelock/sys/kern/vfs_bio.c	Thu Feb 19 06:25:29 2009	(r188810)
+++ user/alc/pagelock/sys/kern/vfs_bio.c	Thu Feb 19 08:25:29 2009	(r188811)
@@ -1287,9 +1287,7 @@ brelse(struct buf *bp)
 					(PAGE_SIZE - poffset) : resid;
 
 				KASSERT(presid >= 0, ("brelse: extra page"));
-				vm_page_lock_queues();
 				vm_page_set_invalid(m, poffset, presid);
-				vm_page_unlock_queues();
 				if (had_bogus)
 					printf("avoided corruption bug in bogus_page/brelse code\n");
 			}
@@ -3393,7 +3391,6 @@ retry:
 			goto retry;
 	}
 	bogus = 0;
-	vm_page_lock_queues();
 	for (i = 0; i < bp->b_npages; i++) {
 		m = bp->b_pages[i];
 
@@ -3426,7 +3423,6 @@ retry:
 		}
 		foff = (foff + PAGE_SIZE) & ~(off_t)PAGE_MASK;
 	}
-	vm_page_unlock_queues();
 	VM_OBJECT_UNLOCK(obj);
 	if (bogus)
 		pmap_qenter(trunc_page((vm_offset_t)bp->b_data),

Modified: user/alc/pagelock/sys/vm/vm_page.c
==============================================================================
--- user/alc/pagelock/sys/vm/vm_page.c	Thu Feb 19 06:25:29 2009	(r188810)
+++ user/alc/pagelock/sys/vm/vm_page.c	Thu Feb 19 08:25:29 2009	(r188811)
@@ -699,7 +699,7 @@ vm_page_insert(vm_page_t m, vm_object_t 
 	 * Since we are inserting a new and possibly dirty page,
 	 * update the object's OBJ_MIGHTBEDIRTY flag.
 	 */
-	if (m->flags & PG_WRITEABLE)
+	if (m->oflags & VPO_WRITEABLE)
 		vm_object_set_writeable_dirty(object);
 }
 
@@ -1949,7 +1949,6 @@ vm_page_set_invalid(vm_page_t m, int bas
 
 	VM_OBJECT_LOCK_ASSERT(m->object, MA_OWNED);
 	bits = vm_page_bits(base, size);
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	if (m->valid == VM_PAGE_BITS_ALL && bits != 0)
 		pmap_remove_all(m);
 	m->valid &= ~bits;

Modified: user/alc/pagelock/sys/vm/vm_page.h
==============================================================================
--- user/alc/pagelock/sys/vm/vm_page.h	Thu Feb 19 06:25:29 2009	(r188810)
+++ user/alc/pagelock/sys/vm/vm_page.h	Thu Feb 19 08:25:29 2009	(r188811)
@@ -146,6 +146,7 @@ struct vm_page {
  */
 #define	VPO_BUSY	0x0001	/* page is in transit */
 #define	VPO_WANTED	0x0002	/* someone is waiting for page */
+#define	VPO_WRITEABLE	0x0010	/* page is mapped writeable */
 #define	VPO_REFERENCED	0x0080	/* page has been referenced */
 #define	VPO_CLEANCHK	0x0100	/* page will be checked for cleaning */
 #define	VPO_SWAPINPROG	0x0200	/* swap I/O in progress on page */
@@ -191,7 +192,6 @@ extern struct mtx vm_page_queue_free_mtx
 #define	PG_FREE		0x0002		/* page is free */
 #define PG_WINATCFLS	0x0004		/* flush dirty page on inactive q */
 #define	PG_FICTITIOUS	0x0008		/* physical page doesn't exist (O) */
-#define	PG_WRITEABLE	0x0010		/* page is mapped writeable */
 #define	PG_ZERO		0x0040		/* page is zeroed */
 #define PG_UNMANAGED	0x0800		/* No PV management for page */
 #define PG_MARKER	0x1000		/* special queue marker page */

Modified: user/alc/pagelock/sys/vm/vm_pageout.c
==============================================================================
--- user/alc/pagelock/sys/vm/vm_pageout.c	Thu Feb 19 06:25:29 2009	(r188810)
+++ user/alc/pagelock/sys/vm/vm_pageout.c	Thu Feb 19 08:25:29 2009	(r188811)
@@ -449,7 +449,7 @@ vm_pageout_flush(vm_page_t *mc, int coun
 		vm_page_t mt = mc[i];
 
 		KASSERT(pageout_status[i] == VM_PAGER_PEND ||
-		    (mt->flags & PG_WRITEABLE) == 0,
+		    (mt->oflags & VPO_WRITEABLE) == 0,
 		    ("vm_pageout_flush: page %p is not write protected", mt));
 		switch (pageout_status[i]) {
 		case VM_PAGER_OK:
@@ -840,7 +840,7 @@ rescan0:
 			 * to the page, removing all access will be cheaper
 			 * overall.
 			 */
-			if ((m->flags & PG_WRITEABLE) != 0)
+			if ((m->oflags & VPO_WRITEABLE) != 0)
 				pmap_remove_all(m);
 		} else {
 			vm_page_dirty(m);

From owner-svn-src-user@FreeBSD.ORG  Fri Feb 20 15:19:07 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A2071106566C;
	Fri, 20 Feb 2009 15:19:07 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 920E68FC18;
	Fri, 20 Feb 2009 15:19:07 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1KFJ7Ut032398;
	Fri, 20 Feb 2009 15:19:07 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1KFJ7kM032397;
	Fri, 20 Feb 2009 15:19:07 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200902201519.n1KFJ7kM032397@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Fri, 20 Feb 2009 15:19:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188855 - user/alc/pagelock/sys/vm
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Feb 2009 15:19:08 -0000

Author: alc
Date: Fri Feb 20 15:19:07 2009
New Revision: 188855
URL: http://svn.freebsd.org/changeset/base/188855

Log:
  Update lock annotations.

Modified:
  user/alc/pagelock/sys/vm/vm_page.h

Modified: user/alc/pagelock/sys/vm/vm_page.h
==============================================================================
--- user/alc/pagelock/sys/vm/vm_page.h	Fri Feb 20 15:03:54 2009	(r188854)
+++ user/alc/pagelock/sys/vm/vm_page.h	Fri Feb 20 15:19:07 2009	(r188855)
@@ -125,16 +125,16 @@ struct vm_page {
 	/* so, on normal X86 kernels, they must be at least 8 bits wide */
 #if PAGE_SIZE == 4096
 	u_char	valid;			/* map of valid DEV_BSIZE chunks (O) */
-	u_char	dirty;			/* map of dirty DEV_BSIZE chunks */
+	u_char	dirty;			/* map of dirty DEV_BSIZE chunks (O) */
 #elif PAGE_SIZE == 8192
 	u_short	valid;			/* map of valid DEV_BSIZE chunks (O) */
-	u_short	dirty;			/* map of dirty DEV_BSIZE chunks */
+	u_short	dirty;			/* map of dirty DEV_BSIZE chunks (O) */
 #elif PAGE_SIZE == 16384
 	u_int valid;			/* map of valid DEV_BSIZE chunks (O) */
-	u_int dirty;			/* map of dirty DEV_BSIZE chunks */
+	u_int dirty;			/* map of dirty DEV_BSIZE chunks (O) */
 #elif PAGE_SIZE == 32768
 	u_long valid;			/* map of valid DEV_BSIZE chunks (O) */
-	u_long dirty;			/* map of dirty DEV_BSIZE chunks */
+	u_long dirty;			/* map of dirty DEV_BSIZE chunks (O) */
 #endif
 };
 

From owner-svn-src-user@FreeBSD.ORG  Fri Feb 20 15:26:35 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 50292106567F;
	Fri, 20 Feb 2009 15:26:35 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3CCC98FC0A;
	Fri, 20 Feb 2009 15:26:35 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1KFQZX3032568;
	Fri, 20 Feb 2009 15:26:35 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1KFQZhT032567;
	Fri, 20 Feb 2009 15:26:35 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200902201526.n1KFQZhT032567@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Fri, 20 Feb 2009 15:26:35 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188856 - user/alc/pagelock/sys/amd64/amd64
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Feb 2009 15:26:37 -0000

Author: alc
Date: Fri Feb 20 15:26:34 2009
New Revision: 188856
URL: http://svn.freebsd.org/changeset/base/188856

Log:
  Optimize the object locking in pmap_remove_pages().

Modified:
  user/alc/pagelock/sys/amd64/amd64/pmap.c

Modified: user/alc/pagelock/sys/amd64/amd64/pmap.c
==============================================================================
--- user/alc/pagelock/sys/amd64/amd64/pmap.c	Fri Feb 20 15:19:07 2009	(r188855)
+++ user/alc/pagelock/sys/amd64/amd64/pmap.c	Fri Feb 20 15:26:34 2009	(r188856)
@@ -3936,10 +3936,6 @@ restart:
 				}
 			}
 		}
-		if (locked_object != NULL) {
-			VM_OBJECT_UNLOCK(locked_object);
-			locked_object = NULL;
-		}
 		if (allfree) {
 			PV_STAT(pv_entry_spare -= _NPCPV);
 			PV_STAT(pc_chunk_count--);
@@ -3952,6 +3948,8 @@ restart:
 			vm_page_free(m);
 		}
 	}
+	if (locked_object != NULL)
+		VM_OBJECT_UNLOCK(locked_object);
 	pmap_invalidate_all(pmap);
 	vm_page_unlock_queues();
 	PMAP_UNLOCK(pmap);

From owner-svn-src-user@FreeBSD.ORG  Fri Feb 20 16:11:44 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 327F6106564A;
	Fri, 20 Feb 2009 16:11:44 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 22C9C8FC16;
	Fri, 20 Feb 2009 16:11:44 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1KGBiT2033433;
	Fri, 20 Feb 2009 16:11:44 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1KGBiNd033432;
	Fri, 20 Feb 2009 16:11:44 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200902201611.n1KGBiNd033432@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Fri, 20 Feb 2009 16:11:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188858 - user/alc/pagelock/sys/vm
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 20 Feb 2009 16:11:44 -0000

Author: alc
Date: Fri Feb 20 16:11:43 2009
New Revision: 188858
URL: http://svn.freebsd.org/changeset/base/188858

Log:
  Eliminate stale comments.

Modified:
  user/alc/pagelock/sys/vm/swap_pager.c

Modified: user/alc/pagelock/sys/vm/swap_pager.c
==============================================================================
--- user/alc/pagelock/sys/vm/swap_pager.c	Fri Feb 20 15:52:53 2009	(r188857)
+++ user/alc/pagelock/sys/vm/swap_pager.c	Fri Feb 20 16:11:43 2009	(r188858)
@@ -1315,10 +1315,6 @@ swap_pager_putpages(vm_object_t object, 
  *	because we marked them all VM_PAGER_PEND on return from putpages ).
  *
  *	This routine may not block.
- *	This routine is called at splbio() or better
- *
- *	We up ourselves to splvm() as required for various vm_page related
- *	calls.
  */
 static void
 swp_pager_async_iodone(struct buf *bp)

From owner-svn-src-user@FreeBSD.ORG  Sat Feb 21 04:42:19 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9452F1065673;
	Sat, 21 Feb 2009 04:42:19 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 81EF78FC18;
	Sat, 21 Feb 2009 04:42:19 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1L4gJ9J048690;
	Sat, 21 Feb 2009 04:42:19 GMT
	(envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1L4gJlE048689;
	Sat, 21 Feb 2009 04:42:19 GMT
	(envelope-from lstewart@svn.freebsd.org)
Message-Id: <200902210442.n1L4gJlE048689@svn.freebsd.org>
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Sat, 21 Feb 2009 04:42:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188891 - user/lstewart/alq_varlen_8.x/sys/kern
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Feb 2009 04:42:19 -0000

Author: lstewart
Date: Sat Feb 21 04:42:19 2009
New Revision: 188891
URL: http://svn.freebsd.org/changeset/base/188891

Log:
  Hopefully fixes the bugs I've been seeing. Also addresses some memory leaks and
  minor style nits.

Modified:
  user/lstewart/alq_varlen_8.x/sys/kern/kern_alq.c

Modified: user/lstewart/alq_varlen_8.x/sys/kern/kern_alq.c
==============================================================================
--- user/lstewart/alq_varlen_8.x/sys/kern/kern_alq.c	Sat Feb 21 03:53:06 2009	(r188890)
+++ user/lstewart/alq_varlen_8.x/sys/kern/kern_alq.c	Sat Feb 21 04:42:19 2009	(r188891)
@@ -77,6 +77,8 @@ struct alq {
 #define	ALQ_LOCK(alq)	mtx_lock_spin(&(alq)->aq_mtx)
 #define	ALQ_UNLOCK(alq)	mtx_unlock_spin(&(alq)->aq_mtx)
 
+#define ALQ_HAS_PENDING_DATA(alq) ((alq)->aq_freebytes != (alq)->aq_buflen)
+
 static MALLOC_DEFINE(M_ALD, "ALD", "ALD");
 
 /*
@@ -186,10 +188,11 @@ ald_daemon(void)
 
 	for (;;) {
 		while ((alq = LIST_FIRST(&ald_active)) == NULL
-				&& !ald_shutingdown)
+		    && !ald_shutingdown)
 			mtx_sleep(&ald_active, &ald_mtx, PWAIT, "aldslp", 0);
 
-		if (ald_shutingdown) {
+		/* Don't shutdown until all active alq's are flushed */
+		if (ald_shutingdown && alq != NULL) {
 			ALD_UNLOCK();
 			break;
 		}
@@ -213,8 +216,20 @@ ald_shutdown(void *arg, int howto)
 	struct alq *alq;
 
 	ALD_LOCK();
+
+	/* Ensure no new queues can be created */
 	ald_shutingdown = 1;
 
+	/* Shutdown all alqs prior to terminating the ald_daemon */
+	while ((alq = LIST_FIRST(&ald_queues)) != NULL) {
+		LIST_REMOVE(alq, aq_link);
+		ALD_UNLOCK();
+		alq_shutdown(alq);
+		ALD_LOCK();
+	}
+
+	/* At this point, all alqs are flushed and shutdown */
+
 	/*
 	 * Wake ald_daemon so that it exits. It won't be able to do
 	 * anything until we mtx_sleep because we hold the ald_mtx
@@ -224,12 +239,6 @@ ald_shutdown(void *arg, int howto)
 	/* Wait for ald_daemon to exit */
 	mtx_sleep(ald_proc, &ald_mtx, PWAIT, "aldslp", 0);
 
-	while ((alq = LIST_FIRST(&ald_queues)) != NULL) {
-		LIST_REMOVE(alq, aq_link);
-		ALD_UNLOCK();
-		alq_shutdown(alq);
-		ALD_LOCK();
-	}
 	ALD_UNLOCK();
 }
 
@@ -241,15 +250,29 @@ alq_shutdown(struct alq *alq)
 	/* Stop any new writers. */
 	alq->aq_flags |= AQ_SHUTDOWN;
 
+	/*
+	 * If the alq isn't active but has unwritten data (possible if
+	 * the ALQ_NOACTIVATE flag has been used), explicitly activate the
+	 * alq here so that the pending data gets flushed by the ald_daemon.
+	 */
+	if (!(alq->aq_flags & AQ_ACTIVE) &&
+	    ALQ_HAS_PENDING_DATA(alq)) {
+		alq->aq_flags |= AQ_ACTIVE;
+		ALQ_UNLOCK(alq);
+		ALD_LOCK();
+		ald_activate(alq);
+		ALD_UNLOCK();
+		ALQ_LOCK(alq);
+	}
+
 	/* Drain IO */
-	while (alq->aq_flags & (AQ_FLUSHING|AQ_ACTIVE)) {
+	while (alq->aq_flags & AQ_ACTIVE) {
 		alq->aq_flags |= AQ_WANTED;
 		msleep_spin(alq, &alq->aq_mtx, "aldclose", 0);
 	}
 	ALQ_UNLOCK(alq);
 
-	vn_close(alq->aq_vp, FWRITE, alq->aq_cred,
-	    curthread);
+	vn_close(alq->aq_vp, FWRITE, alq->aq_cred, curthread);
 	crfree(alq->aq_cred);
 }
 
@@ -268,7 +291,7 @@ alq_doio(struct alq *alq)
 	int iov;
 	int vfslocked;
 
-	KASSERT((alq->aq_freebytes != alq->aq_buflen),
+	KASSERT((ALQ_HAS_PENDING_DATA(alq)),
 		("%s: queue emtpy!", __func__)
 	);
 
@@ -280,16 +303,16 @@ alq_doio(struct alq *alq)
 	bzero(&aiov, sizeof(aiov));
 	bzero(&auio, sizeof(auio));
 
-	/* start the write from the location of our buffer tail pointer */
+	/* Start the write from the location of our buffer tail pointer. */
 	aiov[iov].iov_base = alq->aq_entbuf + alq->aq_writetail;
 
 	if (alq->aq_writetail < alq->aq_writehead) {
-		/* buffer not wrapped */
+		/* Buffer not wrapped */
 		totlen = aiov[iov].iov_len =  alq->aq_writehead -
 							alq->aq_writetail;
 	} else {
 		/*
-		 * buffer wrapped, requires 2 aiov entries:
+		 * Buffer wrapped, requires 2 aiov entries:
 		 * - first is from writetail to end of buffer
 		 * - second is from start of buffer to writehead
 		 */
@@ -336,16 +359,16 @@ alq_doio(struct alq *alq)
 	ALQ_LOCK(alq);
 	alq->aq_flags &= ~AQ_FLUSHING;
 
-	/* Adjust writetail as required, taking into account wrapping */
+	/* Adjust writetail as required, taking into account wrapping. */
 	alq->aq_writetail += (iov == 2) ? aiov[1].iov_len : totlen;
 	alq->aq_freebytes += totlen;
 
 	/*
 	 * If we just flushed the buffer completely,
-	 * reset indexes to 0 to minimise buffer wraps
-	 * This is also required to ensure alq_getn() can't wedge itself
+	 * reset indexes to 0 to minimise buffer wraps.
+	 * This is also required to ensure alq_getn() can't wedge itself.
 	 */
-	if (alq->aq_freebytes == alq->aq_buflen)
+	if (!ALQ_HAS_PENDING_DATA(alq))
 		alq->aq_writehead = alq->aq_writetail = 0;
 
 	if (alq->doio_debugcallback != NULL)
@@ -400,7 +423,7 @@ alq_open(struct alq **alqp, const char *
 
 	vfslocked = NDHASGIANT(&nd);
 	NDFREE(&nd, NDF_ONLY_PNBUF);
-	/* We just unlock so we hold a reference */
+	/* We just unlock so we hold a reference. */
 	VOP_UNLOCK(nd.ni_vp, 0);
 	VFS_UNLOCK_GIANT(vfslocked);
 
@@ -411,12 +434,12 @@ alq_open(struct alq **alqp, const char *
 	mtx_init(&alq->aq_mtx, "ALD Queue", NULL, MTX_SPIN|MTX_QUIET);
 
 	if (count > 0) {
-		/* fixed length messages */
+		/* Fixed length messages. */
 		alq->aq_buflen = size * count;
 		alq->aq_entmax = count;
 		alq->aq_entlen = size;
 	} else {
-		/* variable length messages */
+		/* Variable length messages. */
 		alq->aq_buflen = size;
 		alq->aq_entmax = 0;
 		alq->aq_entlen = 0;
@@ -443,7 +466,7 @@ alq_open(struct alq **alqp, const char *
 int
 alq_write(struct alq *alq, void *data, int flags)
 {
-	/* should only be called in fixed length message (legacy) mode */
+	/* Should only be called in fixed length message (legacy) mode. */
 	KASSERT((alq->aq_entmax > 0 && alq->aq_entlen > 0),
 		("%s: fixed length write on variable length queue", __func__)
 	);
@@ -465,17 +488,17 @@ alq_writen(struct alq *alq, void *data, 
 	/*
 	 * If the message is larger than our underlying buffer or
 	 * there is not enough free space in our underlying buffer
-	 * to accept the message and the user can't wait, return
+	 * to accept the message and the user can't wait, return.
 	 */
 	if ((len > alq->aq_buflen) ||
-		((flags & ALQ_NOWAIT) && (alq->aq_freebytes < len))) {
+	    ((flags & ALQ_NOWAIT) && (alq->aq_freebytes < len))) {
 		ALQ_UNLOCK(alq);
 		return (EWOULDBLOCK);
 	}
 
 	/*
-	 * ALQ_WAITOK or alq->aq_freebytes > len,
-	 * either spin until we have enough free bytes (former) or skip (latter)
+	 * ALQ_WAITOK or alq->aq_freebytes > len, either spin until
+	 * we have enough free bytes (former) or skip (latter).
 	 */
 	while (alq->aq_freebytes < len && (alq->aq_flags & AQ_SHUTDOWN) == 0) {
 		alq->aq_flags |= AQ_WANTED;
@@ -483,35 +506,35 @@ alq_writen(struct alq *alq, void *data, 
 	}
 
 	/*
-	 * we need to serialise wakups to ensure records remain in order...
-	 * therefore, wakeup the next thread in the queue waiting for
-	 * alq resources to be available
+	 * We need to serialise wakups to ensure records remain in order...
+	 * Therefore, wakeup the next thread in the queue waiting for
+	 * alq resources to be available.
 	 * (technically this is only required if we actually entered the above
 	 * while loop)
 	 */
 	wakeup_one(alq);
 
-	/* bail if we're shutting down */
+	/* Bail if we're shutting down. */
 	if (alq->aq_flags & AQ_SHUTDOWN) {
-		ALQ_UNLOCK(alq);
+	    ALQ_UNLOCK(alq);
 		return (EWOULDBLOCK);
 	}
 
 	/*
-	 * if we need to wrap the buffer to accommodate the write,
-	 * we'll need 2 calls to bcopy
+	 * If we need to wrap the buffer to accommodate the write,
+	 * we'll need 2 calls to bcopy.
 	 */
 	if ((alq->aq_buflen - alq->aq_writehead) < len)
 		copy = alq->aq_buflen - alq->aq_writehead;
 
-	/* copy (part of) message to the buffer */
+	/* Copy (part of) message to the buffer. */
 	bcopy(data, alq->aq_entbuf + alq->aq_writehead, copy);
 	alq->aq_writehead += copy;
 
 	if (copy != len) {
 		/*
-		 * wrap the buffer by copying the remainder of our message
-		 * to the start of the buffer and resetting aq_writehead
+		 * Wrap the buffer by copying the remainder of our message
+		 * to the start of the buffer and resetting aq_writehead.
 		 */
 		bcopy(data, alq->aq_entbuf, len - copy);
 		alq->aq_writehead = len - copy;
@@ -539,7 +562,7 @@ alq_writen(struct alq *alq, void *data, 
 struct ale *
 alq_get(struct alq *alq, int flags)
 {
-	/* should only be called in fixed length message (legacy) mode */
+	/* Should only be called in fixed length message (legacy) mode. */
 	KASSERT((alq->aq_entmax > 0 && alq->aq_entlen > 0),
 		("%s: fixed length get on variable length queue", __func__)
 	);
@@ -582,18 +605,19 @@ alq_getn(struct alq *alq, int len, int f
 	/*
 	 * If the message is larger than our underlying buffer or
 	 * there is not enough free contiguous space in our underlying buffer
-	 * to accept the message and the user can't wait, return
+	 * to accept the message and the user can't wait, return.
 	 */
 	if ((len > alq->aq_buflen) ||
 		((flags & ALQ_NOWAIT) && (contigbytes < len))) {
 		ALQ_UNLOCK(alq);
+		free(ale, M_ALD);
 		return (NULL);
 	}
 
 	/*
 	 * ALQ_WAITOK or contigbytes >= len,
 	 * either spin until we have enough free contiguous bytes (former)
-	 * or skip (latter)
+	 * or skip (latter).
 	 */
 	while (contigbytes < len && (alq->aq_flags & AQ_SHUTDOWN) == 0) {
 		alq->aq_flags |= AQ_WANTED;
@@ -616,6 +640,7 @@ alq_getn(struct alq *alq, int len, int f
 	/* Bail if we're shutting down */
 	if (alq->aq_flags & AQ_SHUTDOWN) {
 		ALQ_UNLOCK(alq);
+		free(ale, M_ALD);
 		return (NULL);
 	}
 
@@ -628,7 +653,7 @@ alq_getn(struct alq *alq, int len, int f
 	alq->aq_writehead += len;
 	alq->aq_freebytes -= len;
 
-	/* Wrap aq_writehead if we've filled to the end of the buffer */
+	/* Wrap aq_writehead if we've filled to the end of the buffer. */
 	if (alq->aq_writehead == alq->aq_buflen)
 		alq->aq_writehead = 0;
 
@@ -665,12 +690,15 @@ alq_flush(struct alq *alq)
 
 	ALD_LOCK();
 	ALQ_LOCK(alq);
-	if (alq->aq_flags & AQ_ACTIVE) {
+
+	if (alq->aq_flags & AQ_ACTIVE)
 		ald_deactivate(alq);
-		ALD_UNLOCK();
+
+	ALD_UNLOCK();
+
+	if (ALQ_HAS_PENDING_DATA(alq))
 		needwakeup = alq_doio(alq);
-	} else
-		ALD_UNLOCK();
+
 	ALQ_UNLOCK(alq);
 
 	if (needwakeup)

From owner-svn-src-user@FreeBSD.ORG  Sat Feb 21 05:54:07 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 03ACE106566B;
	Sat, 21 Feb 2009 05:54:07 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E6EF78FC13;
	Sat, 21 Feb 2009 05:54:06 +0000 (UTC)
	(envelope-from lstewart@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1L5s6cR054355;
	Sat, 21 Feb 2009 05:54:06 GMT
	(envelope-from lstewart@svn.freebsd.org)
Received: (from lstewart@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1L5s6Hg054354;
	Sat, 21 Feb 2009 05:54:06 GMT
	(envelope-from lstewart@svn.freebsd.org)
Message-Id: <200902210554.n1L5s6Hg054354@svn.freebsd.org>
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Sat, 21 Feb 2009 05:54:06 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188892 - user/lstewart/alq_varlen_8.x/sys/kern
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Feb 2009 05:54:07 -0000

Author: lstewart
Date: Sat Feb 21 05:54:06 2009
New Revision: 188892
URL: http://svn.freebsd.org/changeset/base/188892

Log:
  Oops!

Modified:
  user/lstewart/alq_varlen_8.x/sys/kern/kern_alq.c

Modified: user/lstewart/alq_varlen_8.x/sys/kern/kern_alq.c
==============================================================================
--- user/lstewart/alq_varlen_8.x/sys/kern/kern_alq.c	Sat Feb 21 04:42:19 2009	(r188891)
+++ user/lstewart/alq_varlen_8.x/sys/kern/kern_alq.c	Sat Feb 21 05:54:06 2009	(r188892)
@@ -192,7 +192,7 @@ ald_daemon(void)
 			mtx_sleep(&ald_active, &ald_mtx, PWAIT, "aldslp", 0);
 
 		/* Don't shutdown until all active alq's are flushed */
-		if (ald_shutingdown && alq != NULL) {
+		if (ald_shutingdown && alq == NULL) {
 			ALD_UNLOCK();
 			break;
 		}

From owner-svn-src-user@FreeBSD.ORG  Sat Feb 21 21:02:53 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D3D821065670;
	Sat, 21 Feb 2009 21:02:53 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C302B8FC0A;
	Sat, 21 Feb 2009 21:02:53 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1LL2rJH075322;
	Sat, 21 Feb 2009 21:02:53 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1LL2rk3075321;
	Sat, 21 Feb 2009 21:02:53 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200902212102.n1LL2rk3075321@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Sat, 21 Feb 2009 21:02:53 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188901 - user/alc/pagelock/sys/vm
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Feb 2009 21:02:54 -0000

Author: alc
Date: Sat Feb 21 21:02:53 2009
New Revision: 188901
URL: http://svn.freebsd.org/changeset/base/188901

Log:
  Eliminate page queues locking from vm_object_page_clean().

Modified:
  user/alc/pagelock/sys/vm/vm_object.c

Modified: user/alc/pagelock/sys/vm/vm_object.c
==============================================================================
--- user/alc/pagelock/sys/vm/vm_object.c	Sat Feb 21 20:57:25 2009	(r188900)
+++ user/alc/pagelock/sys/vm/vm_object.c	Sat Feb 21 21:02:53 2009	(r188901)
@@ -740,7 +740,6 @@ vm_object_page_clean(vm_object_t object,
 		tend = end;
 	}
 
-	vm_page_lock_queues();
 	/*
 	 * If the caller is smart and only msync()s a range he knows is
 	 * dirty, we may be able to avoid an object scan.  This results in
@@ -802,7 +801,6 @@ vm_object_page_clean(vm_object_t object,
 		 * return immediately.
 		 */
 		if (tscan >= tend && (tstart || tend < object->size)) {
-			vm_page_unlock_queues();
 			vm_object_clear_flag(object, OBJ_CLEANING);
 			return;
 		}
@@ -889,7 +887,6 @@ again:
 				goto again;
 		}
 	}
-	vm_page_unlock_queues();
 #if 0
 	VOP_FSYNC(vp, (pagerflags & VM_PAGER_PUT_SYNC)?MNT_WAIT:0, curproc);
 #endif
@@ -911,10 +908,8 @@ vm_object_page_collect_flush(vm_object_t
 	vm_page_t mab[vm_pageout_page_count];
 	vm_page_t ma[vm_pageout_page_count];
 
-	mtx_assert(&vm_page_queue_mtx, MA_OWNED);
 	pi = p->pindex;
 	while (vm_page_sleep_if_busy(p, TRUE, "vpcwai")) {
-		vm_page_lock_queues();
 		if (object->generation != curgeneration) {
 			return(0);
 		}
@@ -980,7 +975,9 @@ vm_object_page_collect_flush(vm_object_t
 	}
 	runlen = maxb + maxf + 1;
 
+	vm_page_lock_queues();
 	vm_pageout_flush(ma, runlen, pagerflags);
+	vm_page_unlock_queues();
 	for (i = 0; i < runlen; i++) {
 		if (ma[i]->valid & ma[i]->dirty) {
 			pmap_remove_write(ma[i]);

From owner-svn-src-user@FreeBSD.ORG  Sat Feb 21 21:12:56 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 52D03106566B;
	Sat, 21 Feb 2009 21:12:56 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3D8E58FC12;
	Sat, 21 Feb 2009 21:12:56 +0000 (UTC) (envelope-from alc@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1LLCuMu075569;
	Sat, 21 Feb 2009 21:12:56 GMT (envelope-from alc@svn.freebsd.org)
Received: (from alc@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1LLCtx0075549;
	Sat, 21 Feb 2009 21:12:55 GMT (envelope-from alc@svn.freebsd.org)
Message-Id: <200902212112.n1LLCtx0075549@svn.freebsd.org>
From: Alan Cox <alc@FreeBSD.org>
Date: Sat, 21 Feb 2009 21:12:55 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188902 - in user/alc/pagelock/sys: . amd64/linux32
	arm/conf boot boot/ficl/mips boot/i386/loader
	boot/ia64/common boot/ia64/efi boot/ia64/ski boot/pc98/loader
	boot/powerpc/ofw boot/spa...
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 21 Feb 2009 21:12:56 -0000

Author: alc
Date: Sat Feb 21 21:12:54 2009
New Revision: 188902
URL: http://svn.freebsd.org/changeset/base/188902

Log:
  Merge from HEAD.

Added:
  user/alc/pagelock/sys/boot/ficl/mips/
     - copied from r188901, head/sys/boot/ficl/mips/
  user/alc/pagelock/sys/dev/ata/ata-raid-ddf.h
     - copied unchanged from r188901, head/sys/dev/ata/ata-raid-ddf.h
  user/alc/pagelock/sys/powerpc/include/altivec.h
     - copied unchanged from r188901, head/sys/powerpc/include/altivec.h
  user/alc/pagelock/sys/powerpc/powerpc/altivec.c
     - copied unchanged from r188901, head/sys/powerpc/powerpc/altivec.c
Deleted:
  user/alc/pagelock/sys/dev/usb2/include/Makefile
  user/alc/pagelock/sys/dev/usb2/include/usb2_devid.h
  user/alc/pagelock/sys/dev/usb2/include/usb2_devtable.h
Modified:
  user/alc/pagelock/sys/   (props changed)
  user/alc/pagelock/sys/amd64/linux32/linux32_machdep.c
  user/alc/pagelock/sys/arm/conf/AVILA
  user/alc/pagelock/sys/arm/conf/CAMBRIA
  user/alc/pagelock/sys/boot/Makefile
  user/alc/pagelock/sys/boot/Makefile.inc
  user/alc/pagelock/sys/boot/i386/loader/Makefile
  user/alc/pagelock/sys/boot/ia64/common/Makefile
  user/alc/pagelock/sys/boot/ia64/efi/Makefile
  user/alc/pagelock/sys/boot/ia64/ski/Makefile
  user/alc/pagelock/sys/boot/pc98/loader/Makefile
  user/alc/pagelock/sys/boot/powerpc/ofw/Makefile
  user/alc/pagelock/sys/boot/sparc64/loader/Makefile
  user/alc/pagelock/sys/compat/linux/linux_stats.c
  user/alc/pagelock/sys/conf/files
  user/alc/pagelock/sys/conf/files.powerpc
  user/alc/pagelock/sys/dev/aac/aac.c
  user/alc/pagelock/sys/dev/aac/aac_debug.c
  user/alc/pagelock/sys/dev/aac/aac_pci.c
  user/alc/pagelock/sys/dev/aac/aacreg.h
  user/alc/pagelock/sys/dev/aac/aacvar.h
  user/alc/pagelock/sys/dev/acpica/acpi_cpu.c
  user/alc/pagelock/sys/dev/arcmsr/arcmsr.c
  user/alc/pagelock/sys/dev/ata/ata-all.c
  user/alc/pagelock/sys/dev/ata/ata-all.h
  user/alc/pagelock/sys/dev/ata/ata-card.c
  user/alc/pagelock/sys/dev/ata/ata-cbus.c
  user/alc/pagelock/sys/dev/ata/ata-disk.c
  user/alc/pagelock/sys/dev/ata/ata-dma.c
  user/alc/pagelock/sys/dev/ata/ata-isa.c
  user/alc/pagelock/sys/dev/ata/ata-pci.c
  user/alc/pagelock/sys/dev/ata/ata-pci.h
  user/alc/pagelock/sys/dev/ata/ata-queue.c
  user/alc/pagelock/sys/dev/ata/ata-raid.c
  user/alc/pagelock/sys/dev/ata/ata-raid.h
  user/alc/pagelock/sys/dev/ata/ata-usb.c
  user/alc/pagelock/sys/dev/ata/atapi-cd.c
  user/alc/pagelock/sys/dev/ata/atapi-fd.c
  user/alc/pagelock/sys/dev/ata/atapi-tape.c
  user/alc/pagelock/sys/dev/ata/chipsets/ata-acard.c
  user/alc/pagelock/sys/dev/ata/chipsets/ata-acerlabs.c
  user/alc/pagelock/sys/dev/ata/chipsets/ata-ahci.c
  user/alc/pagelock/sys/dev/ata/chipsets/ata-highpoint.c
  user/alc/pagelock/sys/dev/ata/chipsets/ata-intel.c
  user/alc/pagelock/sys/dev/ata/chipsets/ata-jmicron.c
  user/alc/pagelock/sys/dev/ata/chipsets/ata-marvell.c
  user/alc/pagelock/sys/dev/ata/chipsets/ata-netcell.c
  user/alc/pagelock/sys/dev/ata/chipsets/ata-nvidia.c
  user/alc/pagelock/sys/dev/ata/chipsets/ata-promise.c
  user/alc/pagelock/sys/dev/ata/chipsets/ata-serverworks.c
  user/alc/pagelock/sys/dev/ata/chipsets/ata-siliconimage.c
  user/alc/pagelock/sys/dev/ata/chipsets/ata-sis.c
  user/alc/pagelock/sys/dev/ata/chipsets/ata-via.c
  user/alc/pagelock/sys/dev/ath/ath_hal/ah.c
  user/alc/pagelock/sys/dev/ath/ath_hal/ah.h
  user/alc/pagelock/sys/dev/ath/ath_hal/ah_internal.h
  user/alc/pagelock/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
  user/alc/pagelock/sys/dev/ath/ath_hal/ar5212/ar5212_phy.c
  user/alc/pagelock/sys/dev/ath/if_ath.c
  user/alc/pagelock/sys/dev/ath/if_athvar.h
  user/alc/pagelock/sys/dev/cfi/cfi_bus_ixp4xx.c
  user/alc/pagelock/sys/dev/ciss/ciss.c
  user/alc/pagelock/sys/dev/cx/if_cx.c
  user/alc/pagelock/sys/dev/firewire/firewire.c
  user/alc/pagelock/sys/dev/firewire/firewire.h
  user/alc/pagelock/sys/dev/firewire/sbp.c
  user/alc/pagelock/sys/dev/mmc/mmcsd.c
  user/alc/pagelock/sys/dev/mxge/eth_z8e.h
  user/alc/pagelock/sys/dev/mxge/ethp_z8e.h
  user/alc/pagelock/sys/dev/mxge/if_mxge.c
  user/alc/pagelock/sys/dev/mxge/if_mxge_var.h
  user/alc/pagelock/sys/dev/mxge/mxge_mcp.h
  user/alc/pagelock/sys/dev/mxge/rss_eth_z8e.h
  user/alc/pagelock/sys/dev/mxge/rss_ethp_z8e.h
  user/alc/pagelock/sys/dev/sdhci/sdhci.c
  user/alc/pagelock/sys/dev/tsec/if_tsec.c
  user/alc/pagelock/sys/dev/tsec/if_tsec.h
  user/alc/pagelock/sys/dev/tsec/if_tsec_ocp.c
  user/alc/pagelock/sys/dev/tsec/if_tsecreg.h
  user/alc/pagelock/sys/dev/usb2/bluetooth/ng_ubt2.c
  user/alc/pagelock/sys/dev/usb2/bluetooth/ubtbcmfw2.c
  user/alc/pagelock/sys/dev/usb2/core/usb2_device.c
  user/alc/pagelock/sys/dev/usb2/ethernet/if_aue2.c
  user/alc/pagelock/sys/dev/usb2/ethernet/if_axe2.c
  user/alc/pagelock/sys/dev/usb2/ethernet/if_cdce2.c
  user/alc/pagelock/sys/dev/usb2/ethernet/if_cue2.c
  user/alc/pagelock/sys/dev/usb2/ethernet/if_kue2.c
  user/alc/pagelock/sys/dev/usb2/ethernet/if_rue2.c
  user/alc/pagelock/sys/dev/usb2/ethernet/if_udav2.c
  user/alc/pagelock/sys/dev/usb2/image/uscanner2.c
  user/alc/pagelock/sys/dev/usb2/input/uhid2.c
  user/alc/pagelock/sys/dev/usb2/input/ums2.c
  user/alc/pagelock/sys/dev/usb2/misc/udbp2.c
  user/alc/pagelock/sys/dev/usb2/misc/ufm2.c
  user/alc/pagelock/sys/dev/usb2/quirk/usb2_quirk.c
  user/alc/pagelock/sys/dev/usb2/serial/u3g2.c
  user/alc/pagelock/sys/dev/usb2/serial/uark2.c
  user/alc/pagelock/sys/dev/usb2/serial/ubsa2.c
  user/alc/pagelock/sys/dev/usb2/serial/uchcom2.c
  user/alc/pagelock/sys/dev/usb2/serial/ucycom2.c
  user/alc/pagelock/sys/dev/usb2/serial/ufoma2.c
  user/alc/pagelock/sys/dev/usb2/serial/uftdi2.c
  user/alc/pagelock/sys/dev/usb2/serial/ugensa2.c
  user/alc/pagelock/sys/dev/usb2/serial/uipaq2.c
  user/alc/pagelock/sys/dev/usb2/serial/ulpt2.c
  user/alc/pagelock/sys/dev/usb2/serial/umct2.c
  user/alc/pagelock/sys/dev/usb2/serial/umodem2.c
  user/alc/pagelock/sys/dev/usb2/serial/umoscom2.c
  user/alc/pagelock/sys/dev/usb2/serial/uplcom2.c
  user/alc/pagelock/sys/dev/usb2/serial/uslcom2.c
  user/alc/pagelock/sys/dev/usb2/serial/uvisor2.c
  user/alc/pagelock/sys/dev/usb2/serial/uvscom2.c
  user/alc/pagelock/sys/dev/usb2/sound/uaudio2.c
  user/alc/pagelock/sys/dev/usb2/storage/ata-usb2.c
  user/alc/pagelock/sys/dev/usb2/storage/umass2.c
  user/alc/pagelock/sys/dev/usb2/storage/urio2.c
  user/alc/pagelock/sys/dev/usb2/storage/ustorage2_fs.c
  user/alc/pagelock/sys/dev/usb2/wlan/if_rum2.c
  user/alc/pagelock/sys/dev/usb2/wlan/if_ural2.c
  user/alc/pagelock/sys/dev/usb2/wlan/if_zyd2.c
  user/alc/pagelock/sys/fs/udf/udf_vnops.c
  user/alc/pagelock/sys/geom/geom_dev.c
  user/alc/pagelock/sys/geom/part/g_part.c
  user/alc/pagelock/sys/geom/part/g_part.h
  user/alc/pagelock/sys/geom/part/g_part_bsd.c
  user/alc/pagelock/sys/geom/part/g_part_ebr.c
  user/alc/pagelock/sys/geom/part/g_part_if.m
  user/alc/pagelock/sys/i386/acpica/acpi_wakeup.c
  user/alc/pagelock/sys/i386/linux/linux_machdep.c
  user/alc/pagelock/sys/kern/kern_osd.c
  user/alc/pagelock/sys/kern/kern_proc.c
  user/alc/pagelock/sys/kern/tty_pts.c
  user/alc/pagelock/sys/kern/vfs_cache.c
  user/alc/pagelock/sys/kern/vfs_syscalls.c
  user/alc/pagelock/sys/modules/usb2/bluetooth_fw/Makefile
  user/alc/pagelock/sys/modules/usb2/bluetooth_ng/Makefile
  user/alc/pagelock/sys/modules/usb2/core/Makefile
  user/alc/pagelock/sys/modules/usb2/ethernet_aue/Makefile
  user/alc/pagelock/sys/modules/usb2/ethernet_axe/Makefile
  user/alc/pagelock/sys/modules/usb2/ethernet_cdce/Makefile
  user/alc/pagelock/sys/modules/usb2/ethernet_cue/Makefile
  user/alc/pagelock/sys/modules/usb2/ethernet_dav/Makefile
  user/alc/pagelock/sys/modules/usb2/ethernet_kue/Makefile
  user/alc/pagelock/sys/modules/usb2/ethernet_rue/Makefile
  user/alc/pagelock/sys/modules/usb2/input_hid/Makefile
  user/alc/pagelock/sys/modules/usb2/input_kbd/Makefile
  user/alc/pagelock/sys/modules/usb2/input_ms/Makefile
  user/alc/pagelock/sys/modules/usb2/misc_dbp/Makefile
  user/alc/pagelock/sys/modules/usb2/misc_fm/Makefile
  user/alc/pagelock/sys/modules/usb2/quirk/Makefile
  user/alc/pagelock/sys/modules/usb2/scanner/Makefile
  user/alc/pagelock/sys/modules/usb2/serial_3g/Makefile
  user/alc/pagelock/sys/modules/usb2/serial_ark/Makefile
  user/alc/pagelock/sys/modules/usb2/serial_bsa/Makefile
  user/alc/pagelock/sys/modules/usb2/serial_bser/Makefile
  user/alc/pagelock/sys/modules/usb2/serial_chcom/Makefile
  user/alc/pagelock/sys/modules/usb2/serial_cycom/Makefile
  user/alc/pagelock/sys/modules/usb2/serial_foma/Makefile
  user/alc/pagelock/sys/modules/usb2/serial_ftdi/Makefile
  user/alc/pagelock/sys/modules/usb2/serial_gensa/Makefile
  user/alc/pagelock/sys/modules/usb2/serial_ipaq/Makefile
  user/alc/pagelock/sys/modules/usb2/serial_lpt/Makefile
  user/alc/pagelock/sys/modules/usb2/serial_mct/Makefile
  user/alc/pagelock/sys/modules/usb2/serial_modem/Makefile
  user/alc/pagelock/sys/modules/usb2/serial_moscom/Makefile
  user/alc/pagelock/sys/modules/usb2/serial_plcom/Makefile
  user/alc/pagelock/sys/modules/usb2/serial_slcom/Makefile
  user/alc/pagelock/sys/modules/usb2/serial_visor/Makefile
  user/alc/pagelock/sys/modules/usb2/serial_vscom/Makefile
  user/alc/pagelock/sys/modules/usb2/sound/Makefile
  user/alc/pagelock/sys/modules/usb2/storage_ata/Makefile
  user/alc/pagelock/sys/modules/usb2/storage_fs/Makefile
  user/alc/pagelock/sys/modules/usb2/storage_mass/Makefile
  user/alc/pagelock/sys/modules/usb2/storage_rio/Makefile
  user/alc/pagelock/sys/modules/usb2/template/Makefile
  user/alc/pagelock/sys/modules/usb2/wlan_ral/Makefile
  user/alc/pagelock/sys/modules/usb2/wlan_rum/Makefile
  user/alc/pagelock/sys/modules/usb2/wlan_zyd/Makefile
  user/alc/pagelock/sys/net80211/_ieee80211.h
  user/alc/pagelock/sys/net80211/ieee80211.c
  user/alc/pagelock/sys/net80211/ieee80211_ioctl.c
  user/alc/pagelock/sys/net80211/ieee80211_node.c
  user/alc/pagelock/sys/net80211/ieee80211_phy.c
  user/alc/pagelock/sys/net80211/ieee80211_proto.c
  user/alc/pagelock/sys/net80211/ieee80211_regdomain.c
  user/alc/pagelock/sys/net80211/ieee80211_scan.c
  user/alc/pagelock/sys/net80211/ieee80211_scan_sta.c
  user/alc/pagelock/sys/net80211/ieee80211_tdma.c
  user/alc/pagelock/sys/netinet/sctp_constants.h
  user/alc/pagelock/sys/netinet/sctp_header.h
  user/alc/pagelock/sys/netinet/sctp_input.c
  user/alc/pagelock/sys/netinet/sctp_output.c
  user/alc/pagelock/sys/netinet/sctp_output.h
  user/alc/pagelock/sys/netinet/sctp_pcb.c
  user/alc/pagelock/sys/netinet/sctp_structs.h
  user/alc/pagelock/sys/netinet/sctp_uio.h
  user/alc/pagelock/sys/netinet/sctp_usrreq.c
  user/alc/pagelock/sys/netinet/sctputil.c
  user/alc/pagelock/sys/nfsclient/nfs_vnops.c
  user/alc/pagelock/sys/nfsclient/nfsnode.h
  user/alc/pagelock/sys/powerpc/aim/machdep.c
  user/alc/pagelock/sys/powerpc/aim/swtch.S
  user/alc/pagelock/sys/powerpc/aim/trap.c
  user/alc/pagelock/sys/powerpc/aim/trap_subr.S
  user/alc/pagelock/sys/powerpc/conf/MPC85XX
  user/alc/pagelock/sys/powerpc/include/pcb.h
  user/alc/pagelock/sys/powerpc/include/pcpu.h
  user/alc/pagelock/sys/powerpc/powerpc/genassym.c
  user/alc/pagelock/sys/sys/disk.h
  user/alc/pagelock/sys/sys/jail.h
  user/alc/pagelock/sys/sys/osd.h
  user/alc/pagelock/sys/sys/param.h
  user/alc/pagelock/sys/sys/syscallsubr.h
  user/alc/pagelock/sys/sys/vnode.h
  user/alc/pagelock/sys/vm/vm_object.c

Modified: user/alc/pagelock/sys/amd64/linux32/linux32_machdep.c
==============================================================================
--- user/alc/pagelock/sys/amd64/linux32/linux32_machdep.c	Sat Feb 21 21:02:53 2009	(r188901)
+++ user/alc/pagelock/sys/amd64/linux32/linux32_machdep.c	Sat Feb 21 21:12:54 2009	(r188902)
@@ -560,7 +560,7 @@ linux_vfork(struct thread *td, struct li
 	/* wait for the children to exit, ie. emulate vfork */
 	PROC_LOCK(p2);
 	while (p2->p_flag & P_PPWAIT)
-	   	msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0);
+		cv_wait(&p2->p_pwait, &p2->p_mtx);
 	PROC_UNLOCK(p2);
 
 	return (0);
@@ -749,7 +749,7 @@ linux_clone(struct thread *td, struct li
 		/* wait for the children to exit, ie. emulate vfork */
 		PROC_LOCK(p2);
 		while (p2->p_flag & P_PPWAIT)
-			msleep(td->td_proc, &p2->p_mtx, PWAIT, "ppwait", 0);
+			cv_wait(&p2->p_pwait, &p2->p_mtx);
 		PROC_UNLOCK(p2);
 	}
 

Modified: user/alc/pagelock/sys/arm/conf/AVILA
==============================================================================
--- user/alc/pagelock/sys/arm/conf/AVILA	Sat Feb 21 21:02:53 2009	(r188901)
+++ user/alc/pagelock/sys/arm/conf/AVILA	Sat Feb 21 21:12:54 2009	(r188902)
@@ -88,7 +88,7 @@ device		npe		# Network Processing Engine
 device		npe_fw
 device		firmware
 device		qmgr		# Q Manager (required by npe)
-device		miibus		# NB: required by npe
+device		mii		# NB: required by npe
 device		ether
 device		bpf
 

Modified: user/alc/pagelock/sys/arm/conf/CAMBRIA
==============================================================================
--- user/alc/pagelock/sys/arm/conf/CAMBRIA	Sat Feb 21 21:02:53 2009	(r188901)
+++ user/alc/pagelock/sys/arm/conf/CAMBRIA	Sat Feb 21 21:12:54 2009	(r188902)
@@ -87,7 +87,7 @@ device		npe		# Network Processing Engine
 device		npe_fw
 device		firmware
 device		qmgr		# Q Manager (required by npe)
-device		miibus		# NB: required by npe
+device		mii		# NB: required by npe
 device		ether
 device		bpf
 

Modified: user/alc/pagelock/sys/boot/Makefile
==============================================================================
--- user/alc/pagelock/sys/boot/Makefile	Sat Feb 21 21:02:53 2009	(r188901)
+++ user/alc/pagelock/sys/boot/Makefile	Sat Feb 21 21:12:54 2009	(r188902)
@@ -2,10 +2,6 @@
 
 .include <bsd.own.mk>
 
-.if ${MACHINE_ARCH} == "mips"
-MK_FORTH=no	# not yet
-.endif
-
 .if ${MK_FORTH} != "no"
 # Build the add-in FORTH interpreter.
 SUBDIR+=		ficl

Modified: user/alc/pagelock/sys/boot/Makefile.inc
==============================================================================
--- user/alc/pagelock/sys/boot/Makefile.inc	Sat Feb 21 21:02:53 2009	(r188901)
+++ user/alc/pagelock/sys/boot/Makefile.inc	Sat Feb 21 21:12:54 2009	(r188902)
@@ -1,3 +1,3 @@
 # $FreeBSD$
 
-WITHOUT_SSP=
+SSP_CFLAGS=

Modified: user/alc/pagelock/sys/boot/i386/loader/Makefile
==============================================================================
--- user/alc/pagelock/sys/boot/i386/loader/Makefile	Sat Feb 21 21:02:53 2009	(r188901)
+++ user/alc/pagelock/sys/boot/i386/loader/Makefile	Sat Feb 21 21:12:54 2009	(r188902)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
-WITHOUT_SSP=
-
 .include <bsd.own.mk>
+MK_SSP=		no
 
 PROG=		loader.sym
 INTERNALPROG=

Modified: user/alc/pagelock/sys/boot/ia64/common/Makefile
==============================================================================
--- user/alc/pagelock/sys/boot/ia64/common/Makefile	Sat Feb 21 21:02:53 2009	(r188901)
+++ user/alc/pagelock/sys/boot/ia64/common/Makefile	Sat Feb 21 21:12:54 2009	(r188902)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
-WITHOUT_SSP=
-
 .include <bsd.own.mk>
+MK_SSP=		no
 
 LIB=		ia64
 INTERNALLIB=

Modified: user/alc/pagelock/sys/boot/ia64/efi/Makefile
==============================================================================
--- user/alc/pagelock/sys/boot/ia64/efi/Makefile	Sat Feb 21 21:02:53 2009	(r188901)
+++ user/alc/pagelock/sys/boot/ia64/efi/Makefile	Sat Feb 21 21:12:54 2009	(r188902)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 NO_MAN=
-WITHOUT_SSP=
 
 .include <bsd.own.mk>
+MK_SSP=		no
 
 PROG=		loader.sym
 INTERNALPROG=

Modified: user/alc/pagelock/sys/boot/ia64/ski/Makefile
==============================================================================
--- user/alc/pagelock/sys/boot/ia64/ski/Makefile	Sat Feb 21 21:02:53 2009	(r188901)
+++ user/alc/pagelock/sys/boot/ia64/ski/Makefile	Sat Feb 21 21:12:54 2009	(r188902)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 NO_MAN=
-WITHOUT_SSP=
 
 .include <bsd.own.mk>
+MK_SSP=		no
 
 PROG=		skiload
 STRIP=		# We must not strip skiload at install time.

Modified: user/alc/pagelock/sys/boot/pc98/loader/Makefile
==============================================================================
--- user/alc/pagelock/sys/boot/pc98/loader/Makefile	Sat Feb 21 21:02:53 2009	(r188901)
+++ user/alc/pagelock/sys/boot/pc98/loader/Makefile	Sat Feb 21 21:12:54 2009	(r188902)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
-WITHOUT_SSP=
-
 .include <bsd.own.mk>
+MK_SSP=		no
 
 PROG=		loader.sym
 INTERNALPROG=

Modified: user/alc/pagelock/sys/boot/powerpc/ofw/Makefile
==============================================================================
--- user/alc/pagelock/sys/boot/powerpc/ofw/Makefile	Sat Feb 21 21:02:53 2009	(r188901)
+++ user/alc/pagelock/sys/boot/powerpc/ofw/Makefile	Sat Feb 21 21:12:54 2009	(r188902)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
-WITHOUT_SSP=
-
 .include <bsd.own.mk>
+MK_SSP=		no
 
 PROG=		loader
 NEWVERSWHAT=	"Open Firmware loader" ${MACHINE_ARCH}

Modified: user/alc/pagelock/sys/boot/sparc64/loader/Makefile
==============================================================================
--- user/alc/pagelock/sys/boot/sparc64/loader/Makefile	Sat Feb 21 21:02:53 2009	(r188901)
+++ user/alc/pagelock/sys/boot/sparc64/loader/Makefile	Sat Feb 21 21:12:54 2009	(r188902)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
-WITHOUT_SSP=
-
 .include <bsd.own.mk>
+MK_SSP=		no
 
 PROG=		loader
 NEWVERSWHAT=	"bootstrap loader" sparc64

Modified: user/alc/pagelock/sys/compat/linux/linux_stats.c
==============================================================================
--- user/alc/pagelock/sys/compat/linux/linux_stats.c	Sat Feb 21 21:02:53 2009	(r188901)
+++ user/alc/pagelock/sys/compat/linux/linux_stats.c	Sat Feb 21 21:12:54 2009	(r188902)
@@ -62,6 +62,44 @@ __FBSDID("$FreeBSD$");
 
 #include <security/mac/mac_framework.h>
 
+static void
+translate_vnhook_major_minor(struct vnode *vp, struct stat *sb)
+{
+	int major, minor;
+
+	if (vp->v_type == VCHR && vp->v_rdev != NULL &&
+	    linux_driver_get_major_minor(vp->v_rdev->si_name,
+	    &major, &minor) == 0) {
+		sb->st_rdev = (major << 8 | minor);
+	}
+}
+
+static int
+linux_kern_statat(struct thread *td, int flag, int fd, char *path,
+    enum uio_seg pathseg, struct stat *sbp)
+{
+
+	return (kern_statat_vnhook(td, flag, fd, path, pathseg, sbp,
+	    translate_vnhook_major_minor));
+}
+
+static int
+linux_kern_stat(struct thread *td, char *path, enum uio_seg pathseg,
+    struct stat *sbp)
+{
+
+	return (linux_kern_statat(td, 0, AT_FDCWD, path, pathseg, sbp));
+}
+
+static int
+linux_kern_lstat(struct thread *td, char *path, enum uio_seg pathseg,
+    struct stat *sbp)
+{
+
+	return (linux_kern_statat(td, AT_SYMLINK_NOFOLLOW, AT_FDCWD, path,
+	    pathseg, sbp));
+}
+
 /*
  * XXX: This was removed from newstat_copyout(), and almost identical
  * XXX: code was in stat64_copyout().  findcdev() needs to be replaced
@@ -102,14 +140,15 @@ static void
 translate_fd_major_minor(struct thread *td, int fd, struct stat *buf)
 {
 	struct file *fp;
+	struct vnode *vp;
 	int major, minor;
 
 	if ((!S_ISCHR(buf->st_mode) && !S_ISBLK(buf->st_mode)) ||
 	    fget(td, fd, &fp) != 0)
 		return;
-	if (fp->f_vnode != NULL &&
-	    fp->f_vnode->v_un.vu_cdev != NULL &&
-	    linux_driver_get_major_minor(fp->f_vnode->v_un.vu_cdev->si_name,
+	vp = fp->f_vnode;
+	if (vp != NULL && vp->v_rdev != NULL &&
+	    linux_driver_get_major_minor(vp->v_rdev->si_name,
 					 &major, &minor) == 0) {
 		buf->st_rdev = (major << 8 | minor);
 	} else if (fp->f_type == DTYPE_PTS) {
@@ -124,32 +163,6 @@ translate_fd_major_minor(struct thread *
 	fdrop(fp, td);
 }
 
-static void
-translate_path_major_minor_at(struct thread *td, char *path,
-    struct stat *buf, int dfd)
-{
-	struct proc *p = td->td_proc;
-	struct filedesc *fdp = p->p_fd;
-	int fd;
-	int temp;
-
-	if (!S_ISCHR(buf->st_mode) && !S_ISBLK(buf->st_mode))
-		return;
-	temp = td->td_retval[0];
-	if (kern_openat(td, dfd, path, UIO_SYSSPACE, O_RDONLY, 0) != 0)
-		return;
-	fd = td->td_retval[0];
-	td->td_retval[0] = temp;
-	translate_fd_major_minor(td, fd, buf);
-	fdclose(fdp, fdp->fd_ofiles[fd], fd, td);
-}
-
-static inline void
-translate_path_major_minor(struct thread *td, char *path, struct stat *buf)
-{
-	translate_path_major_minor_at(td, path, buf, AT_FDCWD);
-}
-
 static int
 newstat_copyout(struct stat *buf, void *ubuf)
 {
@@ -187,9 +200,7 @@ linux_newstat(struct thread *td, struct 
 		printf(ARGS(newstat, "%s, *"), path);
 #endif
 
-	error = kern_stat(td, path, UIO_SYSSPACE, &buf);
-	if (!error)
-		translate_path_major_minor(td, path, &buf);
+	error = linux_kern_stat(td, path, UIO_SYSSPACE, &buf);
 	LFREEPATH(path);
 	if (error)
 		return (error);
@@ -210,9 +221,7 @@ linux_newlstat(struct thread *td, struct
 		printf(ARGS(newlstat, "%s, *"), path);
 #endif
 
-	error = kern_lstat(td, path, UIO_SYSSPACE, &sb);
-	if (!error)
-		translate_path_major_minor(td, path, &sb);
+	error = linux_kern_lstat(td, path, UIO_SYSSPACE, &sb);
 	LFREEPATH(path);
 	if (error)
 		return (error);
@@ -279,12 +288,11 @@ linux_stat(struct thread *td, struct lin
 	if (ldebug(stat))
 		printf(ARGS(stat, "%s, *"), path);
 #endif
-	error = kern_stat(td, path, UIO_SYSSPACE, &buf);
+	error = linux_kern_stat(td, path, UIO_SYSSPACE, &buf);
 	if (error) {
 		LFREEPATH(path);
 		return (error);
 	}
-	translate_path_major_minor(td, path, &buf);
 	LFREEPATH(path);
 	return(stat_copyout(&buf, args->up));
 }
@@ -302,12 +310,11 @@ linux_lstat(struct thread *td, struct li
 	if (ldebug(lstat))
 		printf(ARGS(lstat, "%s, *"), path);
 #endif
-	error = kern_lstat(td, path, UIO_SYSSPACE, &buf);
+	error = linux_kern_lstat(td, path, UIO_SYSSPACE, &buf);
 	if (error) {
 		LFREEPATH(path);
 		return (error);
 	}
-	translate_path_major_minor(td, path, &buf);
 	LFREEPATH(path);
 	return(stat_copyout(&buf, args->up));
 }
@@ -526,9 +533,7 @@ linux_stat64(struct thread *td, struct l
 		printf(ARGS(stat64, "%s, *"), filename);
 #endif
 
-	error = kern_stat(td, filename, UIO_SYSSPACE, &buf);
-	if (!error)
-		translate_path_major_minor(td, filename, &buf);
+	error = linux_kern_stat(td, filename, UIO_SYSSPACE, &buf);
 	LFREEPATH(filename);
 	if (error)
 		return (error);
@@ -549,9 +554,7 @@ linux_lstat64(struct thread *td, struct 
 		printf(ARGS(lstat64, "%s, *"), args->filename);
 #endif
 
-	error = kern_lstat(td, filename, UIO_SYSSPACE, &sb);
-	if (!error)
-		translate_path_major_minor(td, filename, &sb);
+	error = linux_kern_lstat(td, filename, UIO_SYSSPACE, &sb);
 	LFREEPATH(filename);
 	if (error)
 		return (error);
@@ -597,8 +600,7 @@ linux_fstatat64(struct thread *td, struc
 		printf(ARGS(fstatat64, "%i, %s, %i"), args->dfd, path, args->flag);
 #endif
 
-	error = kern_statat(td, flag, dfd, path, UIO_SYSSPACE, &buf);
-	translate_path_major_minor_at(td, args->pathname, &buf, dfd);
+	error = linux_kern_statat(td, flag, dfd, path, UIO_SYSSPACE, &buf);
 	if (!error)
 		error = stat64_copyout(&buf, args->statbuf);
 	LFREEPATH(path);

Modified: user/alc/pagelock/sys/conf/files
==============================================================================
--- user/alc/pagelock/sys/conf/files	Sat Feb 21 21:02:53 2009	(r188901)
+++ user/alc/pagelock/sys/conf/files	Sat Feb 21 21:12:54 2009	(r188902)
@@ -80,12 +80,12 @@ teken_state.h		optional sc					   \
 	compile-with	"${AWK} -f $S/dev/syscons/teken/gensequences $S/dev/syscons/teken/sequences > teken_state.h" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"teken_state.h"
-usbdevs.h			optional usb				   \
+usbdevs.h			optional usb | usb2_core		   \
 	dependency	"$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
 	compile-with	"${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -h" \
 	no-obj no-implicit-rule before-depend				   \
 	clean		"usbdevs.h"
-usbdevs_data.h			optional usb				   \
+usbdevs_data.h			optional usb | usb2_core		   \
 	dependency	"$S/tools/usbdevs2h.awk $S/dev/usb/usbdevs" \
 	compile-with	"${AWK} -f $S/tools/usbdevs2h.awk $S/dev/usb/usbdevs -d" \
 	no-obj no-implicit-rule before-depend				   \

Modified: user/alc/pagelock/sys/conf/files.powerpc
==============================================================================
--- user/alc/pagelock/sys/conf/files.powerpc	Sat Feb 21 21:02:53 2009	(r188901)
+++ user/alc/pagelock/sys/conf/files.powerpc	Sat Feb 21 21:12:54 2009	(r188902)
@@ -126,6 +126,7 @@ powerpc/powermac/uninorth.c	optional	pow
 powerpc/powermac/cuda.c		optional	powermac cuda
 powerpc/powermac/pmu.c		optional	powermac pmu 
 powerpc/powermac/macgpio.c	optional	powermac pci 
+powerpc/powerpc/altivec.c	optional	aim
 powerpc/powerpc/atomic.S	standard
 powerpc/powerpc/autoconf.c	standard
 powerpc/powerpc/bcopy.c		standard

Modified: user/alc/pagelock/sys/dev/aac/aac.c
==============================================================================
--- user/alc/pagelock/sys/dev/aac/aac.c	Sat Feb 21 21:02:53 2009	(r188901)
+++ user/alc/pagelock/sys/dev/aac/aac.c	Sat Feb 21 21:12:54 2009	(r188902)
@@ -71,6 +71,7 @@ static void	aac_startup(void *arg);
 static void	aac_add_container(struct aac_softc *sc,
 				  struct aac_mntinforesp *mir, int f);
 static void	aac_get_bus_info(struct aac_softc *sc);
+static void	aac_daemon(void *arg);
 
 /* Command Processing */
 static void	aac_timeout(struct aac_softc *sc);
@@ -292,6 +293,9 @@ aac_attach(struct aac_softc *sc)
 	TAILQ_INIT(&sc->aac_container_tqh);
 	TAILQ_INIT(&sc->aac_ev_cmfree);
 
+	/* Initialize the clock daemon callout. */
+	callout_init_mtx(&sc->aac_daemontime, &sc->aac_io_lock, 0);
+
 	/*
 	 * Initialize the adapter.
 	 */
@@ -349,9 +353,34 @@ aac_attach(struct aac_softc *sc)
 		aac_get_bus_info(sc);
 	}
 
+	mtx_lock(&sc->aac_io_lock);
+	callout_reset(&sc->aac_daemontime, 30 * 60 * hz, aac_daemon, sc);
+	mtx_unlock(&sc->aac_io_lock);
+
 	return(0);
 }
 
+static void
+aac_daemon(void *arg)
+{
+	struct timeval tv;
+	struct aac_softc *sc;
+	struct aac_fib *fib;
+
+	sc = arg;
+	mtx_assert(&sc->aac_io_lock, MA_OWNED);
+
+	if (callout_pending(&sc->aac_daemontime) ||
+	    callout_active(&sc->aac_daemontime) == 0)
+		return;
+	getmicrotime(&tv);
+	aac_alloc_sync_fib(sc, &fib);
+	*(uint32_t *)fib->data = tv.tv_sec;
+	aac_sync_fib(sc, SendHostTime, 0, fib, sizeof(uint32_t));
+	aac_release_sync_fib(sc);
+	callout_schedule(&sc->aac_daemontime, 30 * 60 * hz);
+}
+
 void
 aac_add_event(struct aac_softc *sc, struct aac_event *event)
 {
@@ -632,9 +661,12 @@ aac_free(struct aac_softc *sc)
 		bus_dma_tag_destroy(sc->aac_parent_dmat);
 
 	/* release the register window mapping */
-	if (sc->aac_regs_resource != NULL)
+	if (sc->aac_regs_res0 != NULL)
+		bus_release_resource(sc->aac_dev, SYS_RES_MEMORY,
+				     sc->aac_regs_rid0, sc->aac_regs_res0);
+	if (sc->aac_hwif == AAC_HWIF_NARK && sc->aac_regs_res1 != NULL)
 		bus_release_resource(sc->aac_dev, SYS_RES_MEMORY,
-				     sc->aac_regs_rid, sc->aac_regs_resource);
+				     sc->aac_regs_rid1, sc->aac_regs_res1);
 }
 
 /*
@@ -654,6 +686,8 @@ aac_detach(device_t dev)
 	if (sc->aac_state & AAC_STATE_OPEN)
 		return(EBUSY);
 
+	callout_drain(&sc->aac_daemontime);
+
 	/* Remove the child containers */
 	while ((co = TAILQ_FIRST(&sc->aac_container_tqh)) != NULL) {
 		error = device_delete_child(dev, co->co_disk);
@@ -834,7 +868,7 @@ aac_new_intr(void *arg)
 			}
 			index &= ~2;
 			for (i = 0; i < sizeof(struct aac_fib)/4; ++i)
-				((u_int32_t *)fib)[i] = AAC_GETREG4(sc, index + i*4);
+				((u_int32_t *)fib)[i] = AAC_MEM1_GETREG4(sc, index + i*4);
 			aac_handle_aif(sc, fib);
 			free(fib, M_AACBUF);
 
@@ -1754,26 +1788,33 @@ aac_check_firmware(struct aac_softc *sc)
 
 	/* Remap mem. resource, if required */
 	if ((sc->flags & AAC_FLAGS_NEW_COMM) &&
-		atu_size > rman_get_size(sc->aac_regs_resource)) {
+		atu_size > rman_get_size(sc->aac_regs_res1)) {
 		bus_release_resource(
 			sc->aac_dev, SYS_RES_MEMORY,
-			sc->aac_regs_rid, sc->aac_regs_resource);
-		sc->aac_regs_resource = bus_alloc_resource(
-			sc->aac_dev, SYS_RES_MEMORY, &sc->aac_regs_rid,
+			sc->aac_regs_rid1, sc->aac_regs_res1);
+		sc->aac_regs_res1 = bus_alloc_resource(
+			sc->aac_dev, SYS_RES_MEMORY, &sc->aac_regs_rid1,
 			0ul, ~0ul, atu_size, RF_ACTIVE);
-		if (sc->aac_regs_resource == NULL) {
-			sc->aac_regs_resource = bus_alloc_resource_any(
+		if (sc->aac_regs_res1 == NULL) {
+			sc->aac_regs_res1 = bus_alloc_resource_any(
 				sc->aac_dev, SYS_RES_MEMORY,
-				&sc->aac_regs_rid, RF_ACTIVE);
-			if (sc->aac_regs_resource == NULL) {
+				&sc->aac_regs_rid1, RF_ACTIVE);
+			if (sc->aac_regs_res1 == NULL) {
 				device_printf(sc->aac_dev,
 				    "couldn't allocate register window\n");
 				return (ENXIO);
 			}
 			sc->flags &= ~AAC_FLAGS_NEW_COMM;
 		}
-		sc->aac_btag = rman_get_bustag(sc->aac_regs_resource);
-		sc->aac_bhandle = rman_get_bushandle(sc->aac_regs_resource);
+		sc->aac_btag1 = rman_get_bustag(sc->aac_regs_res1);
+		sc->aac_bhandle1 = rman_get_bushandle(sc->aac_regs_res1);
+
+		if (sc->aac_hwif == AAC_HWIF_NARK) {
+			sc->aac_regs_res0 = sc->aac_regs_res1;
+			sc->aac_regs_rid0 = sc->aac_regs_rid1;
+			sc->aac_btag0 = sc->aac_btag1;
+			sc->aac_bhandle0 = sc->aac_bhandle1;
+		}
 	}
 
 	/* Read preferred settings */
@@ -1944,10 +1985,10 @@ aac_init(struct aac_softc *sc)
 	 */
 	switch (sc->aac_hwif) {
 	case AAC_HWIF_I960RX:
-		AAC_SETREG4(sc, AAC_RX_ODBR, ~0);
+		AAC_MEM0_SETREG4(sc, AAC_RX_ODBR, ~0);
 		break;
 	case AAC_HWIF_RKT:
-		AAC_SETREG4(sc, AAC_RKT_ODBR, ~0);
+		AAC_MEM0_SETREG4(sc, AAC_RKT_ODBR, ~0);
 		break;
 	default:
 		break;
@@ -2367,7 +2408,7 @@ aac_sa_get_fwstatus(struct aac_softc *sc
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	return(AAC_GETREG4(sc, AAC_SA_FWSTATUS));
+	return(AAC_MEM0_GETREG4(sc, AAC_SA_FWSTATUS));
 }
 
 static int
@@ -2375,7 +2416,7 @@ aac_rx_get_fwstatus(struct aac_softc *sc
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	return(AAC_GETREG4(sc, AAC_RX_FWSTATUS));
+	return(AAC_MEM0_GETREG4(sc, AAC_RX_OMR0));
 }
 
 static int
@@ -2385,7 +2426,7 @@ aac_fa_get_fwstatus(struct aac_softc *sc
 
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	val = AAC_GETREG4(sc, AAC_FA_FWSTATUS);
+	val = AAC_MEM0_GETREG4(sc, AAC_FA_FWSTATUS);
 	return (val);
 }
 
@@ -2394,7 +2435,7 @@ aac_rkt_get_fwstatus(struct aac_softc *s
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	return(AAC_GETREG4(sc, AAC_RKT_FWSTATUS));
+	return(AAC_MEM0_GETREG4(sc, AAC_RKT_OMR0));
 }
 
 /*
@@ -2406,7 +2447,7 @@ aac_sa_qnotify(struct aac_softc *sc, int
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	AAC_SETREG2(sc, AAC_SA_DOORBELL1_SET, qbit);
+	AAC_MEM0_SETREG2(sc, AAC_SA_DOORBELL1_SET, qbit);
 }
 
 static void
@@ -2414,7 +2455,7 @@ aac_rx_qnotify(struct aac_softc *sc, int
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	AAC_SETREG4(sc, AAC_RX_IDBR, qbit);
+	AAC_MEM0_SETREG4(sc, AAC_RX_IDBR, qbit);
 }
 
 static void
@@ -2422,7 +2463,7 @@ aac_fa_qnotify(struct aac_softc *sc, int
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	AAC_SETREG2(sc, AAC_FA_DOORBELL1, qbit);
+	AAC_MEM0_SETREG2(sc, AAC_FA_DOORBELL1, qbit);
 	AAC_FA_HACK(sc);
 }
 
@@ -2431,7 +2472,7 @@ aac_rkt_qnotify(struct aac_softc *sc, in
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	AAC_SETREG4(sc, AAC_RKT_IDBR, qbit);
+	AAC_MEM0_SETREG4(sc, AAC_RKT_IDBR, qbit);
 }
 
 /*
@@ -2442,7 +2483,7 @@ aac_sa_get_istatus(struct aac_softc *sc)
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	return(AAC_GETREG2(sc, AAC_SA_DOORBELL0));
+	return(AAC_MEM0_GETREG2(sc, AAC_SA_DOORBELL0));
 }
 
 static int
@@ -2450,7 +2491,7 @@ aac_rx_get_istatus(struct aac_softc *sc)
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	return(AAC_GETREG4(sc, AAC_RX_ODBR));
+	return(AAC_MEM0_GETREG4(sc, AAC_RX_ODBR));
 }
 
 static int
@@ -2460,7 +2501,7 @@ aac_fa_get_istatus(struct aac_softc *sc)
 
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	val = AAC_GETREG2(sc, AAC_FA_DOORBELL0);
+	val = AAC_MEM0_GETREG2(sc, AAC_FA_DOORBELL0);
 	return (val);
 }
 
@@ -2469,7 +2510,7 @@ aac_rkt_get_istatus(struct aac_softc *sc
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	return(AAC_GETREG4(sc, AAC_RKT_ODBR));
+	return(AAC_MEM0_GETREG4(sc, AAC_RKT_ODBR));
 }
 
 /*
@@ -2480,7 +2521,7 @@ aac_sa_clear_istatus(struct aac_softc *s
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	AAC_SETREG2(sc, AAC_SA_DOORBELL0_CLEAR, mask);
+	AAC_MEM0_SETREG2(sc, AAC_SA_DOORBELL0_CLEAR, mask);
 }
 
 static void
@@ -2488,7 +2529,7 @@ aac_rx_clear_istatus(struct aac_softc *s
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	AAC_SETREG4(sc, AAC_RX_ODBR, mask);
+	AAC_MEM0_SETREG4(sc, AAC_RX_ODBR, mask);
 }
 
 static void
@@ -2496,7 +2537,7 @@ aac_fa_clear_istatus(struct aac_softc *s
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	AAC_SETREG2(sc, AAC_FA_DOORBELL0_CLEAR, mask);
+	AAC_MEM0_SETREG2(sc, AAC_FA_DOORBELL0_CLEAR, mask);
 	AAC_FA_HACK(sc);
 }
 
@@ -2505,7 +2546,7 @@ aac_rkt_clear_istatus(struct aac_softc *
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	AAC_SETREG4(sc, AAC_RKT_ODBR, mask);
+	AAC_MEM0_SETREG4(sc, AAC_RKT_ODBR, mask);
 }
 
 /*
@@ -2517,11 +2558,11 @@ aac_sa_set_mailbox(struct aac_softc *sc,
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	AAC_SETREG4(sc, AAC_SA_MAILBOX, command);
-	AAC_SETREG4(sc, AAC_SA_MAILBOX + 4, arg0);
-	AAC_SETREG4(sc, AAC_SA_MAILBOX + 8, arg1);
-	AAC_SETREG4(sc, AAC_SA_MAILBOX + 12, arg2);
-	AAC_SETREG4(sc, AAC_SA_MAILBOX + 16, arg3);
+	AAC_MEM1_SETREG4(sc, AAC_SA_MAILBOX, command);
+	AAC_MEM1_SETREG4(sc, AAC_SA_MAILBOX + 4, arg0);
+	AAC_MEM1_SETREG4(sc, AAC_SA_MAILBOX + 8, arg1);
+	AAC_MEM1_SETREG4(sc, AAC_SA_MAILBOX + 12, arg2);
+	AAC_MEM1_SETREG4(sc, AAC_SA_MAILBOX + 16, arg3);
 }
 
 static void
@@ -2530,11 +2571,11 @@ aac_rx_set_mailbox(struct aac_softc *sc,
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	AAC_SETREG4(sc, AAC_RX_MAILBOX, command);
-	AAC_SETREG4(sc, AAC_RX_MAILBOX + 4, arg0);
-	AAC_SETREG4(sc, AAC_RX_MAILBOX + 8, arg1);
-	AAC_SETREG4(sc, AAC_RX_MAILBOX + 12, arg2);
-	AAC_SETREG4(sc, AAC_RX_MAILBOX + 16, arg3);
+	AAC_MEM1_SETREG4(sc, AAC_RX_MAILBOX, command);
+	AAC_MEM1_SETREG4(sc, AAC_RX_MAILBOX + 4, arg0);
+	AAC_MEM1_SETREG4(sc, AAC_RX_MAILBOX + 8, arg1);
+	AAC_MEM1_SETREG4(sc, AAC_RX_MAILBOX + 12, arg2);
+	AAC_MEM1_SETREG4(sc, AAC_RX_MAILBOX + 16, arg3);
 }
 
 static void
@@ -2543,15 +2584,15 @@ aac_fa_set_mailbox(struct aac_softc *sc,
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	AAC_SETREG4(sc, AAC_FA_MAILBOX, command);
+	AAC_MEM1_SETREG4(sc, AAC_FA_MAILBOX, command);
 	AAC_FA_HACK(sc);
-	AAC_SETREG4(sc, AAC_FA_MAILBOX + 4, arg0);
+	AAC_MEM1_SETREG4(sc, AAC_FA_MAILBOX + 4, arg0);
 	AAC_FA_HACK(sc);
-	AAC_SETREG4(sc, AAC_FA_MAILBOX + 8, arg1);
+	AAC_MEM1_SETREG4(sc, AAC_FA_MAILBOX + 8, arg1);
 	AAC_FA_HACK(sc);
-	AAC_SETREG4(sc, AAC_FA_MAILBOX + 12, arg2);
+	AAC_MEM1_SETREG4(sc, AAC_FA_MAILBOX + 12, arg2);
 	AAC_FA_HACK(sc);
-	AAC_SETREG4(sc, AAC_FA_MAILBOX + 16, arg3);
+	AAC_MEM1_SETREG4(sc, AAC_FA_MAILBOX + 16, arg3);
 	AAC_FA_HACK(sc);
 }
 
@@ -2561,11 +2602,11 @@ aac_rkt_set_mailbox(struct aac_softc *sc
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	AAC_SETREG4(sc, AAC_RKT_MAILBOX, command);
-	AAC_SETREG4(sc, AAC_RKT_MAILBOX + 4, arg0);
-	AAC_SETREG4(sc, AAC_RKT_MAILBOX + 8, arg1);
-	AAC_SETREG4(sc, AAC_RKT_MAILBOX + 12, arg2);
-	AAC_SETREG4(sc, AAC_RKT_MAILBOX + 16, arg3);
+	AAC_MEM1_SETREG4(sc, AAC_RKT_MAILBOX, command);
+	AAC_MEM1_SETREG4(sc, AAC_RKT_MAILBOX + 4, arg0);
+	AAC_MEM1_SETREG4(sc, AAC_RKT_MAILBOX + 8, arg1);
+	AAC_MEM1_SETREG4(sc, AAC_RKT_MAILBOX + 12, arg2);
+	AAC_MEM1_SETREG4(sc, AAC_RKT_MAILBOX + 16, arg3);
 }
 
 /*
@@ -2576,7 +2617,7 @@ aac_sa_get_mailbox(struct aac_softc *sc,
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	return(AAC_GETREG4(sc, AAC_SA_MAILBOX + (mb * 4)));
+	return(AAC_MEM1_GETREG4(sc, AAC_SA_MAILBOX + (mb * 4)));
 }
 
 static int
@@ -2584,7 +2625,7 @@ aac_rx_get_mailbox(struct aac_softc *sc,
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	return(AAC_GETREG4(sc, AAC_RX_MAILBOX + (mb * 4)));
+	return(AAC_MEM1_GETREG4(sc, AAC_RX_MAILBOX + (mb * 4)));
 }
 
 static int
@@ -2594,7 +2635,7 @@ aac_fa_get_mailbox(struct aac_softc *sc,
 
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	val = AAC_GETREG4(sc, AAC_FA_MAILBOX + (mb * 4));
+	val = AAC_MEM1_GETREG4(sc, AAC_FA_MAILBOX + (mb * 4));
 	return (val);
 }
 
@@ -2603,7 +2644,7 @@ aac_rkt_get_mailbox(struct aac_softc *sc
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	return(AAC_GETREG4(sc, AAC_RKT_MAILBOX + (mb * 4)));
+	return(AAC_MEM1_GETREG4(sc, AAC_RKT_MAILBOX + (mb * 4)));
 }
 
 /*
@@ -2615,9 +2656,9 @@ aac_sa_set_interrupts(struct aac_softc *
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "%sable interrupts", enable ? "en" : "dis");
 
 	if (enable) {
-		AAC_SETREG2((sc), AAC_SA_MASK0_CLEAR, AAC_DB_INTERRUPTS);
+		AAC_MEM0_SETREG2((sc), AAC_SA_MASK0_CLEAR, AAC_DB_INTERRUPTS);
 	} else {
-		AAC_SETREG2((sc), AAC_SA_MASK0_SET, ~0);
+		AAC_MEM0_SETREG2((sc), AAC_SA_MASK0_SET, ~0);
 	}
 }
 
@@ -2628,11 +2669,11 @@ aac_rx_set_interrupts(struct aac_softc *
 
 	if (enable) {
 		if (sc->flags & AAC_FLAGS_NEW_COMM)
-			AAC_SETREG4(sc, AAC_RX_OIMR, ~AAC_DB_INT_NEW_COMM);
+			AAC_MEM0_SETREG4(sc, AAC_RX_OIMR, ~AAC_DB_INT_NEW_COMM);
 		else
-			AAC_SETREG4(sc, AAC_RX_OIMR, ~AAC_DB_INTERRUPTS);
+			AAC_MEM0_SETREG4(sc, AAC_RX_OIMR, ~AAC_DB_INTERRUPTS);
 	} else {
-		AAC_SETREG4(sc, AAC_RX_OIMR, ~0);
+		AAC_MEM0_SETREG4(sc, AAC_RX_OIMR, ~0);
 	}
 }
 
@@ -2642,10 +2683,10 @@ aac_fa_set_interrupts(struct aac_softc *
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "%sable interrupts", enable ? "en" : "dis");
 
 	if (enable) {
-		AAC_SETREG2((sc), AAC_FA_MASK0_CLEAR, AAC_DB_INTERRUPTS);
+		AAC_MEM0_SETREG2((sc), AAC_FA_MASK0_CLEAR, AAC_DB_INTERRUPTS);
 		AAC_FA_HACK(sc);
 	} else {
-		AAC_SETREG2((sc), AAC_FA_MASK0, ~0);
+		AAC_MEM0_SETREG2((sc), AAC_FA_MASK0, ~0);
 		AAC_FA_HACK(sc);
 	}
 }
@@ -2657,11 +2698,11 @@ aac_rkt_set_interrupts(struct aac_softc 
 
 	if (enable) {
 		if (sc->flags & AAC_FLAGS_NEW_COMM)
-			AAC_SETREG4(sc, AAC_RKT_OIMR, ~AAC_DB_INT_NEW_COMM);
+			AAC_MEM0_SETREG4(sc, AAC_RKT_OIMR, ~AAC_DB_INT_NEW_COMM);
 		else
-			AAC_SETREG4(sc, AAC_RKT_OIMR, ~AAC_DB_INTERRUPTS);
+			AAC_MEM0_SETREG4(sc, AAC_RKT_OIMR, ~AAC_DB_INTERRUPTS);
 	} else {
-		AAC_SETREG4(sc, AAC_RKT_OIMR, ~0);
+		AAC_MEM0_SETREG4(sc, AAC_RKT_OIMR, ~0);
 	}
 }
 
@@ -2675,19 +2716,19 @@ aac_rx_send_command(struct aac_softc *sc
 
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "send command (new comm.)");
 
-	index = AAC_GETREG4(sc, AAC_RX_IQUE);
+	index = AAC_MEM0_GETREG4(sc, AAC_RX_IQUE);
 	if (index == 0xffffffffL)
-		index = AAC_GETREG4(sc, AAC_RX_IQUE);
+		index = AAC_MEM0_GETREG4(sc, AAC_RX_IQUE);
 	if (index == 0xffffffffL)
 		return index;
 	aac_enqueue_busy(cm);
 	device = index;
-	AAC_SETREG4(sc, device, (u_int32_t)(cm->cm_fibphys & 0xffffffffUL));
+	AAC_MEM1_SETREG4(sc, device, (u_int32_t)(cm->cm_fibphys & 0xffffffffUL));
 	device += 4;
-	AAC_SETREG4(sc, device, (u_int32_t)(cm->cm_fibphys >> 32));
+	AAC_MEM1_SETREG4(sc, device, (u_int32_t)(cm->cm_fibphys >> 32));
 	device += 4;
-	AAC_SETREG4(sc, device, cm->cm_fib->Header.Size);
-	AAC_SETREG4(sc, AAC_RX_IQUE, index);
+	AAC_MEM1_SETREG4(sc, device, cm->cm_fib->Header.Size);
+	AAC_MEM0_SETREG4(sc, AAC_RX_IQUE, index);
 	return 0;
 }
 
@@ -2698,19 +2739,19 @@ aac_rkt_send_command(struct aac_softc *s
 
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "send command (new comm.)");
 
-	index = AAC_GETREG4(sc, AAC_RKT_IQUE);
+	index = AAC_MEM0_GETREG4(sc, AAC_RKT_IQUE);
 	if (index == 0xffffffffL)
-		index = AAC_GETREG4(sc, AAC_RKT_IQUE);
+		index = AAC_MEM0_GETREG4(sc, AAC_RKT_IQUE);
 	if (index == 0xffffffffL)
 		return index;
 	aac_enqueue_busy(cm);
 	device = index;
-	AAC_SETREG4(sc, device, (u_int32_t)(cm->cm_fibphys & 0xffffffffUL));
+	AAC_MEM1_SETREG4(sc, device, (u_int32_t)(cm->cm_fibphys & 0xffffffffUL));
 	device += 4;
-	AAC_SETREG4(sc, device, (u_int32_t)(cm->cm_fibphys >> 32));
+	AAC_MEM1_SETREG4(sc, device, (u_int32_t)(cm->cm_fibphys >> 32));
 	device += 4;
-	AAC_SETREG4(sc, device, cm->cm_fib->Header.Size);
-	AAC_SETREG4(sc, AAC_RKT_IQUE, index);
+	AAC_MEM1_SETREG4(sc, device, cm->cm_fib->Header.Size);
+	AAC_MEM0_SETREG4(sc, AAC_RKT_IQUE, index);
 	return 0;
 }
 
@@ -2722,7 +2763,7 @@ aac_rx_get_outb_queue(struct aac_softc *
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	return(AAC_GETREG4(sc, AAC_RX_OQUE));
+	return(AAC_MEM0_GETREG4(sc, AAC_RX_OQUE));
 }
 
 static int
@@ -2730,7 +2771,7 @@ aac_rkt_get_outb_queue(struct aac_softc 
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	return(AAC_GETREG4(sc, AAC_RKT_OQUE));
+	return(AAC_MEM0_GETREG4(sc, AAC_RKT_OQUE));
 }
 
 static void
@@ -2738,7 +2779,7 @@ aac_rx_set_outb_queue(struct aac_softc *
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	AAC_SETREG4(sc, AAC_RX_OQUE, index);
+	AAC_MEM0_SETREG4(sc, AAC_RX_OQUE, index);
 }
 
 static void
@@ -2746,7 +2787,7 @@ aac_rkt_set_outb_queue(struct aac_softc 
 {
 	fwprintf(sc, HBA_FLAGS_DBG_FUNCTION_ENTRY_B, "");
 
-	AAC_SETREG4(sc, AAC_RKT_OQUE, index);
+	AAC_MEM0_SETREG4(sc, AAC_RKT_OQUE, index);
 }
 
 /*

Modified: user/alc/pagelock/sys/dev/aac/aac_debug.c
==============================================================================
--- user/alc/pagelock/sys/dev/aac/aac_debug.c	Sat Feb 21 21:02:53 2009	(r188901)
+++ user/alc/pagelock/sys/dev/aac/aac_debug.c	Sat Feb 21 21:12:54 2009	(r188902)
@@ -134,17 +134,18 @@ aac_printstate0(void)
 	aac_print_queues(sc);
 	switch (sc->aac_hwif) {
 	case AAC_HWIF_I960RX:
+	case AAC_HWIF_NARK:
 		device_printf(sc->aac_dev, "IDBR 0x%08x  IIMR 0x%08x  "
-		    "IISR 0x%08x\n", AAC_GETREG4(sc, AAC_RX_IDBR),
-		    AAC_GETREG4(sc, AAC_RX_IIMR), AAC_GETREG4(sc, AAC_RX_IISR));
+		    "IISR 0x%08x\n", AAC_MEM0_GETREG4(sc, AAC_RX_IDBR),
+		    AAC_MEM0_GETREG4(sc, AAC_RX_IIMR), AAC_MEM0_GETREG4(sc, AAC_RX_IISR));
 		device_printf(sc->aac_dev, "ODBR 0x%08x  OIMR 0x%08x  "
-		    "OISR 0x%08x\n", AAC_GETREG4(sc, AAC_RX_ODBR),
-		    AAC_GETREG4(sc, AAC_RX_OIMR), AAC_GETREG4(sc, AAC_RX_OISR));
-		AAC_SETREG4(sc, AAC_RX_OIMR, 0/*~(AAC_DB_COMMAND_READY |
+		    "OISR 0x%08x\n", AAC_MEM0_GETREG4(sc, AAC_RX_ODBR),
+		    AAC_MEM0_GETREG4(sc, AAC_RX_OIMR), AAC_MEM0_GETREG4(sc, AAC_RX_OISR));
+		AAC_MEM0_SETREG4(sc, AAC_RX_OIMR, 0/*~(AAC_DB_COMMAND_READY |
 			    AAC_DB_RESPONSE_READY | AAC_DB_PRINTF)*/);
 		device_printf(sc->aac_dev, "ODBR 0x%08x  OIMR 0x%08x  "
-		    "OISR 0x%08x\n", AAC_GETREG4(sc, AAC_RX_ODBR),
-		    AAC_GETREG4(sc, AAC_RX_OIMR), AAC_GETREG4(sc, AAC_RX_OISR));
+		    "OISR 0x%08x\n", AAC_MEM0_GETREG4(sc, AAC_RX_ODBR),
+		    AAC_MEM0_GETREG4(sc, AAC_RX_OIMR), AAC_MEM0_GETREG4(sc, AAC_RX_OISR));
 		break;
 	case AAC_HWIF_STRONGARM:
 		/* XXX implement */

Modified: user/alc/pagelock/sys/dev/aac/aac_pci.c
==============================================================================
--- user/alc/pagelock/sys/dev/aac/aac_pci.c	Sat Feb 21 21:02:53 2009	(r188901)
+++ user/alc/pagelock/sys/dev/aac/aac_pci.c	Sat Feb 21 21:12:54 2009	(r188902)
@@ -372,21 +372,32 @@ aac_pci_attach(device_t dev)
 	/*
 	 * Allocate the PCI register window.
 	 */
-	sc->aac_regs_rid = PCIR_BAR(0);
-	if ((sc->aac_regs_resource = bus_alloc_resource_any(sc->aac_dev,
-							    SYS_RES_MEMORY,
-							    &sc->aac_regs_rid,
-							    RF_ACTIVE)) ==
-							    NULL) {
+	sc->aac_regs_rid0 = PCIR_BAR(0);
+	if ((sc->aac_regs_res0 = bus_alloc_resource_any(sc->aac_dev,
+	    SYS_RES_MEMORY, &sc->aac_regs_rid0, RF_ACTIVE)) == NULL) {
 		device_printf(sc->aac_dev,
-			      "couldn't allocate register window\n");
+		    "couldn't allocate register window 0\n");
 		goto out;
 	}
-	sc->aac_btag = rman_get_bustag(sc->aac_regs_resource);
-	sc->aac_bhandle = rman_get_bushandle(sc->aac_regs_resource);
+	sc->aac_btag0 = rman_get_bustag(sc->aac_regs_res0);
+	sc->aac_bhandle0 = rman_get_bushandle(sc->aac_regs_res0);
 
-	/* assume failure is 'out of memory' */
-	error = ENOMEM;
+	if (sc->aac_hwif == AAC_HWIF_NARK) {
+		sc->aac_regs_rid1 = PCIR_BAR(1);
+		if ((sc->aac_regs_res1 = bus_alloc_resource_any(sc->aac_dev,
+		    SYS_RES_MEMORY, &sc->aac_regs_rid1, RF_ACTIVE)) == NULL) {
+			device_printf(sc->aac_dev,
+			    "couldn't allocate register window 1\n");
+			goto out;
+		}
+		sc->aac_btag1 = rman_get_bustag(sc->aac_regs_res1);
+		sc->aac_bhandle1 = rman_get_bushandle(sc->aac_regs_res1);
+	} else {
+		sc->aac_regs_res1 = sc->aac_regs_res0;
+		sc->aac_regs_rid1 = sc->aac_regs_rid0;
+		sc->aac_btag1 = sc->aac_btag0;
+		sc->aac_bhandle1 = sc->aac_bhandle0;
+	}
 
 	/*
 	 * Allocate the parent bus DMA tag appropriate for our PCI interface.
@@ -416,7 +427,8 @@ aac_pci_attach(device_t dev)
 	sc->aac_hwif = id->hwif;
 	switch(sc->aac_hwif) {
 	case AAC_HWIF_I960RX:
-		fwprintf(sc, HBA_FLAGS_DBG_INIT_B, "set hardware up for i960Rx");
+	case AAC_HWIF_NARK:
+		fwprintf(sc, HBA_FLAGS_DBG_INIT_B, "set hardware up for i960Rx/NARK");
 		sc->aac_if = aac_rx_interface;
 		break;
 	case AAC_HWIF_STRONGARM:

Modified: user/alc/pagelock/sys/dev/aac/aacreg.h
==============================================================================
--- user/alc/pagelock/sys/dev/aac/aacreg.h	Sat Feb 21 21:02:53 2009	(r188901)
+++ user/alc/pagelock/sys/dev/aac/aacreg.h	Sat Feb 21 21:12:54 2009	(r188902)
@@ -1468,7 +1468,7 @@ enum {
 #define	AAC_FA_FWSTATUS			0x2c	/* Mailbox 7 */
 #define	AAC_FA_INTSRC			0x900
 
-#define AAC_FA_HACK(sc)	(void)AAC_GETREG4(sc, AAC_FA_INTSRC)
+#define AAC_FA_HACK(sc)	(void)AAC_MEM0_GETREG4(sc, AAC_FA_INTSRC)
 
 /*
  * Register definitions for the Adaptec AAC-364 'Jalapeno I/II' adapters, based
@@ -1495,6 +1495,8 @@ enum {
  * and other related adapters.
  */
 
+#define AAC_RX_OMR0		0x18	/* outbound message register 0 */
+#define AAC_RX_OMR1		0x1c	/* outbound message register 1 */
 #define AAC_RX_IDBR		0x20	/* inbound doorbell register */
 #define AAC_RX_IISR		0x24	/* inbound interrupt status register */
 #define AAC_RX_IIMR		0x28	/* inbound interrupt mask register */

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