From owner-svn-src-user@FreeBSD.ORG  Mon Dec 15 06:33:55 2008
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 2A941106564A;
	Mon, 15 Dec 2008 06:33:55 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F33938FC16;
	Mon, 15 Dec 2008 06:33:54 +0000 (UTC)
	(envelope-from kmacy@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 mBF6XsgF086789;
	Mon, 15 Dec 2008 06:33:54 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBF6Xs1m086788;
	Mon, 15 Dec 2008 06:33:54 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200812150633.mBF6Xs1m086788@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Mon, 15 Dec 2008 06:33:54 +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: r186120 - user/kmacy/HEAD_flowtable
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, 15 Dec 2008 06:33:55 -0000

Author: kmacy
Date: Mon Dec 15 06:33:54 2008
New Revision: 186120
URL: http://svn.freebsd.org/changeset/base/186120

Log:
  Create new branch for testing flowtable and network locking changes

Added:
  user/kmacy/HEAD_flowtable/   (props changed)
     - copied from r186119, head/

From owner-svn-src-user@FreeBSD.ORG  Mon Dec 15 15:41:29 2008
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 07C3A106564A;
	Mon, 15 Dec 2008 15:41:29 +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 E6E758FC2C;
	Mon, 15 Dec 2008 15:41:28 +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 mBFFfSVS099102;
	Mon, 15 Dec 2008 15:41:28 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBFFfSqJ099101;
	Mon, 15 Dec 2008 15:41:28 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200812151541.mBFFfSqJ099101@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Mon, 15 Dec 2008 15:41:28 +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: r186129 - user/dfr/xenhvm/6/sys/dev/xen/console
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, 15 Dec 2008 15:41:29 -0000

Author: dfr
Date: Mon Dec 15 15:41:28 2008
New Revision: 186129
URL: http://svn.freebsd.org/changeset/base/186129

Log:
  Make console input work when in DDB.

Modified:
  user/dfr/xenhvm/6/sys/dev/xen/console/console.c

Modified: user/dfr/xenhvm/6/sys/dev/xen/console/console.c
==============================================================================
--- user/dfr/xenhvm/6/sys/dev/xen/console/console.c	Mon Dec 15 15:31:10 2008	(r186128)
+++ user/dfr/xenhvm/6/sys/dev/xen/console/console.c	Mon Dec 15 15:41:28 2008	(r186129)
@@ -19,6 +19,7 @@
 #include <xen/xen_intr.h>
 #include <sys/cons.h>
 #include <sys/proc.h>
+#include <sys/kdb.h>
 
 #include <dev/xen/console/xencons_ring.h>
 #include <xen/interface/io/console.h>
@@ -140,12 +141,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;
@@ -155,11 +161,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++;
@@ -295,7 +303,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];
@@ -549,12 +561,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:
- */

From owner-svn-src-user@FreeBSD.ORG  Mon Dec 15 15:42:24 2008
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 D95891065673;
	Mon, 15 Dec 2008 15:42:24 +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 C2F098FC1B;
	Mon, 15 Dec 2008 15:42:24 +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 mBFFgOb8099161;
	Mon, 15 Dec 2008 15:42:24 GMT (envelope-from dfr@svn.freebsd.org)
Received: (from dfr@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBFFgOJF099155;
	Mon, 15 Dec 2008 15:42:24 GMT (envelope-from dfr@svn.freebsd.org)
Message-Id: <200812151542.mBFFgOJF099155@svn.freebsd.org>
From: Doug Rabson <dfr@FreeBSD.org>
Date: Mon, 15 Dec 2008 15:42:24 +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: r186130 - in user/dfr/xenhvm/6/sys: dev/xen/blkfront
	i386/include/xen i386/xen xen 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, 15 Dec 2008 15:42:24 -0000

Author: dfr
Date: Mon Dec 15 15:42:24 2008
New Revision: 186130
URL: http://svn.freebsd.org/changeset/base/186130

Log:
  Fix PV mode suspend/resume.

Modified:
  user/dfr/xenhvm/6/sys/dev/xen/blkfront/blkfront.c
  user/dfr/xenhvm/6/sys/i386/include/xen/xenpmap.h
  user/dfr/xenhvm/6/sys/i386/xen/pmap.c
  user/dfr/xenhvm/6/sys/xen/evtchn/evtchn.c
  user/dfr/xenhvm/6/sys/xen/gnttab.c
  user/dfr/xenhvm/6/sys/xen/reboot.c

Modified: user/dfr/xenhvm/6/sys/dev/xen/blkfront/blkfront.c
==============================================================================
--- user/dfr/xenhvm/6/sys/dev/xen/blkfront/blkfront.c	Mon Dec 15 15:41:28 2008	(r186129)
+++ user/dfr/xenhvm/6/sys/dev/xen/blkfront/blkfront.c	Mon Dec 15 15:42:24 2008	(r186130)
@@ -370,6 +370,19 @@ blkfront_attach(device_t dev)
 }
 
 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);
+}
+
+static int
 blkfront_resume(device_t dev)
 {
 	struct blkfront_info *info = device_get_softc(dev);
@@ -377,7 +390,7 @@ blkfront_resume(device_t dev)
 
 	DPRINTK("blkfront_resume: %s\n", xenbus_get_node(dev));
 
-	blkif_free(info, info->connected == BLKIF_STATE_CONNECTED);
+	blkif_free(info, 1);
 	err = talk_to_backend(dev, info);
 	if (info->connected == BLKIF_STATE_SUSPENDED && !err)
 		blkif_recover(info);
@@ -1082,7 +1095,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/6/sys/i386/include/xen/xenpmap.h
==============================================================================
--- user/dfr/xenhvm/6/sys/i386/include/xen/xenpmap.h	Mon Dec 15 15:41:28 2008	(r186129)
+++ user/dfr/xenhvm/6/sys/i386/include/xen/xenpmap.h	Mon Dec 15 15:42:24 2008	(r186130)
@@ -49,6 +49,8 @@ void xen_check_queue(void);
 #if 0
 void pmap_ref(pt_entry_t *pte, vm_paddr_t ma);
 #endif
+void pmap_suspend(void);
+void pmap_resume(void);
 
 #ifdef INVARIANTS
 #define xen_queue_pt_update(a, b) _xen_queue_pt_update((a), (b), __FILE__, __LINE__)

Modified: user/dfr/xenhvm/6/sys/i386/xen/pmap.c
==============================================================================
--- user/dfr/xenhvm/6/sys/i386/xen/pmap.c	Mon Dec 15 15:41:28 2008	(r186129)
+++ user/dfr/xenhvm/6/sys/i386/xen/pmap.c	Mon Dec 15 15:42:24 2008	(r186130)
@@ -3701,6 +3701,71 @@ pmap_addr_hint(vm_object_t obj, vm_offse
 	return addr;
 }
 
+#ifdef XEN
+
+void
+pmap_suspend()
+{
+	pmap_t pmap;
+	int i, pdir, offset;
+	vm_paddr_t pdirma;
+	mmu_update_t mu[4];
+
+	/*
+	 * We need to remove the recursive mapping structure from all
+	 * our pmaps so that Xen doesn't get confused when it restores
+	 * the page tables. The recursive map lives at page directory
+	 * index PTDPTDI. We assume that the suspend code has stopped
+	 * the other vcpus (if any).
+	 */
+	LIST_FOREACH(pmap, &allpmaps, pm_list) {
+		for (i = 0; i < 4; i++) {
+			/*
+			 * Figure out which page directory (L2) page
+			 * contains this bit of the recursive map and
+			 * the offset within that page of the map
+			 * entry
+			 */
+			pdir = (PTDPTDI + i) / NPDEPG;
+			offset = (PTDPTDI + i) % NPDEPG;
+			pdirma = pmap->pm_pdpt[pdir] & PG_FRAME;
+			mu[i].ptr = pdirma + offset * sizeof(pd_entry_t);
+			mu[i].val = 0;
+		}
+		HYPERVISOR_mmu_update(mu, 4, NULL, DOMID_SELF);
+	}
+}
+
+void
+pmap_resume()
+{
+	pmap_t pmap;
+	int i, pdir, offset;
+	vm_paddr_t pdirma;
+	mmu_update_t mu[4];
+
+	/*
+	 * Restore the recursive map that we removed on suspend.
+	 */
+	LIST_FOREACH(pmap, &allpmaps, pm_list) {
+		for (i = 0; i < 4; i++) {
+			/*
+			 * Figure out which page directory (L2) page
+			 * contains this bit of the recursive map and
+			 * the offset within that page of the map
+			 * entry
+			 */
+			pdir = (PTDPTDI + i) / NPDEPG;
+			offset = (PTDPTDI + i) % NPDEPG;
+			pdirma = pmap->pm_pdpt[pdir] & PG_FRAME;
+			mu[i].ptr = pdirma + offset * sizeof(pd_entry_t);
+			mu[i].val = (pmap->pm_pdpt[i] & PG_FRAME) | PG_V;
+		}
+		HYPERVISOR_mmu_update(mu, 4, NULL, DOMID_SELF);
+	}
+}
+
+#endif
 
 #if defined(PMAP_DEBUG)
 pmap_pid_dump(int pid)

Modified: user/dfr/xenhvm/6/sys/xen/evtchn/evtchn.c
==============================================================================
--- user/dfr/xenhvm/6/sys/xen/evtchn/evtchn.c	Mon Dec 15 15:41:28 2008	(r186129)
+++ user/dfr/xenhvm/6/sys/xen/evtchn/evtchn.c	Mon Dec 15 15:42:24 2008	(r186130)
@@ -265,6 +265,7 @@ bind_caller_port_to_irq(unsigned int cal
         }
 
         irq_bindcount[irq]++;
+	unmask_evtchn(caller_port);
 
  out:
         mtx_unlock_spin(&irq_mapping_update_lock);
@@ -291,6 +292,7 @@ bind_local_port_to_irq(unsigned int loca
         evtchn_to_irq[local_port] = irq;
         irq_info[irq] = mk_irq_info(IRQT_LOCAL_PORT, 0, local_port);
         irq_bindcount[irq]++;
+	unmask_evtchn(local_port);
 
  out:
         mtx_unlock_spin(&irq_mapping_update_lock);
@@ -752,7 +754,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 */

Modified: user/dfr/xenhvm/6/sys/xen/gnttab.c
==============================================================================
--- user/dfr/xenhvm/6/sys/xen/gnttab.c	Mon Dec 15 15:41:28 2008	(r186129)
+++ user/dfr/xenhvm/6/sys/xen/gnttab.c	Mon Dec 15 15:42:24 2008	(r186130)
@@ -515,12 +515,10 @@ gnttab_resume(void)
 int
 gnttab_suspend(void)
 {	
-	int i, pages;
-
-	pages = (PAGE_SIZE*nr_grant_frames) >> PAGE_SHIFT;
+	int i;
 
-	for (i = 0; i < pages; i++)
-		PT_SET_MA(shared + (i*PAGE_SIZE), (vm_paddr_t)0);
+	for (i = 0; i < nr_grant_frames; i++)
+		pmap_kremove((vm_offset_t) shared + i * PAGE_SIZE);
 
 	return (0);
 }

Modified: user/dfr/xenhvm/6/sys/xen/reboot.c
==============================================================================
--- user/dfr/xenhvm/6/sys/xen/reboot.c	Mon Dec 15 15:41:28 2008	(r186129)
+++ user/dfr/xenhvm/6/sys/xen/reboot.c	Mon Dec 15 15:42:24 2008	(r186130)
@@ -169,7 +169,7 @@ static void 
 xen_suspend()
 {
 	int i, j, k, fpp;
-	unsigned long max_pfn;
+	unsigned long max_pfn, start_info_mfn;
 
 #ifdef SMP
 	cpumask_t map;
@@ -212,7 +212,10 @@ xen_suspend()
 	 * We'll stop somewhere inside this hypercall. When it returns,
 	 * we'll start resuming after the restore.
 	 */
-	HYPERVISOR_suspend(VTOMFN(xen_start_info));
+	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;
@@ -235,12 +238,9 @@ xen_suspend()
 
 	gnttab_resume();
 	irq_resume();
-	cpu_initclocks();
 	local_irq_enable();
 	xencons_resume();
 
-	printf("UP\n");
-
 #ifdef CONFIG_SMP
 	for_each_cpu(i)
 		vcpu_prepare(i);

From owner-svn-src-user@FreeBSD.ORG  Tue Dec 16 09:06:48 2008
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 2AE86106564A;
	Tue, 16 Dec 2008 09:06:48 +0000 (UTC)
	(envelope-from mlaier@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 005228FC3C;
	Tue, 16 Dec 2008 09:06:48 +0000 (UTC)
	(envelope-from mlaier@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 mBG96ldS031858;
	Tue, 16 Dec 2008 09:06:47 GMT (envelope-from mlaier@svn.freebsd.org)
Received: (from mlaier@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBG96lI7031857;
	Tue, 16 Dec 2008 09:06:47 GMT (envelope-from mlaier@svn.freebsd.org)
Message-Id: <200812160906.mBG96lI7031857@svn.freebsd.org>
From: Max Laier <mlaier@FreeBSD.org>
Date: Tue, 16 Dec 2008 09:06:47 +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: r186172 - in user/mlaier/pf44head: .
	tools/regression/bin/sh/builtins
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, 16 Dec 2008 09:06:48 -0000

Author: mlaier
Date: Tue Dec 16 09:06:47 2008
New Revision: 186172
URL: http://svn.freebsd.org/changeset/base/186172

Log:
  Initialize mergeinfo in order to pull in recent head changes.

Modified:
  user/mlaier/pf44head/   (props changed)
  user/mlaier/pf44head/tools/regression/bin/sh/builtins/type1.0.stderr   (props changed)

From owner-svn-src-user@FreeBSD.ORG  Tue Dec 16 09:15:49 2008
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 8FCF01065672;
	Tue, 16 Dec 2008 09:15:49 +0000 (UTC)
	(envelope-from mlaier@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7A94D8FC1F;
	Tue, 16 Dec 2008 09:15:49 +0000 (UTC)
	(envelope-from mlaier@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 mBG9Fnlq032106;
	Tue, 16 Dec 2008 09:15:49 GMT (envelope-from mlaier@svn.freebsd.org)
Received: (from mlaier@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBG9FmGS032076;
	Tue, 16 Dec 2008 09:15:48 GMT (envelope-from mlaier@svn.freebsd.org)
Message-Id: <200812160915.mBG9FmGS032076@svn.freebsd.org>
From: Max Laier <mlaier@FreeBSD.org>
Date: Tue, 16 Dec 2008 09:15: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: r186173 - in user/mlaier/pf44head: .
	contrib/binutils/bfd contrib/binutils/gas/config
	contrib/binutils/ld/emulparams contrib/bsnmp/snmp_mibII
	contrib/ipfilter/ipsend contrib/openpam etc...
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, 16 Dec 2008 09:15:49 -0000

Author: mlaier
Date: Tue Dec 16 09:15:47 2008
New Revision: 186173
URL: http://svn.freebsd.org/changeset/base/186173

Log:
  merge recent head changes: arp-v2, vimage switch

Added:
  user/mlaier/pf44head/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh
     - copied unchanged from r186172, head/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh
  user/mlaier/pf44head/gnu/usr.bin/binutils/as/mips-freebsd/
     - copied from r186172, head/gnu/usr.bin/binutils/as/mips-freebsd/
  user/mlaier/pf44head/gnu/usr.bin/binutils/ld/Makefile.mips
     - copied unchanged from r186172, head/gnu/usr.bin/binutils/ld/Makefile.mips
  user/mlaier/pf44head/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh
     - copied unchanged from r186172, head/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh
  user/mlaier/pf44head/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh
     - copied unchanged from r186172, head/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh
  user/mlaier/pf44head/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh
     - copied unchanged from r186172, head/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh
  user/mlaier/pf44head/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh
     - copied unchanged from r186172, head/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh
  user/mlaier/pf44head/gnu/usr.bin/binutils/libbfd/Makefile.mips
     - copied unchanged from r186172, head/gnu/usr.bin/binutils/libbfd/Makefile.mips
  user/mlaier/pf44head/gnu/usr.bin/binutils/libopcodes/Makefile.mips
     - copied unchanged from r186172, head/gnu/usr.bin/binutils/libopcodes/Makefile.mips
  user/mlaier/pf44head/lib/libc/include/isc/platform.h
     - copied unchanged from r186172, head/lib/libc/include/isc/platform.h
  user/mlaier/pf44head/share/man/man9/VOP_VPTOCNP.9
     - copied unchanged from r186172, head/share/man/man9/VOP_VPTOCNP.9
  user/mlaier/pf44head/sys/kern/kern_vimage.c
     - copied unchanged from r186172, head/sys/kern/kern_vimage.c
  user/mlaier/pf44head/sys/net/if_llatbl.c
     - copied unchanged from r186172, head/sys/net/if_llatbl.c
  user/mlaier/pf44head/sys/net/if_llatbl.h
     - copied unchanged from r186172, head/sys/net/if_llatbl.h
Deleted:
  user/mlaier/pf44head/sys/modules/ath_rate_amrr/
  user/mlaier/pf44head/sys/modules/ath_rate_onoe/
  user/mlaier/pf44head/sys/modules/ath_rate_sample/
  user/mlaier/pf44head/sys/sparc64/include/ofw_bus.h
  user/mlaier/pf44head/sys/sparc64/sparc64/ofw_bus.c
  user/mlaier/pf44head/sys/sun4v/include/ofw_bus.h
Modified:
  user/mlaier/pf44head/   (props changed)
  user/mlaier/pf44head/UPDATING
  user/mlaier/pf44head/contrib/binutils/bfd/config.bfd
  user/mlaier/pf44head/contrib/binutils/gas/config/tc-mips.c
  user/mlaier/pf44head/contrib/bsnmp/snmp_mibII/mibII.c
  user/mlaier/pf44head/contrib/bsnmp/snmp_mibII/mibII_route.c
  user/mlaier/pf44head/contrib/ipfilter/ipsend/44arp.c
  user/mlaier/pf44head/contrib/openpam/   (props changed)
  user/mlaier/pf44head/etc/regdomain.xml
  user/mlaier/pf44head/gnu/usr.bin/binutils/as/Makefile
  user/mlaier/pf44head/gnu/usr.bin/binutils/libbfd/bfd.h
  user/mlaier/pf44head/gnu/usr.bin/groff/tmac/mdoc.local
  user/mlaier/pf44head/include/arpa/nameser.h
  user/mlaier/pf44head/include/resolv.h
  user/mlaier/pf44head/lib/libc/include/isc/eventlib.h   (contents, props changed)
  user/mlaier/pf44head/lib/libc/inet/inet_net_pton.c
  user/mlaier/pf44head/lib/libc/net/rcmd.3
  user/mlaier/pf44head/lib/libc/resolv/res_debug.c
  user/mlaier/pf44head/lib/libc/resolv/res_mkquery.c
  user/mlaier/pf44head/lib/libc/resolv/res_query.c
  user/mlaier/pf44head/lib/libc/resolv/res_send.c
  user/mlaier/pf44head/lib/libc/stdio/vfprintf.c
  user/mlaier/pf44head/lib/libc/stdio/vfwprintf.c
  user/mlaier/pf44head/lib/libfetch/fetch.3
  user/mlaier/pf44head/lib/libfetch/fetch.h
  user/mlaier/pf44head/lib/libfetch/http.c
  user/mlaier/pf44head/lib/libstand/if_ether.h
  user/mlaier/pf44head/libexec/bootpd/rtmsg.c
  user/mlaier/pf44head/release/picobsd/tinyware/ns/ns.c
  user/mlaier/pf44head/sbin/atacontrol/atacontrol.8
  user/mlaier/pf44head/sbin/devd/devd.cc
  user/mlaier/pf44head/sbin/devd/devd.conf.5
  user/mlaier/pf44head/sbin/geom/misc/subr.c
  user/mlaier/pf44head/sbin/ifconfig/ifieee80211.c
  user/mlaier/pf44head/sbin/ifconfig/regdomain.c
  user/mlaier/pf44head/sbin/ifconfig/regdomain.h
  user/mlaier/pf44head/sbin/newfs/newfs.c
  user/mlaier/pf44head/sbin/route/route.c
  user/mlaier/pf44head/sbin/routed/table.c
  user/mlaier/pf44head/share/man/man4/Makefile
  user/mlaier/pf44head/share/man/man4/acpi_aiboost.4
  user/mlaier/pf44head/share/man/man4/cxgb.4
  user/mlaier/pf44head/share/man/man4/ddb.4
  user/mlaier/pf44head/share/man/man4/fxp.4
  user/mlaier/pf44head/share/man/man4/route.4
  user/mlaier/pf44head/share/man/man9/Makefile
  user/mlaier/pf44head/share/man/man9/ifnet.9
  user/mlaier/pf44head/share/man/man9/rtalloc.9
  user/mlaier/pf44head/share/man/man9/rtentry.9
  user/mlaier/pf44head/sys/amd64/amd64/exception.S
  user/mlaier/pf44head/sys/amd64/amd64/genassym.c
  user/mlaier/pf44head/sys/amd64/amd64/identcpu.c
  user/mlaier/pf44head/sys/amd64/amd64/local_apic.c
  user/mlaier/pf44head/sys/amd64/include/apicreg.h
  user/mlaier/pf44head/sys/amd64/include/apicvar.h
  user/mlaier/pf44head/sys/amd64/include/specialreg.h
  user/mlaier/pf44head/sys/boot/Makefile
  user/mlaier/pf44head/sys/boot/zfs/zfs.c
  user/mlaier/pf44head/sys/compat/freebsd32/freebsd32_signal.h
  user/mlaier/pf44head/sys/compat/linprocfs/linprocfs.c
  user/mlaier/pf44head/sys/conf/NOTES
  user/mlaier/pf44head/sys/conf/files
  user/mlaier/pf44head/sys/conf/files.sparc64
  user/mlaier/pf44head/sys/conf/files.sun4v
  user/mlaier/pf44head/sys/conf/options
  user/mlaier/pf44head/sys/contrib/pf/net/pf.c
  user/mlaier/pf44head/sys/contrib/pf/net/pf_if.c
  user/mlaier/pf44head/sys/contrib/pf/net/pf_subr.c
  user/mlaier/pf44head/sys/contrib/rdma/rdma_addr.c
  user/mlaier/pf44head/sys/dev/acpica/acpi_smbat.c
  user/mlaier/pf44head/sys/dev/ath/ath_hal/ah.c   (contents, props changed)
  user/mlaier/pf44head/sys/dev/ath/ath_hal/ah_eeprom_v14.c   (contents, props changed)
  user/mlaier/pf44head/sys/dev/ath/ath_hal/ah_eeprom_v3.c   (contents, props changed)
  user/mlaier/pf44head/sys/dev/ath/ath_hal/ah_internal.h   (contents, props changed)
  user/mlaier/pf44head/sys/dev/ath/ath_hal/ar5212/ar5111.c   (contents, props changed)
  user/mlaier/pf44head/sys/dev/ath/ath_hal/ar5212/ar5212_misc.c   (contents, props changed)
  user/mlaier/pf44head/sys/dev/ath/ath_hal/ar5312/ar5312.h   (contents, props changed)
  user/mlaier/pf44head/sys/dev/ath/ath_hal/ar5312/ar5312_attach.c   (contents, props changed)
  user/mlaier/pf44head/sys/dev/bce/if_bce.c
  user/mlaier/pf44head/sys/dev/cxgb/ulp/tom/cxgb_l2t.c
  user/mlaier/pf44head/sys/dev/cxgb/ulp/tom/cxgb_l2t.h
  user/mlaier/pf44head/sys/dev/hwpmc/hwpmc_logging.c
  user/mlaier/pf44head/sys/dev/hwpmc/hwpmc_mod.c
  user/mlaier/pf44head/sys/dev/isp/isp.c
  user/mlaier/pf44head/sys/dev/mfi/mfi.c
  user/mlaier/pf44head/sys/dev/mfi/mfi_pci.c
  user/mlaier/pf44head/sys/dev/ofw/ofw_bus_subr.c
  user/mlaier/pf44head/sys/dev/ofw/ofw_bus_subr.h
  user/mlaier/pf44head/sys/dev/ofw/openfirm.h
  user/mlaier/pf44head/sys/dev/pccbb/pccbb_pci.c
  user/mlaier/pf44head/sys/dev/re/if_re.c
  user/mlaier/pf44head/sys/dev/snp/snp.c
  user/mlaier/pf44head/sys/dev/sound/pci/hda/hdac.c
  user/mlaier/pf44head/sys/dev/usb/ucom.c
  user/mlaier/pf44head/sys/dev/usb/ucomvar.h
  user/mlaier/pf44head/sys/dev/usb/uftdi.c
  user/mlaier/pf44head/sys/dev/usb/usbdevs
  user/mlaier/pf44head/sys/dev/usb2/bluetooth/ng_ubt2.c
  user/mlaier/pf44head/sys/dev/usb2/bluetooth/ubtbcmfw2.c
  user/mlaier/pf44head/sys/dev/usb2/controller/at91dci.c
  user/mlaier/pf44head/sys/dev/usb2/controller/at91dci_atmelarm.c
  user/mlaier/pf44head/sys/dev/usb2/controller/ehci2.c
  user/mlaier/pf44head/sys/dev/usb2/controller/ehci2_pci.c
  user/mlaier/pf44head/sys/dev/usb2/controller/musb2_otg.c
  user/mlaier/pf44head/sys/dev/usb2/controller/musb2_otg_atmelarm.c
  user/mlaier/pf44head/sys/dev/usb2/controller/ohci2.c
  user/mlaier/pf44head/sys/dev/usb2/controller/uhci2.c
  user/mlaier/pf44head/sys/dev/usb2/controller/usb2_controller.c
  user/mlaier/pf44head/sys/dev/usb2/controller/uss820dci.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_busdma.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_busdma.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_compat_linux.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_compat_linux.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_config_td.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_config_td.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_core.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_debug.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_dev.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_dev.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_device.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_device.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_dynamic.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_dynamic.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_error.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_generic.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_handle_request.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_hid.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_hub.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_hub.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_lookup.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_mbuf.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_msctest.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_msctest.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_parse.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_process.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_process.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_request.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_request.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_sw_transfer.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_sw_transfer.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_transfer.c
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_transfer.h
  user/mlaier/pf44head/sys/dev/usb2/core/usb2_util.c
  user/mlaier/pf44head/sys/dev/usb2/ethernet/if_aue2.c
  user/mlaier/pf44head/sys/dev/usb2/ethernet/if_axe2.c
  user/mlaier/pf44head/sys/dev/usb2/ethernet/if_cdce2.c
  user/mlaier/pf44head/sys/dev/usb2/ethernet/if_cue2.c
  user/mlaier/pf44head/sys/dev/usb2/ethernet/if_kue2.c
  user/mlaier/pf44head/sys/dev/usb2/ethernet/if_rue2.c
  user/mlaier/pf44head/sys/dev/usb2/ethernet/if_udav2.c
  user/mlaier/pf44head/sys/dev/usb2/ethernet/usb2_ethernet.c
  user/mlaier/pf44head/sys/dev/usb2/ethernet/usb2_ethernet.h
  user/mlaier/pf44head/sys/dev/usb2/image/uscanner2.c
  user/mlaier/pf44head/sys/dev/usb2/include/usb2_devid.h
  user/mlaier/pf44head/sys/dev/usb2/include/usb2_devtable.h
  user/mlaier/pf44head/sys/dev/usb2/input/uhid2.c
  user/mlaier/pf44head/sys/dev/usb2/input/ukbd2.c
  user/mlaier/pf44head/sys/dev/usb2/input/ums2.c
  user/mlaier/pf44head/sys/dev/usb2/misc/udbp2.c
  user/mlaier/pf44head/sys/dev/usb2/misc/ufm2.c
  user/mlaier/pf44head/sys/dev/usb2/quirk/usb2_quirk.c
  user/mlaier/pf44head/sys/dev/usb2/serial/uark2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/ubsa2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/ubser2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/uchcom2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/ucycom2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/ufoma2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/uftdi2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/ugensa2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/uipaq2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/ulpt2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/umct2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/umodem2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/umoscom2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/uplcom2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/usb2_serial.c
  user/mlaier/pf44head/sys/dev/usb2/serial/usb2_serial.h
  user/mlaier/pf44head/sys/dev/usb2/serial/uvisor2.c
  user/mlaier/pf44head/sys/dev/usb2/serial/uvscom2.c
  user/mlaier/pf44head/sys/dev/usb2/sound/uaudio2.c
  user/mlaier/pf44head/sys/dev/usb2/sound/uaudio2.h
  user/mlaier/pf44head/sys/dev/usb2/storage/ata-usb2.c
  user/mlaier/pf44head/sys/dev/usb2/storage/umass2.c
  user/mlaier/pf44head/sys/dev/usb2/storage/urio2.c
  user/mlaier/pf44head/sys/dev/usb2/storage/ustorage2_fs.c
  user/mlaier/pf44head/sys/dev/usb2/template/usb2_template.c
  user/mlaier/pf44head/sys/dev/usb2/wlan/if_rum2.c
  user/mlaier/pf44head/sys/dev/usb2/wlan/if_ural2.c
  user/mlaier/pf44head/sys/dev/usb2/wlan/if_zyd2.c
  user/mlaier/pf44head/sys/dev/vr/if_vr.c
  user/mlaier/pf44head/sys/fs/deadfs/dead_vnops.c
  user/mlaier/pf44head/sys/fs/devfs/devfs_vnops.c
  user/mlaier/pf44head/sys/fs/procfs/procfs_map.c
  user/mlaier/pf44head/sys/i386/i386/exception.s
  user/mlaier/pf44head/sys/i386/i386/genassym.c
  user/mlaier/pf44head/sys/i386/i386/identcpu.c
  user/mlaier/pf44head/sys/i386/i386/local_apic.c
  user/mlaier/pf44head/sys/i386/include/apicreg.h
  user/mlaier/pf44head/sys/i386/include/apicvar.h
  user/mlaier/pf44head/sys/i386/include/specialreg.h
  user/mlaier/pf44head/sys/kern/kern_cpu.c
  user/mlaier/pf44head/sys/kern/kern_jail.c
  user/mlaier/pf44head/sys/kern/kern_linker.c
  user/mlaier/pf44head/sys/kern/kern_mbuf.c
  user/mlaier/pf44head/sys/kern/kern_poll.c
  user/mlaier/pf44head/sys/kern/kern_proc.c
  user/mlaier/pf44head/sys/kern/kern_prot.c
  user/mlaier/pf44head/sys/kern/kern_sysctl.c
  user/mlaier/pf44head/sys/kern/subr_prf.c
  user/mlaier/pf44head/sys/kern/subr_trap.c
  user/mlaier/pf44head/sys/kern/tty.c
  user/mlaier/pf44head/sys/kern/tty_pts.c
  user/mlaier/pf44head/sys/kern/uipc_socket.c
  user/mlaier/pf44head/sys/kern/vfs_cache.c
  user/mlaier/pf44head/sys/kern/vfs_default.c
  user/mlaier/pf44head/sys/kern/vnode_if.src
  user/mlaier/pf44head/sys/mips/adm5120/adm5120_machdep.c
  user/mlaier/pf44head/sys/modules/Makefile
  user/mlaier/pf44head/sys/modules/ath/Makefile
  user/mlaier/pf44head/sys/modules/cxgb/Makefile
  user/mlaier/pf44head/sys/net/if.c
  user/mlaier/pf44head/sys/net/if_arcsubr.c
  user/mlaier/pf44head/sys/net/if_atmsubr.c
  user/mlaier/pf44head/sys/net/if_bridge.c
  user/mlaier/pf44head/sys/net/if_ethersubr.c
  user/mlaier/pf44head/sys/net/if_fddisubr.c
  user/mlaier/pf44head/sys/net/if_fwsubr.c
  user/mlaier/pf44head/sys/net/if_gif.c
  user/mlaier/pf44head/sys/net/if_gif.h
  user/mlaier/pf44head/sys/net/if_iso88025subr.c
  user/mlaier/pf44head/sys/net/if_tun.c
  user/mlaier/pf44head/sys/net/if_var.h
  user/mlaier/pf44head/sys/net/pfil.h
  user/mlaier/pf44head/sys/net/radix.c
  user/mlaier/pf44head/sys/net/radix_mpath.c
  user/mlaier/pf44head/sys/net/raw_cb.h
  user/mlaier/pf44head/sys/net/route.c
  user/mlaier/pf44head/sys/net/route.h
  user/mlaier/pf44head/sys/net/rtsock.c
  user/mlaier/pf44head/sys/net/vnet.h
  user/mlaier/pf44head/sys/net80211/_ieee80211.h
  user/mlaier/pf44head/sys/net80211/ieee80211.c
  user/mlaier/pf44head/sys/net80211/ieee80211_crypto.h
  user/mlaier/pf44head/sys/net80211/ieee80211_ddb.c
  user/mlaier/pf44head/sys/net80211/ieee80211_dfs.h
  user/mlaier/pf44head/sys/net80211/ieee80211_hostap.c
  user/mlaier/pf44head/sys/net80211/ieee80211_input.c
  user/mlaier/pf44head/sys/net80211/ieee80211_ioctl.c
  user/mlaier/pf44head/sys/net80211/ieee80211_node.c
  user/mlaier/pf44head/sys/net80211/ieee80211_node.h
  user/mlaier/pf44head/sys/net80211/ieee80211_output.c
  user/mlaier/pf44head/sys/net80211/ieee80211_regdomain.c
  user/mlaier/pf44head/sys/net80211/ieee80211_scan_sta.c
  user/mlaier/pf44head/sys/net80211/ieee80211_var.h
  user/mlaier/pf44head/sys/netgraph/netflow/netflow.c
  user/mlaier/pf44head/sys/netgraph/netgraph.h
  user/mlaier/pf44head/sys/netgraph/ng_base.c
  user/mlaier/pf44head/sys/netgraph/ng_bridge.c
  user/mlaier/pf44head/sys/netgraph/ng_eiface.c
  user/mlaier/pf44head/sys/netgraph/ng_iface.c
  user/mlaier/pf44head/sys/netgraph/ng_ipfw.c
  user/mlaier/pf44head/sys/netgraph/ng_tty.c
  user/mlaier/pf44head/sys/netinet/icmp6.h
  user/mlaier/pf44head/sys/netinet/icmp_var.h
  user/mlaier/pf44head/sys/netinet/if_atm.c
  user/mlaier/pf44head/sys/netinet/if_ether.c
  user/mlaier/pf44head/sys/netinet/if_ether.h
  user/mlaier/pf44head/sys/netinet/in.c
  user/mlaier/pf44head/sys/netinet/in_mcast.c
  user/mlaier/pf44head/sys/netinet/in_pcb.c
  user/mlaier/pf44head/sys/netinet/in_pcb.h
  user/mlaier/pf44head/sys/netinet/in_proto.c
  user/mlaier/pf44head/sys/netinet/in_rmx.c
  user/mlaier/pf44head/sys/netinet/in_var.h
  user/mlaier/pf44head/sys/netinet/ip_carp.c
  user/mlaier/pf44head/sys/netinet/ip_divert.c
  user/mlaier/pf44head/sys/netinet/ip_dummynet.c
  user/mlaier/pf44head/sys/netinet/ip_fastfwd.c
  user/mlaier/pf44head/sys/netinet/ip_fw.h
  user/mlaier/pf44head/sys/netinet/ip_fw2.c
  user/mlaier/pf44head/sys/netinet/ip_fw_nat.c
  user/mlaier/pf44head/sys/netinet/ip_fw_pfil.c
  user/mlaier/pf44head/sys/netinet/ip_input.c
  user/mlaier/pf44head/sys/netinet/ip_output.c
  user/mlaier/pf44head/sys/netinet/ip_var.h
  user/mlaier/pf44head/sys/netinet/libalias/alias_db.c
  user/mlaier/pf44head/sys/netinet/raw_ip.c
  user/mlaier/pf44head/sys/netinet/sctp_os_bsd.h
  user/mlaier/pf44head/sys/netinet/sctp_pcb.c
  user/mlaier/pf44head/sys/netinet/tcp_sack.c
  user/mlaier/pf44head/sys/netinet/tcp_subr.c
  user/mlaier/pf44head/sys/netinet/tcp_syncache.c
  user/mlaier/pf44head/sys/netinet/tcp_usrreq.c
  user/mlaier/pf44head/sys/netinet/tcp_var.h
  user/mlaier/pf44head/sys/netinet/udp_usrreq.c
  user/mlaier/pf44head/sys/netinet/udp_var.h
  user/mlaier/pf44head/sys/netinet/vinet.h
  user/mlaier/pf44head/sys/netinet6/icmp6.c
  user/mlaier/pf44head/sys/netinet6/in6.c
  user/mlaier/pf44head/sys/netinet6/in6_ifattach.c
  user/mlaier/pf44head/sys/netinet6/in6_pcb.c
  user/mlaier/pf44head/sys/netinet6/in6_proto.c
  user/mlaier/pf44head/sys/netinet6/in6_rmx.c
  user/mlaier/pf44head/sys/netinet6/in6_src.c
  user/mlaier/pf44head/sys/netinet6/in6_var.h
  user/mlaier/pf44head/sys/netinet6/ip6_input.c
  user/mlaier/pf44head/sys/netinet6/ip6_output.c
  user/mlaier/pf44head/sys/netinet6/ip6_var.h
  user/mlaier/pf44head/sys/netinet6/nd6.c
  user/mlaier/pf44head/sys/netinet6/nd6.h
  user/mlaier/pf44head/sys/netinet6/nd6_nbr.c
  user/mlaier/pf44head/sys/netinet6/nd6_rtr.c
  user/mlaier/pf44head/sys/netinet6/raw_ip6.c
  user/mlaier/pf44head/sys/netinet6/raw_ip6.h
  user/mlaier/pf44head/sys/netinet6/tcp6_var.h
  user/mlaier/pf44head/sys/netinet6/udp6_usrreq.c
  user/mlaier/pf44head/sys/netinet6/vinet6.h
  user/mlaier/pf44head/sys/netipsec/ipip_var.h
  user/mlaier/pf44head/sys/netipsec/ipsec.c
  user/mlaier/pf44head/sys/netipsec/key.c
  user/mlaier/pf44head/sys/netipsec/vipsec.h
  user/mlaier/pf44head/sys/netipx/ipx_usrreq.c
  user/mlaier/pf44head/sys/nfsserver/nfs_serv.c
  user/mlaier/pf44head/sys/pci/if_rl.c
  user/mlaier/pf44head/sys/pci/if_rlreg.h
  user/mlaier/pf44head/sys/powerpc/include/param.h
  user/mlaier/pf44head/sys/powerpc/ofw/ofw_pcib_pci.c
  user/mlaier/pf44head/sys/powerpc/ofw/ofw_pcibus.c
  user/mlaier/pf44head/sys/powerpc/ofw/ofw_syscons.c
  user/mlaier/pf44head/sys/powerpc/ofw/ofw_syscons.h
  user/mlaier/pf44head/sys/powerpc/powermac/cuda.c
  user/mlaier/pf44head/sys/powerpc/powermac/cudavar.h
  user/mlaier/pf44head/sys/powerpc/powermac/grackle.c
  user/mlaier/pf44head/sys/powerpc/powermac/gracklevar.h
  user/mlaier/pf44head/sys/powerpc/powermac/macio.c
  user/mlaier/pf44head/sys/powerpc/powermac/uninorth.c
  user/mlaier/pf44head/sys/powerpc/powermac/uninorthvar.h
  user/mlaier/pf44head/sys/sparc64/ebus/ebus.c
  user/mlaier/pf44head/sys/sparc64/isa/ofw_isa.c
  user/mlaier/pf44head/sys/sparc64/pci/apb.c
  user/mlaier/pf44head/sys/sparc64/pci/ofw_pci.h
  user/mlaier/pf44head/sys/sparc64/pci/ofw_pcib.c
  user/mlaier/pf44head/sys/sparc64/pci/ofw_pcib_subr.c
  user/mlaier/pf44head/sys/sparc64/pci/ofw_pcibus.c
  user/mlaier/pf44head/sys/sparc64/pci/psycho.c
  user/mlaier/pf44head/sys/sparc64/pci/schizo.c
  user/mlaier/pf44head/sys/sparc64/sbus/sbus.c
  user/mlaier/pf44head/sys/sparc64/sparc64/ofw_machdep.c
  user/mlaier/pf44head/sys/sys/kernel.h
  user/mlaier/pf44head/sys/sys/param.h
  user/mlaier/pf44head/sys/sys/pmc.h
  user/mlaier/pf44head/sys/sys/resource.h
  user/mlaier/pf44head/sys/sys/sysctl.h
  user/mlaier/pf44head/sys/sys/ttyhook.h
  user/mlaier/pf44head/sys/sys/vimage.h
  user/mlaier/pf44head/sys/sys/vnode.h
  user/mlaier/pf44head/sys/sys/vtoc.h
  user/mlaier/pf44head/usr.bin/cpuset/cpuset.1
  user/mlaier/pf44head/usr.bin/fetch/fetch.1
  user/mlaier/pf44head/usr.bin/fetch/fetch.c
  user/mlaier/pf44head/usr.bin/netstat/route.c
  user/mlaier/pf44head/usr.bin/tar/util.c
  user/mlaier/pf44head/usr.sbin/arp/arp.c
  user/mlaier/pf44head/usr.sbin/fwcontrol/fwcontrol.c
  user/mlaier/pf44head/usr.sbin/fwcontrol/fwmpegts.c
  user/mlaier/pf44head/usr.sbin/jexec/jexec.c
  user/mlaier/pf44head/usr.sbin/jls/jls.c
  user/mlaier/pf44head/usr.sbin/ndp/ndp.c
  user/mlaier/pf44head/usr.sbin/ppp/route.c
  user/mlaier/pf44head/usr.sbin/route6d/route6d.c
  user/mlaier/pf44head/usr.sbin/sysinstall/cdrom.c
  user/mlaier/pf44head/usr.sbin/sysinstall/config.c
  user/mlaier/pf44head/usr.sbin/sysinstall/dispatch.c
  user/mlaier/pf44head/usr.sbin/sysinstall/dist.c
  user/mlaier/pf44head/usr.sbin/sysinstall/dist.h
  user/mlaier/pf44head/usr.sbin/sysinstall/install.c
  user/mlaier/pf44head/usr.sbin/sysinstall/label.c
  user/mlaier/pf44head/usr.sbin/sysinstall/main.c
  user/mlaier/pf44head/usr.sbin/sysinstall/menus.c
  user/mlaier/pf44head/usr.sbin/sysinstall/sysinstall.8
  user/mlaier/pf44head/usr.sbin/sysinstall/sysinstall.h
  user/mlaier/pf44head/usr.sbin/sysinstall/system.c

Modified: user/mlaier/pf44head/UPDATING
==============================================================================
--- user/mlaier/pf44head/UPDATING	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/UPDATING	Tue Dec 16 09:15:47 2008	(r186173)
@@ -22,6 +22,15 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 8.
 	to maximize performance.  (To disable malloc debugging, run
 	ln -s aj /etc/malloc.conf.)
 
+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:

Modified: user/mlaier/pf44head/contrib/binutils/bfd/config.bfd
==============================================================================
--- user/mlaier/pf44head/contrib/binutils/bfd/config.bfd	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/contrib/binutils/bfd/config.bfd	Tue Dec 16 09:15:47 2008	(r186173)
@@ -768,6 +768,10 @@ case "${targ}" in
     targ_defvec=bfd_elf32_littlemips_vec
     targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_little_vec ecoff_big_vec"
     ;;
+  mips*-*-freebsd*)
+    targ_defvec=bfd_elf32_tradbigmips_vec
+    targ_selvecs="bfd_elf32_tradlittlemips_vec bfd_elf32_ntradbigmisp_vec bfd_elf32_ntradlittlemips_vec bfd_elf64_tradbigmips_vec bfd_elf64_tradlittlemips_vec ecoff_big_vec ecoff_little_vec"
+    ;;
   mips*-*-netbsd*)
     targ_defvec=bfd_elf32_bigmips_vec
     targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_big_vec ecoff_little_vec"

Modified: user/mlaier/pf44head/contrib/binutils/gas/config/tc-mips.c
==============================================================================
--- user/mlaier/pf44head/contrib/binutils/gas/config/tc-mips.c	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/contrib/binutils/gas/config/tc-mips.c	Tue Dec 16 09:15:47 2008	(r186173)
@@ -281,6 +281,9 @@ static int mips_32bitmode = 0;
 
 #define HAVE_64BIT_OBJECTS (mips_abi == N64_ABI)
 
+/* True if relocations are stored in-place.  */
+#define HAVE_IN_PLACE_ADDENDS (!HAVE_NEWABI)
+
 /* We can only have 64bit addresses if the object file format
    supports it.  */
 #define HAVE_32BIT_ADDRESSES                           \
@@ -13020,6 +13023,26 @@ mips_fix_adjustable (fixS *fixp)
   if (fixp->fx_addsy == NULL)
     return 1;
 
+  /* If symbol SYM is in a mergeable section, relocations of the form
+     SYM + 0 can usually be made section-relative.  The mergeable data
+     is then identified by the section offset rather than by the symbol.
+
+     However, if we're generating REL LO16 relocations, the offset is split
+     between the LO16 and parterning high part relocation.  The linker will
+     need to recalculate the complete offset in order to correctly identify
+     the merge data.
+
+     The linker has traditionally not looked for the parterning high part
+     relocation, and has thus allowed orphaned R_MIPS_LO16 relocations to be
+     placed anywhere.  Rather than break backwards compatibility by changing
+     this, it seems better not to force the issue, and instead keep the
+     original symbol.  This will work with either linker behavior.  */
+  if ((fixp->fx_r_type == BFD_RELOC_LO16
+       || reloc_needs_lo_p (fixp->fx_r_type))
+      && HAVE_IN_PLACE_ADDENDS
+      && (S_GET_SEGMENT (fixp->fx_addsy)->flags & SEC_MERGE) != 0)
+    return 0;
+
 #ifdef OBJ_ELF
   if (OUTPUT_FLAVOR == bfd_target_elf_flavour
       && S_GET_OTHER (fixp->fx_addsy) == STO_MIPS16

Copied: user/mlaier/pf44head/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh (from r186172, head/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/mlaier/pf44head/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh	Tue Dec 16 09:15:47 2008	(r186173, copy of r186172, head/contrib/binutils/ld/emulparams/elf32bmip_fbsd.sh)
@@ -0,0 +1,3 @@
+. ${srcdir}/emulparams/elf32bmip.sh
+. ${srcdir}/emulparams/elf_fbsd.sh
+GENERATE_PIE_SCRIPT=yes

Modified: user/mlaier/pf44head/contrib/bsnmp/snmp_mibII/mibII.c
==============================================================================
--- user/mlaier/pf44head/contrib/bsnmp/snmp_mibII/mibII.c	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/contrib/bsnmp/snmp_mibII/mibII.c	Tue Dec 16 09:15:47 2008	(r186173)
@@ -48,8 +48,7 @@ static void *route_fd;
 /* if-index allocator */
 static uint32_t next_if_index = 1;
 
-/* re-fetch arp table */
-static int update_arp;
+/* currently fetching the arp table */
 static int in_update_arp;
 
 /* OR registrations */
@@ -911,36 +910,6 @@ mib_find_ifa(struct in_addr addr)
 }
 
 /*
- * Process a new ARP entry
- */
-static void
-process_arp(const struct rt_msghdr *rtm, const struct sockaddr_dl *sdl,
-    const struct sockaddr_in *sa)
-{
-	struct mibif *ifp;
-	struct mibarp *at;
-
-	/* IP arp table entry */
-	if (sdl->sdl_alen == 0) {
-		update_arp = 1;
-		return;
-	}
-	if ((ifp = mib_find_if_sys(sdl->sdl_index)) == NULL)
-		return;
-	/* have a valid entry */
-	if ((at = mib_find_arp(ifp, sa->sin_addr)) == NULL &&
-	    (at = mib_arp_create(ifp, sa->sin_addr,
-	    sdl->sdl_data + sdl->sdl_nlen, sdl->sdl_alen)) == NULL)
-		return;
-
-	if (rtm->rtm_rmx.rmx_expire == 0)
-		at->flags |= MIBARP_PERM;
-	else
-		at->flags &= ~MIBARP_PERM;
-	at->flags |= MIBARP_FOUND;
-}
-
-/*
  * Handle a routing socket message.
  */
 static void
@@ -1080,46 +1049,12 @@ handle_rtmsg(struct rt_msghdr *rtm)
 		}
 		break;
 #endif
-
 	  case RTM_GET:
-		mib_extract_addrs(rtm->rtm_addrs, (u_char *)(rtm + 1), addrs);
-		if (rtm->rtm_flags & RTF_LLINFO) {
-			if (addrs[RTAX_DST] == NULL ||
-			    addrs[RTAX_GATEWAY] == NULL ||
-			    addrs[RTAX_DST]->sa_family != AF_INET ||
-			    addrs[RTAX_GATEWAY]->sa_family != AF_LINK)
-				break;
-			process_arp(rtm,
-			    (struct sockaddr_dl *)(void *)addrs[RTAX_GATEWAY],
-			    (struct sockaddr_in *)(void *)addrs[RTAX_DST]);
-		} else {
-			if (rtm->rtm_errno == 0 && (rtm->rtm_flags & RTF_UP))
-				mib_sroute_process(rtm, addrs[RTAX_GATEWAY],
-				    addrs[RTAX_DST], addrs[RTAX_NETMASK]);
-		}
-		break;
-
 	  case RTM_ADD:
-		mib_extract_addrs(rtm->rtm_addrs, (u_char *)(rtm + 1), addrs);
-		if (rtm->rtm_flags & RTF_LLINFO) {
-			if (addrs[RTAX_DST] == NULL ||
-			    addrs[RTAX_GATEWAY] == NULL ||
-			    addrs[RTAX_DST]->sa_family != AF_INET ||
-			    addrs[RTAX_GATEWAY]->sa_family != AF_LINK)
-				break;
-			process_arp(rtm,
-			    (struct sockaddr_dl *)(void *)addrs[RTAX_GATEWAY],
-			    (struct sockaddr_in *)(void *)addrs[RTAX_DST]);
-		} else {
-			if (rtm->rtm_errno == 0 && (rtm->rtm_flags & RTF_UP))
-				mib_sroute_process(rtm, addrs[RTAX_GATEWAY],
-				    addrs[RTAX_DST], addrs[RTAX_NETMASK]);
-		}
-		break;
-
 	  case RTM_DELETE:
 		mib_extract_addrs(rtm->rtm_addrs, (u_char *)(rtm + 1), addrs);
-		if (rtm->rtm_errno == 0 && !(rtm->rtm_flags & RTF_LLINFO))
+
+		if (rtm->rtm_errno == 0 && (rtm->rtm_flags & RTF_UP))
 			mib_sroute_process(rtm, addrs[RTAX_GATEWAY],
 			    addrs[RTAX_DST], addrs[RTAX_NETMASK]);
 		break;
@@ -1289,7 +1224,8 @@ update_ifa_info(void)
 
 /*
  * Update arp table
- */
+ *
+*/
 void
 mib_arp_update(void)
 {
@@ -1305,11 +1241,11 @@ mib_arp_update(void)
 	TAILQ_FOREACH(at, &mibarp_list, link)
 		at->flags &= ~MIBARP_FOUND;
 
-	if ((buf = mib_fetch_rtab(AF_INET, NET_RT_FLAGS, RTF_LLINFO, &needed)) == NULL) {
+	if ((buf = mib_fetch_rtab(AF_INET, NET_RT_FLAGS, 0, &needed)) == NULL) {
 		in_update_arp = 0;
 		return;
 	}
-
+	
 	next = buf;
 	while (next < buf + needed) {
 		rtm = (struct rt_msghdr *)(void *)next;
@@ -1326,7 +1262,6 @@ mib_arp_update(void)
 		at = at1;
 	}
 	mibarpticks = get_ticks();
-	update_arp = 0;
 	in_update_arp = 0;
 }
 
@@ -1634,8 +1569,8 @@ mibII_idle(void)
 		mib_arp_update();
 		mib_iflist_bad = 0;
 	}
-	if (update_arp)
-		mib_arp_update();
+
+	mib_arp_update();
 }
 
 

Modified: user/mlaier/pf44head/contrib/bsnmp/snmp_mibII/mibII_route.c
==============================================================================
--- user/mlaier/pf44head/contrib/bsnmp/snmp_mibII/mibII_route.c	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/contrib/bsnmp/snmp_mibII/mibII_route.c	Tue Dec 16 09:15:47 2008	(r186173)
@@ -186,8 +186,7 @@ mib_sroute_process(struct rt_msghdr *rtm
 	memcpy(r->index, key.index, sizeof(r->index));
 	r->ifindex = (ifp == NULL) ? 0 : ifp->index;
 
-	r->type = (rtm->rtm_flags & RTF_LLINFO) ? 3 :
-	    (rtm->rtm_flags & RTF_REJECT) ? 2 : 4;
+	r->type = (rtm->rtm_flags & RTF_REJECT) ? 2 : 4;
 
 	/* cannot really know, what protocol it runs */
 	r->proto = (rtm->rtm_flags & RTF_LOCAL) ? 2 :

Modified: user/mlaier/pf44head/contrib/ipfilter/ipsend/44arp.c
==============================================================================
--- user/mlaier/pf44head/contrib/ipfilter/ipsend/44arp.c	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/contrib/ipfilter/ipsend/44arp.c	Tue Dec 16 09:15:47 2008	(r186173)
@@ -88,7 +88,12 @@ char	*addr, *eaddr;
 	mib[2] = 0;
 	mib[3] = AF_INET;
 	mib[4] = NET_RT_FLAGS;
+#ifdef RTF_LLINFO
 	mib[5] = RTF_LLINFO;
+#else
+	mib[5] = 0;
+#endif	
+
 	if (sysctl(mib, 6, NULL, &needed, NULL, 0) == -1)
 	    {
 		perror("route-sysctl-estimate");

Modified: user/mlaier/pf44head/etc/regdomain.xml
==============================================================================
--- user/mlaier/pf44head/etc/regdomain.xml	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/etc/regdomain.xml	Tue Dec 16 09:15:47 2008	(r186173)
@@ -39,7 +39,7 @@
 -->
 <rd id="debug">
   <name>DEBUG</name>
-  <sku>0</sku>
+  <sku>0x1ff</sku>
 </rd>
 
 <rd id="fcc">
@@ -1080,6 +1080,75 @@
     </band>
   </netband>
 </rd>
+
+<rd id="sr9">
+  <name>SR9</name>
+  <sku>0x0298</sku>
+  <defcc ref="SR9"/>
+  <netband mode="11g">
+    <band>
+      <freqband ref="S1_907_922_5"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+    <band>
+      <freqband ref="S1_907_922_10"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+    <band>
+      <freqband ref="S1_912_917"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+  </netband>
+</rd>
+
+<rd id="xr9">
+  <name>XR9</name>
+  <sku>0x299</sku>
+  <defcc ref="XR9"/>
+  <netband mode="11g">
+    <band>
+      <freqband ref="S2_907_922_5"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+    <band>
+      <freqband ref="S2_907_922_10"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+    <band>
+      <freqband ref="S2_912_917"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+  </netband>
+</rd>
+
+<rd id="gz901">
+  <name>GZ901</name>
+  <sku>0x29a</sku>
+  <defcc ref="GZ901"/>
+  <netband mode="11g">
+    <band>
+      <freqband ref="S1_908_923_5"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+    <band>
+      <freqband ref="S1_913_918_10"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+    <band>
+      <freqband ref="S1_913_918"/>
+      <maxpower>30</maxpower>
+      <flags>IEEE80211_CHAN_G</flags>
+    </band>
+  </netband>
+</rd>
 </regulatory-domains>
 
 <country-codes>
@@ -1201,6 +1270,9 @@
 <country id="GT">
   <isocc>320</isocc> <name>Guatemala</name> <rd ref="none"/>
 </country>
+<country id="GZ901">
+  <isocc>5002</isocc> <name>ZComax GZ-901</name> <rd ref="gz901"/>
+</country>
 <country id="HN">
   <isocc>340</isocc> <name>Honduras</name> <rd ref="none"/>
 </country>
@@ -1396,6 +1468,12 @@
 <country id="TR">
   <isocc>792</isocc> <name>Turkey</name> <rd ref="etsi"/>
 </country>
+<country id="SR9">
+  <isocc>5000</isocc> <name>Ubiquiti SR9</name> <rd ref="sr9"/>
+</country>
+<country id="XR9">
+  <isocc>5001</isocc> <name>Ubiquiti XR9</name> <rd ref="xr9"/>
+</country>
 <country id="UA">
   <isocc>804</isocc> <name>Ukraine</name> <rd ref="none"/>
 </country>
@@ -1426,6 +1504,10 @@
 <country id="ZW">
   <isocc>716</isocc> <name>Zimbabwe</name> <rd ref="none"/>
 </country>
+
+<country id="DEBUG">
+  <isocc>0</isocc> <name>Debug</name> <rd ref="debug"/>
+</country>
 </country-codes>
 
 <!--
@@ -1575,6 +1657,61 @@
   <freqstart>2512</freqstart> <freqend>2732</freqend>
   <chanwidth>20</chanwidth> <chansep>5</chansep>
 </freqband>
+
+<freqband id="S1_907_922_5">
+  <freqstart>2422</freqstart> <freqend>2437</freqend>
+  <chanwidth>5</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+  <flags>IEEE80211_CHAN_QUARTER</flags>
+</freqband>
+<freqband id="S1_907_922_10">
+  <freqstart>2422</freqstart> <freqend>2437</freqend>
+  <chanwidth>10</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+  <flags>IEEE80211_CHAN_HALF</flags>
+</freqband>
+<freqband id="S1_912_917">
+  <freqstart>2427</freqstart> <freqend>2432</freqend>
+  <chanwidth>20</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+</freqband>
+
+<freqband id="S2_907_922_5">
+  <freqstart>2427</freqstart> <freqend>2442</freqend>
+  <chanwidth>5</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+  <flags>IEEE80211_CHAN_QUARTER</flags>
+</freqband>
+<freqband id="S2_907_922_10">
+  <freqstart>2427</freqstart> <freqend>2442</freqend>
+  <chanwidth>10</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+  <flags>IEEE80211_CHAN_HALF</flags>
+</freqband>
+<freqband id="S2_912_917">
+  <freqstart>2432</freqstart> <freqend>2437</freqend>
+  <chanwidth>20</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+</freqband>
+
+<freqband id="S1_908_923_5">
+  <freqstart>2447</freqstart> <freqend>2467</freqend>
+  <chanwidth>5</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+  <flags>IEEE80211_CHAN_QUARTER</flags>
+</freqband>
+<freqband id="S1_913_918_10">
+  <freqstart>2457</freqstart> <freqend>2462</freqend>
+  <chanwidth>10</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+  <flags>IEEE80211_CHAN_HALF</flags>
+</freqband>
+<freqband id="S1_913_918">
+  <freqstart>2457</freqstart> <freqend>2462</freqend>
+  <chanwidth>20</chanwidth> <chansep>5</chansep>
+  <flags>IEEE80211_CHAN_GSM</flags>
+</freqband>
+
 </shared-frequency-bands>
 
 </regulatory-data>

Modified: user/mlaier/pf44head/gnu/usr.bin/binutils/as/Makefile
==============================================================================
--- user/mlaier/pf44head/gnu/usr.bin/binutils/as/Makefile	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/gnu/usr.bin/binutils/as/Makefile	Tue Dec 16 09:15:47 2008	(r186173)
@@ -20,6 +20,10 @@ SRCS+=	app.c as.c atof-generic.c atof-ie
 # DEO: why not used?
 #SRCS+=	itbl-ops.c
 
+.if ${TARGET_ARCH} == "mips"
+SRCS+=	itbl-ops.c itbl-parse.y itbl-lex.l
+.endif
+
 .if ${TARGET_ARCH} == "amd64"
 SRCS+=	tc-i386.c
 .elif ${TARGET_ARCH} == "powerpc"

Copied: user/mlaier/pf44head/gnu/usr.bin/binutils/ld/Makefile.mips (from r186172, head/gnu/usr.bin/binutils/ld/Makefile.mips)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/mlaier/pf44head/gnu/usr.bin/binutils/ld/Makefile.mips	Tue Dec 16 09:15:47 2008	(r186173, copy of r186172, head/gnu/usr.bin/binutils/ld/Makefile.mips)
@@ -0,0 +1,24 @@
+# $FreeBSD$
+
+#xxxIMPxxx: size?
+#xxxIMPxxx: TARGET_BIG_ENDIAN is lame.  We should use the netbsd convention
+# of mipsel and mips.
+_sz?=32
+.if defined(TARGET_BIG_ENDIAN)
+NATIVE_EMULATION=elf${_sz}btsmip_fbsd
+.else
+NATIVE_EMULATION=elf${_sz}ltsmip_fbsd
+.endif
+
+SRCS+=	e${NATIVE_EMULATION}.c 
+CLEANFILES+=	e${NATIVE_EMULATION}.c
+
+# nb: elf32 handles both elf32 and elf64 targets
+e${NATIVE_EMULATION}.c:	${.CURDIR}/${NATIVE_EMULATION}.sh emultempl/elf32.em \
+    scripttempl/elf.sc genscripts.sh stringify.sed
+	sh ${.CURDIR}/genscripts.sh ${SRCDIR}/ld ${LIBSERACHPATH} \
+	    ${TOOLS_PREFIX}/usr \
+	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
+	    ${NATIVE_EMULATION} ""  no ${NATIVE_EMULATION} ${TARGET_TUPLE} \
+	    ${.CURDIR}/${NATIVE_EMULATION}.sh
+

Copied: user/mlaier/pf44head/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh (from r186172, head/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/mlaier/pf44head/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh	Tue Dec 16 09:15:47 2008	(r186173, copy of r186172, head/gnu/usr.bin/binutils/ld/elf32btsmip_fbsd.sh)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+. ${srcdir}/emulparams/elf32btsmip.sh
+. ${srcdir}/emulparams/elf_fbsd.sh
+GENERATE_PIE_SCRIPT=yes

Copied: user/mlaier/pf44head/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh (from r186172, head/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/mlaier/pf44head/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh	Tue Dec 16 09:15:47 2008	(r186173, copy of r186172, head/gnu/usr.bin/binutils/ld/elf32ltsmip_fbsd.sh)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+. ${srcdir}/emulparams/elf32ltsmip.sh
+. ${srcdir}/emulparams/elf_fbsd.sh
+GENERATE_PIE_SCRIPT=yes

Copied: user/mlaier/pf44head/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh (from r186172, head/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/mlaier/pf44head/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh	Tue Dec 16 09:15:47 2008	(r186173, copy of r186172, head/gnu/usr.bin/binutils/ld/elf64btsmip_fbsd.sh)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+. ${srcdir}/emulparams/elf64btsmip.sh
+. ${srcdir}/emulparams/elf_fbsd.sh
+GENERATE_PIE_SCRIPT=yes

Copied: user/mlaier/pf44head/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh (from r186172, head/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/mlaier/pf44head/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh	Tue Dec 16 09:15:47 2008	(r186173, copy of r186172, head/gnu/usr.bin/binutils/ld/elf64ltsmip_fbsd.sh)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+. ${srcdir}/emulparams/elf64ltsmip.sh
+. ${srcdir}/emulparams/elf_fbsd.sh
+GENERATE_PIE_SCRIPT=yes

Copied: user/mlaier/pf44head/gnu/usr.bin/binutils/libbfd/Makefile.mips (from r186172, head/gnu/usr.bin/binutils/libbfd/Makefile.mips)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/mlaier/pf44head/gnu/usr.bin/binutils/libbfd/Makefile.mips	Tue Dec 16 09:15:47 2008	(r186173, copy of r186172, head/gnu/usr.bin/binutils/libbfd/Makefile.mips)
@@ -0,0 +1,27 @@
+# $FreeBSD$
+
+#xxxIMPxxx: endian and size
+DEFAULT_VECTOR=	bfd_elf32_tradbigmips_vec
+
+SRCS+=	coff-mips.c \
+	cpu-mips.c \
+	ecoff.c \
+	ecofflink.c \
+	elf32.c \
+	elf64.c \
+	elfn32-mips.c \
+	elf32-mips.c \
+	elf64-mips.c \
+	elfxx-mips.c \
+	elf32-target.h \
+	elf64-target.h \
+	elflink.c
+
+VECS=	bfd_elf32_tradbigmips_vec \
+	bfd_elf32_tradlittlemips_vec \
+	bfd_elf32_ntradbigmips_vec \
+	bfd_elf32_ntradlittlemips_vec \
+	bfd_elf64_tradbigmips_vec \
+	bfd_elf64_tradlittlemips_vec \
+	ecoff_little_vec \
+	ecoff_big_vec

Modified: user/mlaier/pf44head/gnu/usr.bin/binutils/libbfd/bfd.h
==============================================================================
--- user/mlaier/pf44head/gnu/usr.bin/binutils/libbfd/bfd.h	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/gnu/usr.bin/binutils/libbfd/bfd.h	Tue Dec 16 09:15:47 2008	(r186173)
@@ -57,7 +57,7 @@ extern "C" {
 #define BFD_ARCH_SIZE 64
 
 
-#if defined(__i386__) || defined(__powerpc__) || defined(__arm__)
+#if defined(__i386__) || defined(__powerpc__) || defined(__arm__) || defined(__mips__)
 #define BFD_HOST_64BIT_LONG 0
 #define BFD_HOST_64_BIT long long
 #define BFD_HOST_U_64_BIT unsigned long long

Copied: user/mlaier/pf44head/gnu/usr.bin/binutils/libopcodes/Makefile.mips (from r186172, head/gnu/usr.bin/binutils/libopcodes/Makefile.mips)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/mlaier/pf44head/gnu/usr.bin/binutils/libopcodes/Makefile.mips	Tue Dec 16 09:15:47 2008	(r186173, copy of r186172, head/gnu/usr.bin/binutils/libopcodes/Makefile.mips)
@@ -0,0 +1,4 @@
+# $FreeBSD$
+
+SRCS+=	mips-dis.c mips-opc.c mips16-opc.c
+CFLAGS+= -DARCH_mips

Modified: user/mlaier/pf44head/gnu/usr.bin/groff/tmac/mdoc.local
==============================================================================
--- user/mlaier/pf44head/gnu/usr.bin/groff/tmac/mdoc.local	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/gnu/usr.bin/groff/tmac/mdoc.local	Tue Dec 16 09:15:47 2008	(r186173)
@@ -69,6 +69,8 @@
 .
 .\" FreeBSD releases not found in doc-common
 .ds doc-operating-system-FreeBSD-6.3    6.3
+.ds doc-operating-system-FreeBSD-6.4    6.4
+.ds doc-operating-system-FreeBSD-7.1    7.1
 .ds doc-operating-system-FreeBSD-8.0    8.0
 .
 .ec

Modified: user/mlaier/pf44head/include/arpa/nameser.h
==============================================================================
--- user/mlaier/pf44head/include/arpa/nameser.h	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/include/arpa/nameser.h	Tue Dec 16 09:15:47 2008	(r186173)
@@ -49,7 +49,7 @@
  */
 
 /*
- *	$Id: nameser.h,v 1.7.18.1 2005/04/27 05:00:50 sra Exp $
+ *	$Id: nameser.h,v 1.7.18.2 2008/04/03 23:15:15 marka Exp $
  * $FreeBSD$
  */
 
@@ -424,9 +424,10 @@ typedef enum __ns_cert_types {
 #define NS_NXT_MAX 127
 
 /*%
- * EDNS0 extended flags, host order.
+ * EDNS0 extended flags and option codes, host order.
  */
 #define NS_OPT_DNSSEC_OK	0x8000U
+#define NS_OPT_NSID             3
 
 /*%
  * Inline versions of get/put short/long.  Pointer is advanced.

Modified: user/mlaier/pf44head/include/resolv.h
==============================================================================
--- user/mlaier/pf44head/include/resolv.h	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/include/resolv.h	Tue Dec 16 09:15:47 2008	(r186173)
@@ -50,7 +50,7 @@
 
 /*%
  *	@(#)resolv.h	8.1 (Berkeley) 6/2/93
- *	$Id: resolv.h,v 1.19.18.3 2005/08/25 04:43:51 marka Exp $
+ *	$Id: resolv.h,v 1.19.18.4 2008/04/03 23:15:15 marka Exp $
  * $FreeBSD$
  */
 
@@ -245,6 +245,7 @@ union res_sockaddr_union {
 #define	RES_NOCHECKNAME	0x00008000	/*%< do not check names for sanity. */
 #define	RES_KEEPTSIG	0x00010000	/*%< do not strip TSIG records */
 #define	RES_BLAST	0x00020000	/*%< blast all recursive servers */
+#define RES_NSID	0x00040000      /*%< request name server ID */
 #define RES_NOTLDQUERY	0x00100000	/*%< don't unqualified name as a tld */
 #define RES_USE_DNSSEC	0x00200000	/*%< use DNSSEC using OK bit in OPT */
 /* #define RES_DEBUG2	0x00400000 */	/* nslookup internal */
@@ -386,6 +387,7 @@ extern const struct res_sym __p_rcode_sy
 #define sym_ntos		__sym_ntos
 #define sym_ston		__sym_ston
 #define res_nopt		__res_nopt
+#define res_nopt_rdata       	__res_nopt_rdata
 #define res_ndestroy		__res_ndestroy
 #define	res_nametoclass		__res_nametoclass
 #define	res_nametotype		__res_nametotype
@@ -474,6 +476,8 @@ int		res_findzonecut2(res_state, const c
 				 union res_sockaddr_union *, int);
 void		res_nclose(res_state);
 int		res_nopt(res_state, int, u_char *, int, int);
+int		res_nopt_rdata(res_state, int, u_char *, int, u_char *,
+			       u_short, u_short, u_char *);
 void		res_send_setqhook(res_send_qhook);
 void		res_send_setrhook(res_send_rhook);
 int		__res_vinit(res_state, int);

Modified: user/mlaier/pf44head/lib/libc/include/isc/eventlib.h
==============================================================================
--- user/mlaier/pf44head/lib/libc/include/isc/eventlib.h	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/lib/libc/include/isc/eventlib.h	Tue Dec 16 09:15:47 2008	(r186173)
@@ -18,7 +18,7 @@
 /* eventlib.h - exported interfaces for eventlib
  * vix 09sep95 [initial]
  *
- * $Id: eventlib.h,v 1.3.18.2 2005/07/28 07:38:07 marka Exp $
+ * $Id: eventlib.h,v 1.3.18.3 2008/01/23 02:12:01 marka Exp $
  */
 
 #ifndef _EVENTLIB_H
@@ -29,6 +29,8 @@
 #include <sys/time.h>
 #include <stdio.h>
 
+#include <isc/platform.h>
+
 #ifndef __P
 # define __EVENTLIB_P_DEFINED
 # ifdef __STDC__

Copied: user/mlaier/pf44head/lib/libc/include/isc/platform.h (from r186172, head/lib/libc/include/isc/platform.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ user/mlaier/pf44head/lib/libc/include/isc/platform.h	Tue Dec 16 09:15:47 2008	(r186173, copy of r186172, head/lib/libc/include/isc/platform.h)
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2008  Internet Systems Consortium, Inc. ("ISC")
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+ * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS.  IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+ * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+ * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+ * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/* $Id: platform.h.in,v 1.2.6.2 2008/01/23 02:15:02 tbox Exp $ */
+/* $FreeBSD$ */
+
+/*! \file */
+
+#ifndef ISC_PLATFORM_H
+#define ISC_PLATFORM_H
+
+/*
+ * Define if the OS does not define struct timespec.
+ */
+#undef ISC_PLATFORM_NEEDTIMESPEC
+#ifdef ISC_PLATFORM_NEEDTIMESPEC
+#include <time.h>               /* For time_t */
+struct timespec {
+	time_t  tv_sec;         /* seconds */
+	long    tv_nsec;        /* nanoseconds */
+};
+#endif
+
+#endif

Modified: user/mlaier/pf44head/lib/libc/inet/inet_net_pton.c
==============================================================================
--- user/mlaier/pf44head/lib/libc/inet/inet_net_pton.c	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/lib/libc/inet/inet_net_pton.c	Tue Dec 16 09:15:47 2008	(r186173)
@@ -16,7 +16,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
-static const char rcsid[] = "$Id: inet_net_pton.c,v 1.7.18.1 2005/04/27 05:00:53 sra Exp $";
+static const char rcsid[] = "$Id: inet_net_pton.c,v 1.7.18.2 2008/08/26 04:42:43 marka Exp $";
 #endif
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -135,11 +135,11 @@ inet_net_pton_ipv4(const char *src, u_ch
 			assert(n >= 0 && n <= 9);
 			bits *= 10;
 			bits += n;
+			if (bits > 32)
+				goto enoent;
 		} while ((ch = *src++) != '\0' && isascii(ch) && isdigit(ch));
 		if (ch != '\0')
 			goto enoent;
-		if (bits > 32)
-			goto emsgsize;
 	}
 
 	/* Firey death and destruction unless we prefetched EOS. */

Modified: user/mlaier/pf44head/lib/libc/net/rcmd.3
==============================================================================
--- user/mlaier/pf44head/lib/libc/net/rcmd.3	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/lib/libc/net/rcmd.3	Tue Dec 16 09:15:47 2008	(r186173)
@@ -238,6 +238,13 @@ For
 .Fn rcmd_af ,
 .Dv PF_UNSPEC
 is also allowed.
+.Sh ENVIRONMENT
+.Bl -tag -width RSH
+.It Ev RSH
+When using the
+.Fn rcmd
+function, this variable is used as the program to run instead of
+.Xr rsh 1 .
 .Sh DIAGNOSTICS
 The
 .Fn rcmd

Modified: user/mlaier/pf44head/lib/libc/resolv/res_debug.c
==============================================================================
--- user/mlaier/pf44head/lib/libc/resolv/res_debug.c	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/lib/libc/resolv/res_debug.c	Tue Dec 16 09:15:47 2008	(r186173)
@@ -91,7 +91,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_debug.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_debug.c,v 1.10.18.5 2005/07/28 07:38:11 marka Exp $";
+static const char rcsid[] = "$Id: res_debug.c,v 1.10.18.6 2008/04/03 23:15:15 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -187,10 +187,56 @@ do_section(const res_state statp,
 				p_type(ns_rr_type(rr)),
 				p_class(ns_rr_class(rr)));
 		else if (section == ns_s_ar && ns_rr_type(rr) == ns_t_opt) {
+			u_int16_t optcode, optlen, rdatalen = ns_rr_rdlen(rr);
 			u_int32_t ttl = ns_rr_ttl(rr);
+
 			fprintf(file,
 				"; EDNS: version: %u, udp=%u, flags=%04x\n",
 				(ttl>>16)&0xff, ns_rr_class(rr), ttl&0xffff);
+
+			while (rdatalen >= 4) {
+				const u_char *cp = ns_rr_rdata(rr);
+				int i;
+
+				GETSHORT(optcode, cp);
+				GETSHORT(optlen, cp);
+
+				if (optcode == NS_OPT_NSID) {
+					fputs("; NSID: ", file);
+					if (optlen == 0) {
+						fputs("; NSID\n", file);
+					} else {
+						fputs("; NSID: ", file);
+						for (i = 0; i < optlen; i++)
+							fprintf(file, "%02x ",
+								cp[i]);
+						fputs(" (",file);
+						for (i = 0; i < optlen; i++)
+							fprintf(file, "%c",
+								isprint(cp[i])?
+								cp[i] : '.');
+						fputs(")\n", file);
+					}
+				} else {
+					if (optlen == 0) {
+						fprintf(file, "; OPT=%u\n",
+							optcode);
+					} else {
+						fprintf(file, "; OPT=%u: ",
+							optcode);
+						for (i = 0; i < optlen; i++)
+							fprintf(file, "%02x ",
+								cp[i]);
+						fputs(" (",file);
+						for (i = 0; i < optlen; i++)
+							fprintf(file, "%c",
+								isprint(cp[i]) ?
+									cp[i] : '.');
+						fputs(")\n", file);
+					}
+				}
+				rdatalen -= 4 + optlen;
+			}
 		} else {
 			n = ns_sprintrr(handle, &rr, NULL, NULL,
 					buf, buflen);
@@ -202,7 +248,7 @@ do_section(const res_state statp,
 						buf = malloc(buflen += 1024);
 					if (buf == NULL) {
 						fprintf(file,
-				              ";; memory allocation failure\n");
+					      ";; memory allocation failure\n");
 					      return;
 					}
 					continue;
@@ -379,7 +425,7 @@ static const struct res_sym __p_default_
 	{ns_s_an,	"ANSWER",	(char *)0},
 	{ns_s_ns,	"AUTHORITY",	(char *)0},
 	{ns_s_ar,	"ADDITIONAL",	(char *)0},
-	{0,             (char *)0,	(char *)0}
+	{0,		(char *)0,	(char *)0}
 };
 
 static const struct res_sym __p_update_section_syms[] = {
@@ -387,7 +433,7 @@ static const struct res_sym __p_update_s
 	{S_PREREQ,	"PREREQUISITE",	(char *)0},
 	{S_UPDATE,	"UPDATE",	(char *)0},
 	{S_ADDT,	"ADDITIONAL",	(char *)0},
-	{0,             (char *)0,	(char *)0}
+	{0,		(char *)0,	(char *)0}
 };
 
 const struct res_sym __p_key_syms[] = {
@@ -615,6 +661,7 @@ p_option(u_long option) {
 	case RES_USE_INET6:	return "inet6";
 #ifdef RES_USE_EDNS0	/*%< KAME extension */
 	case RES_USE_EDNS0:	return "edns0";
+	case RES_NSID:		return "nsid";
 #endif
 #ifdef RES_USE_DNAME
 	case RES_USE_DNAME:	return "dname";

Modified: user/mlaier/pf44head/lib/libc/resolv/res_mkquery.c
==============================================================================
--- user/mlaier/pf44head/lib/libc/resolv/res_mkquery.c	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/lib/libc/resolv/res_mkquery.c	Tue Dec 16 09:15:47 2008	(r186173)
@@ -66,7 +66,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_mkquery.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_mkquery.c,v 1.5.18.1 2005/04/27 05:01:11 sra Exp $";
+static const char rcsid[] = "$Id: res_mkquery.c,v 1.5.18.2 2008/04/03 23:15:15 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -201,9 +201,6 @@ res_nmkquery(res_state statp,
 
 #ifdef RES_USE_EDNS0
 /* attach OPT pseudo-RR, as documented in RFC2671 (EDNS0). */
-#ifndef T_OPT
-#define T_OPT	41
-#endif
 
 int
 res_nopt(res_state statp,
@@ -228,15 +225,16 @@ res_nopt(res_state statp,
 	if ((ep - cp) < 1 + RRFIXEDSZ)
 		return (-1);
 
-	*cp++ = 0;	/*%< "." */
-	ns_put16(T_OPT, cp);	/*%< TYPE */
+	*cp++ = 0;				/*%< "." */
+	ns_put16(ns_t_opt, cp);			/*%< TYPE */
 	cp += INT16SZ;
 	if (anslen > 0xffff)
 		anslen = 0xffff;		/* limit to 16bit value */
-	ns_put16(anslen & 0xffff, cp);	/*%< CLASS = UDP payload size */
+	ns_put16(anslen & 0xffff, cp);		/*%< CLASS = UDP payload size */
 	cp += INT16SZ;
-	*cp++ = NOERROR;	/*%< extended RCODE */
-	*cp++ = 0;		/*%< EDNS version */
+	*cp++ = NOERROR;			/*%< extended RCODE */
+	*cp++ = 0;				/*%< EDNS version */
+
 	if (statp->options & RES_USE_DNSSEC) {
 #ifdef DEBUG
 		if (statp->options & RES_DEBUG)
@@ -246,12 +244,60 @@ res_nopt(res_state statp,
 	}
 	ns_put16(flags, cp);
 	cp += INT16SZ;
-	ns_put16(0, cp);	/*%< RDLEN */
+
+	ns_put16(0U, cp);			/*%< RDLEN */
 	cp += INT16SZ;
+
 	hp->arcount = htons(ntohs(hp->arcount) + 1);
 
 	return (cp - buf);
 }
+
+/*
+ * Construct variable data (RDATA) block for OPT psuedo-RR, append it
+ * to the buffer, then update the RDLEN field (previously set to zero by
+ * res_nopt()) with the new RDATA length.
+ */
+int
+res_nopt_rdata(res_state statp,
+	  int n0,	 	/*%< current offset in buffer */
+	  u_char *buf,	 	/*%< buffer to put query */
+	  int buflen,		/*%< size of buffer */
+	  u_char *rdata,	/*%< ptr to start of opt rdata */
+	  u_short code,		/*%< OPTION-CODE */
+	  u_short len,		/*%< OPTION-LENGTH */
+	  u_char *data)		/*%< OPTION_DATA */
+{
+	register u_char *cp, *ep;
+
+#ifdef DEBUG
+	if ((statp->options & RES_DEBUG) != 0U)
+		printf(";; res_nopt_rdata()\n");
+#endif
+
+	cp = buf + n0;
+	ep = buf + buflen;
+
+	if ((ep - cp) < (4 + len))
+		return (-1);
+
+	if (rdata < (buf + 2) || rdata >= ep)
+		return (-1);
+
+	ns_put16(code, cp);
+	cp += INT16SZ;
+
+	ns_put16(len, cp);
+	cp += INT16SZ;
+
+	memcpy(cp, data, len);
+	cp += len;
+
+	len = cp - rdata;
+	ns_put16(len, rdata - 2);	/* Update RDLEN field */
+
+	return (cp - buf);
+}
 #endif
 
 /*! \file */

Modified: user/mlaier/pf44head/lib/libc/resolv/res_query.c
==============================================================================
--- user/mlaier/pf44head/lib/libc/resolv/res_query.c	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/lib/libc/resolv/res_query.c	Tue Dec 16 09:15:47 2008	(r186173)
@@ -66,7 +66,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_query.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_query.c,v 1.7.18.1 2005/04/27 05:01:11 sra Exp $";
+static const char rcsid[] = "$Id: res_query.c,v 1.7.18.2 2008/04/03 23:15:15 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -115,8 +115,9 @@ res_nquery(res_state statp,
 {
 	u_char buf[MAXPACKET];
 	HEADER *hp = (HEADER *) answer;
-	int n;
 	u_int oflags;
+	u_char *rdata;
+	int n;
 
 	oflags = statp->_flags;
 
@@ -131,8 +132,14 @@ again:
 			 buf, sizeof(buf));
 #ifdef RES_USE_EDNS0
 	if (n > 0 && (statp->_flags & RES_F_EDNS0ERR) == 0 &&
-	    (statp->options & (RES_USE_EDNS0|RES_USE_DNSSEC)) != 0U)
+	    (statp->options & (RES_USE_EDNS0|RES_USE_DNSSEC|RES_NSID))) {
 		n = res_nopt(statp, n, buf, sizeof(buf), anslen);
+		rdata = &buf[n];
+		if (n > 0 && (statp->options & RES_NSID) != 0U) {
+			n = res_nopt_rdata(statp, n, buf, sizeof(buf), rdata,
+					   NS_OPT_NSID, 0, NULL);
+		}
+	}
 #endif
 	if (n <= 0) {
 #ifdef DEBUG
@@ -142,6 +149,7 @@ again:
 		RES_SET_H_ERRNO(statp, NO_RECOVERY);
 		return (n);
 	}
+
 	n = res_nsend(statp, buf, n, answer, anslen);
 	if (n < 0) {
 #ifdef RES_USE_EDNS0

Modified: user/mlaier/pf44head/lib/libc/resolv/res_send.c
==============================================================================
--- user/mlaier/pf44head/lib/libc/resolv/res_send.c	Tue Dec 16 09:06:47 2008	(r186172)
+++ user/mlaier/pf44head/lib/libc/resolv/res_send.c	Tue Dec 16 09:15:47 2008	(r186173)
@@ -66,7 +66,7 @@
 
 #if defined(LIBC_SCCS) && !defined(lint)
 static const char sccsid[] = "@(#)res_send.c	8.1 (Berkeley) 6/4/93";
-static const char rcsid[] = "$Id: res_send.c,v 1.9.18.8 2006/10/16 23:00:58 marka Exp $";
+static const char rcsid[] = "$Id: res_send.c,v 1.9.18.10 2008/01/27 02:06:26 marka Exp $";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
@@ -302,7 +302,7 @@ int
 res_nsend(res_state statp,
 	  const u_char *buf, int buflen, u_char *ans, int anssiz)
 {
-	int gotsomewhere, terrno, try, v_circuit, resplen, ns, n;
+	int gotsomewhere, terrno, tries, v_circuit, resplen, ns, n;
 #ifdef USE_KQUEUE
 	int kq;
 #endif
@@ -420,7 +420,7 @@ res_nsend(res_state statp,
 	/*
 	 * Send request, RETRY times, or until successful.
 	 */
-	for (try = 0; try < statp->retry; try++) {
+	for (tries = 0; tries < statp->retry; tries++) {
 	    for (ns = 0; ns < statp->nscount; ns++) {
 		struct sockaddr *nsap;
 		int nsaplen;
@@ -471,7 +471,7 @@ res_nsend(res_state statp,
 
 		if (v_circuit) {

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

From owner-svn-src-user@FreeBSD.ORG  Thu Dec 18 14:21:09 2008
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 880C01065670;
	Thu, 18 Dec 2008 14:21:09 +0000 (UTC)
	(envelope-from nyan@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 738478FC1A;
	Thu, 18 Dec 2008 14:21:09 +0000 (UTC)
	(envelope-from nyan@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 mBIEL9m3043555;
	Thu, 18 Dec 2008 14:21:09 GMT (envelope-from nyan@svn.freebsd.org)
Received: (from nyan@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBIEL8kK043523;
	Thu, 18 Dec 2008 14:21:08 GMT (envelope-from nyan@svn.freebsd.org)
Message-Id: <200812181421.mBIEL8kK043523@svn.freebsd.org>
From: Takahashi Yoshihiro <nyan@FreeBSD.org>
Date: Thu, 18 Dec 2008 14:21:08 +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: r186281 - in user/nyan/pc98/sys: . amd64 amd64/amd64
	amd64/conf amd64/include amd64/linux32 arm/arm arm/at91
	arm/conf arm/include arm/mv arm/sa11x0 arm/xscale/i80321
	arm/xscale/i8134x a...
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, 18 Dec 2008 14:21:09 -0000

Author: nyan
Date: Thu Dec 18 14:21:06 2008
New Revision: 186281
URL: http://svn.freebsd.org/changeset/base/186281

Log:
  MFH: 183799:186279

Added:
  user/nyan/pc98/sys/arm/arm/cpufunc_asm_feroceon.S
     - copied unchanged from r186279, head/sys/arm/arm/cpufunc_asm_feroceon.S
  user/nyan/pc98/sys/arm/arm/minidump_machdep.c
     - copied unchanged from r186279, head/sys/arm/arm/minidump_machdep.c
  user/nyan/pc98/sys/arm/at91/at91_machdep.c
     - copied unchanged from r186279, head/sys/arm/at91/at91_machdep.c
  user/nyan/pc98/sys/arm/at91/at91board.h
     - copied unchanged from r186279, head/sys/arm/at91/at91board.h
  user/nyan/pc98/sys/arm/at91/board_bwct.c
     - copied unchanged from r186279, head/sys/arm/at91/board_bwct.c
  user/nyan/pc98/sys/arm/at91/board_hl200.c
     - copied unchanged from r186279, head/sys/arm/at91/board_hl200.c
  user/nyan/pc98/sys/arm/at91/board_kb920x.c
     - copied unchanged from r186279, head/sys/arm/at91/board_kb920x.c
  user/nyan/pc98/sys/arm/at91/board_tsc4370.c
     - copied unchanged from r186279, head/sys/arm/at91/board_tsc4370.c
  user/nyan/pc98/sys/arm/at91/std.bwct
     - copied unchanged from r186279, head/sys/arm/at91/std.bwct
  user/nyan/pc98/sys/arm/at91/std.hl200
     - copied unchanged from r186279, head/sys/arm/at91/std.hl200
  user/nyan/pc98/sys/arm/at91/std.tsc4370
     - copied unchanged from r186279, head/sys/arm/at91/std.tsc4370
  user/nyan/pc98/sys/arm/conf/DB-78XXX
     - copied unchanged from r186279, head/sys/arm/conf/DB-78XXX
  user/nyan/pc98/sys/arm/conf/DB-88F5XXX
     - copied unchanged from r186279, head/sys/arm/conf/DB-88F5XXX
  user/nyan/pc98/sys/arm/conf/DB-88F6XXX
     - copied unchanged from r186279, head/sys/arm/conf/DB-88F6XXX
  user/nyan/pc98/sys/arm/conf/DEFAULTS
     - copied unchanged from r186279, head/sys/arm/conf/DEFAULTS
  user/nyan/pc98/sys/arm/include/bootinfo.h
     - copied unchanged from r186279, head/sys/arm/include/bootinfo.h
  user/nyan/pc98/sys/arm/include/minidump.h
     - copied unchanged from r186279, head/sys/arm/include/minidump.h
  user/nyan/pc98/sys/arm/mv/
     - copied from r186279, head/sys/arm/mv/
  user/nyan/pc98/sys/boot/arm/uboot/
     - copied from r186279, head/sys/boot/arm/uboot/
  user/nyan/pc98/sys/boot/i386/gptzfsboot/
     - copied from r186279, head/sys/boot/i386/gptzfsboot/
  user/nyan/pc98/sys/boot/i386/zfsboot/
     - copied from r186279, head/sys/boot/i386/zfsboot/
  user/nyan/pc98/sys/boot/powerpc/boot1.chrp/
     - copied from r186279, head/sys/boot/powerpc/boot1.chrp/
  user/nyan/pc98/sys/boot/zfs/
     - copied from r186279, head/sys/boot/zfs/
  user/nyan/pc98/sys/cddl/boot/
     - copied from r186279, head/sys/cddl/boot/
  user/nyan/pc98/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c
     - copied unchanged from r186279, head/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/file.h
     - copied unchanged from r186279, head/sys/cddl/compat/opensolaris/sys/file.h
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/kidmap.h
     - copied unchanged from r186279, head/sys/cddl/compat/opensolaris/sys/kidmap.h
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/pathname.h
     - copied unchanged from r186279, head/sys/cddl/compat/opensolaris/sys/pathname.h
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/refstr.h
     - copied unchanged from r186279, head/sys/cddl/compat/opensolaris/sys/refstr.h
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/sid.h
     - copied unchanged from r186279, head/sys/cddl/compat/opensolaris/sys/sid.h
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/sig.h
     - copied unchanged from r186279, head/sys/cddl/compat/opensolaris/sys/sig.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/common/unicode/
     - copied from r186279, head/sys/cddl/contrib/opensolaris/common/unicode/
  user/nyan/pc98/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c
     - copied unchanged from r186279, head/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h
     - copied unchanged from r186279, head/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c
     - copied unchanged from r186279, head/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h
     - copied unchanged from r186279, head/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c
     - copied unchanged from r186279, head/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c
     - copied unchanged from r186279, head/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c
     - copied unchanged from r186279, head/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c
     - copied unchanged from r186279, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c
     - copied unchanged from r186279, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c
     - copied unchanged from r186279, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h
     - copied unchanged from r186279, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h
     - copied unchanged from r186279, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h
     - copied unchanged from r186279, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h
     - copied unchanged from r186279, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c
     - copied unchanged from r186279, head/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h
     - copied unchanged from r186279, head/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h
     - copied unchanged from r186279, head/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/extdirent.h
     - copied unchanged from r186279, head/sys/cddl/contrib/opensolaris/uts/common/sys/extdirent.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/idmap.h
     - copied unchanged from r186279, head/sys/cddl/contrib/opensolaris/uts/common/sys/idmap.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/
     - copied from r186279, head/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep.h
     - copied unchanged from r186279, head/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep_data.h
     - copied unchanged from r186279, head/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep_data.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h
     - copied unchanged from r186279, head/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h
  user/nyan/pc98/sys/dev/adb/
     - copied from r186279, head/sys/dev/adb/
  user/nyan/pc98/sys/dev/ale/
     - copied from r186279, head/sys/dev/ale/
  user/nyan/pc98/sys/dev/ath/ath_hal/
     - copied from r186279, head/sys/dev/ath/ath_hal/
  user/nyan/pc98/sys/dev/cfi/
     - copied from r186279, head/sys/dev/cfi/
  user/nyan/pc98/sys/dev/hwpmc/hwpmc_core.c
     - copied unchanged from r186279, head/sys/dev/hwpmc/hwpmc_core.c
  user/nyan/pc98/sys/dev/hwpmc/hwpmc_core.h
     - copied unchanged from r186279, head/sys/dev/hwpmc/hwpmc_core.h
  user/nyan/pc98/sys/dev/hwpmc/hwpmc_intel.c
     - copied unchanged from r186279, head/sys/dev/hwpmc/hwpmc_intel.c
  user/nyan/pc98/sys/dev/hwpmc/hwpmc_tsc.c
     - copied unchanged from r186279, head/sys/dev/hwpmc/hwpmc_tsc.c
  user/nyan/pc98/sys/dev/hwpmc/hwpmc_tsc.h
     - copied unchanged from r186279, head/sys/dev/hwpmc/hwpmc_tsc.h
  user/nyan/pc98/sys/dev/mge/
     - copied from r186279, head/sys/dev/mge/
  user/nyan/pc98/sys/dev/mn/
     - copied from r186279, head/sys/dev/mn/
  user/nyan/pc98/sys/dev/sdhci/
     - copied from r186279, head/sys/dev/sdhci/
  user/nyan/pc98/sys/dev/uart/uart_bus_mbus.c
     - copied unchanged from r186279, head/sys/dev/uart/uart_bus_mbus.c
  user/nyan/pc98/sys/dev/uart/uart_cpu_mv.c
     - copied unchanged from r186279, head/sys/dev/uart/uart_cpu_mv.c
  user/nyan/pc98/sys/dev/usb/ehci_mbus.c
     - copied unchanged from r186279, head/sys/dev/usb/ehci_mbus.c
  user/nyan/pc98/sys/dev/usb2/
     - copied from r186279, head/sys/dev/usb2/
  user/nyan/pc98/sys/kern/kern_cons.c
     - copied unchanged from r186279, head/sys/kern/kern_cons.c
  user/nyan/pc98/sys/kern/kern_osd.c
     - copied unchanged from r186279, head/sys/kern/kern_osd.c
  user/nyan/pc98/sys/kern/kern_vimage.c
     - copied unchanged from r186279, head/sys/kern/kern_vimage.c
  user/nyan/pc98/sys/kern/subr_bufring.c
     - copied unchanged from r186279, head/sys/kern/subr_bufring.c
  user/nyan/pc98/sys/kgssapi/
     - copied from r186279, head/sys/kgssapi/
  user/nyan/pc98/sys/mips/conf/DEFAULTS
     - copied unchanged from r186279, head/sys/mips/conf/DEFAULTS
  user/nyan/pc98/sys/modules/ale/
     - copied from r186279, head/sys/modules/ale/
  user/nyan/pc98/sys/modules/amr/amr_cam/
     - copied from r186279, head/sys/modules/amr/amr_cam/
  user/nyan/pc98/sys/modules/kgssapi/
     - copied from r186279, head/sys/modules/kgssapi/
  user/nyan/pc98/sys/modules/kgssapi_krb5/
     - copied from r186279, head/sys/modules/kgssapi_krb5/
  user/nyan/pc98/sys/modules/sdhci/
     - copied from r186279, head/sys/modules/sdhci/
  user/nyan/pc98/sys/modules/usb2/
     - copied from r186279, head/sys/modules/usb2/
  user/nyan/pc98/sys/net/if_llatbl.c
     - copied unchanged from r186279, head/sys/net/if_llatbl.c
  user/nyan/pc98/sys/net/if_llatbl.h
     - copied unchanged from r186279, head/sys/net/if_llatbl.h
  user/nyan/pc98/sys/netinet/tcp_hostcache.h
     - copied unchanged from r186279, head/sys/netinet/tcp_hostcache.h
  user/nyan/pc98/sys/nfsclient/nfs_krpc.c
     - copied unchanged from r186279, head/sys/nfsclient/nfs_krpc.c
  user/nyan/pc98/sys/nfsserver/nfs_fha.c
     - copied unchanged from r186279, head/sys/nfsserver/nfs_fha.c
  user/nyan/pc98/sys/nfsserver/nfs_fha.h
     - copied unchanged from r186279, head/sys/nfsserver/nfs_fha.h
  user/nyan/pc98/sys/nfsserver/nfs_srvkrpc.c
     - copied unchanged from r186279, head/sys/nfsserver/nfs_srvkrpc.c
  user/nyan/pc98/sys/powerpc/mpc85xx/lbc.c
     - copied unchanged from r186279, head/sys/powerpc/mpc85xx/lbc.c
  user/nyan/pc98/sys/powerpc/mpc85xx/lbc.h
     - copied unchanged from r186279, head/sys/powerpc/mpc85xx/lbc.h
  user/nyan/pc98/sys/powerpc/mpc85xx/mpc85xx.h
     - copied unchanged from r186279, head/sys/powerpc/mpc85xx/mpc85xx.h
  user/nyan/pc98/sys/powerpc/ofw/ofw_pcibus.c
     - copied unchanged from r186279, head/sys/powerpc/ofw/ofw_pcibus.c
  user/nyan/pc98/sys/powerpc/powermac/cuda.c
     - copied unchanged from r186279, head/sys/powerpc/powermac/cuda.c
  user/nyan/pc98/sys/powerpc/powermac/cudavar.h
     - copied unchanged from r186279, head/sys/powerpc/powermac/cudavar.h
  user/nyan/pc98/sys/powerpc/powermac/macgpio.c
     - copied unchanged from r186279, head/sys/powerpc/powermac/macgpio.c
  user/nyan/pc98/sys/powerpc/powermac/macgpiovar.h
     - copied unchanged from r186279, head/sys/powerpc/powermac/macgpiovar.h
  user/nyan/pc98/sys/powerpc/powermac/pmu.c
     - copied unchanged from r186279, head/sys/powerpc/powermac/pmu.c
  user/nyan/pc98/sys/powerpc/powermac/pmuvar.h
     - copied unchanged from r186279, head/sys/powerpc/powermac/pmuvar.h
  user/nyan/pc98/sys/powerpc/powermac/viareg.h
     - copied unchanged from r186279, head/sys/powerpc/powermac/viareg.h
  user/nyan/pc98/sys/rpc/replay.c
     - copied unchanged from r186279, head/sys/rpc/replay.c
  user/nyan/pc98/sys/rpc/replay.h
     - copied unchanged from r186279, head/sys/rpc/replay.h
  user/nyan/pc98/sys/rpc/rpcsec_gss/
     - copied from r186279, head/sys/rpc/rpcsec_gss/
  user/nyan/pc98/sys/rpc/rpcsec_gss.h
     - copied unchanged from r186279, head/sys/rpc/rpcsec_gss.h
  user/nyan/pc98/sys/security/mac/mac_cred.c
     - copied unchanged from r186279, head/sys/security/mac/mac_cred.c
  user/nyan/pc98/sys/security/mac_bsdextended/ugidfw_internal.h
     - copied unchanged from r186279, head/sys/security/mac_bsdextended/ugidfw_internal.h
  user/nyan/pc98/sys/security/mac_bsdextended/ugidfw_system.c
     - copied unchanged from r186279, head/sys/security/mac_bsdextended/ugidfw_system.c
  user/nyan/pc98/sys/security/mac_bsdextended/ugidfw_vnode.c
     - copied unchanged from r186279, head/sys/security/mac_bsdextended/ugidfw_vnode.c
  user/nyan/pc98/sys/sys/buf_ring.h
     - copied unchanged from r186279, head/sys/sys/buf_ring.h
  user/nyan/pc98/sys/sys/cfictl.h
     - copied unchanged from r186279, head/sys/sys/cfictl.h
  user/nyan/pc98/sys/sys/osd.h
     - copied unchanged from r186279, head/sys/sys/osd.h
  user/nyan/pc98/sys/xen/xenbus/xenbus_if.m
     - copied unchanged from r186279, head/sys/xen/xenbus/xenbus_if.m
  user/nyan/pc98/sys/xen/xenbus/xenbusvar.h
     - copied unchanged from r186279, head/sys/xen/xenbus/xenbusvar.h
Deleted:
  user/nyan/pc98/sys/arm/at91/files.kb920x
  user/nyan/pc98/sys/arm/at91/kb920x_machdep.c
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/acl.h
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/callb.h
  user/nyan/pc98/sys/contrib/dev/ath/
  user/nyan/pc98/sys/i386/include/xen/xenbus.h
  user/nyan/pc98/sys/kern/tty_cons.c
  user/nyan/pc98/sys/modules/ath_hal/
  user/nyan/pc98/sys/modules/ath_rate_amrr/
  user/nyan/pc98/sys/modules/ath_rate_onoe/
  user/nyan/pc98/sys/modules/ath_rate_sample/
  user/nyan/pc98/sys/pci/if_mn.c
  user/nyan/pc98/sys/powerpc/include/nexusvar.h
  user/nyan/pc98/sys/powerpc/ofw/ofw_pci.c
  user/nyan/pc98/sys/powerpc/ofw/ofw_pci.h
  user/nyan/pc98/sys/sparc64/include/ofw_bus.h
  user/nyan/pc98/sys/sparc64/sparc64/ofw_bus.c
  user/nyan/pc98/sys/sun4v/include/ofw_bus.h
Modified:
  user/nyan/pc98/sys/   (props changed)
  user/nyan/pc98/sys/amd64/Makefile
  user/nyan/pc98/sys/amd64/amd64/amd64_mem.c
  user/nyan/pc98/sys/amd64/amd64/db_trace.c
  user/nyan/pc98/sys/amd64/amd64/dump_machdep.c
  user/nyan/pc98/sys/amd64/amd64/elf_machdep.c
  user/nyan/pc98/sys/amd64/amd64/exception.S
  user/nyan/pc98/sys/amd64/amd64/genassym.c
  user/nyan/pc98/sys/amd64/amd64/identcpu.c
  user/nyan/pc98/sys/amd64/amd64/initcpu.c
  user/nyan/pc98/sys/amd64/amd64/intr_machdep.c
  user/nyan/pc98/sys/amd64/amd64/local_apic.c
  user/nyan/pc98/sys/amd64/amd64/minidump_machdep.c
  user/nyan/pc98/sys/amd64/amd64/mp_machdep.c
  user/nyan/pc98/sys/amd64/amd64/msi.c
  user/nyan/pc98/sys/amd64/amd64/pmap.c
  user/nyan/pc98/sys/amd64/amd64/prof_machdep.c
  user/nyan/pc98/sys/amd64/amd64/tsc.c
  user/nyan/pc98/sys/amd64/conf/DEFAULTS
  user/nyan/pc98/sys/amd64/conf/GENERIC
  user/nyan/pc98/sys/amd64/conf/NOTES
  user/nyan/pc98/sys/amd64/include/apicreg.h
  user/nyan/pc98/sys/amd64/include/apicvar.h
  user/nyan/pc98/sys/amd64/include/atomic.h
  user/nyan/pc98/sys/amd64/include/clock.h
  user/nyan/pc98/sys/amd64/include/cputypes.h
  user/nyan/pc98/sys/amd64/include/elf.h
  user/nyan/pc98/sys/amd64/include/md_var.h
  user/nyan/pc98/sys/amd64/include/pmc_mdep.h
  user/nyan/pc98/sys/amd64/include/specialreg.h
  user/nyan/pc98/sys/amd64/linux32/linux.h
  user/nyan/pc98/sys/amd64/linux32/linux32_machdep.c
  user/nyan/pc98/sys/amd64/linux32/linux32_proto.h
  user/nyan/pc98/sys/amd64/linux32/linux32_syscall.h
  user/nyan/pc98/sys/amd64/linux32/linux32_sysent.c
  user/nyan/pc98/sys/amd64/linux32/linux32_sysvec.c
  user/nyan/pc98/sys/amd64/linux32/syscalls.master
  user/nyan/pc98/sys/arm/arm/busdma_machdep.c
  user/nyan/pc98/sys/arm/arm/cpufunc.c
  user/nyan/pc98/sys/arm/arm/dump_machdep.c
  user/nyan/pc98/sys/arm/arm/elf_machdep.c
  user/nyan/pc98/sys/arm/arm/elf_trampoline.c
  user/nyan/pc98/sys/arm/arm/genassym.c
  user/nyan/pc98/sys/arm/arm/identcpu.c
  user/nyan/pc98/sys/arm/arm/locore.S
  user/nyan/pc98/sys/arm/arm/pmap.c
  user/nyan/pc98/sys/arm/arm/undefined.c
  user/nyan/pc98/sys/arm/at91/at91.c
  user/nyan/pc98/sys/arm/at91/at91_mci.c
  user/nyan/pc98/sys/arm/at91/at91_mcireg.h
  user/nyan/pc98/sys/arm/at91/at91_pdcreg.h
  user/nyan/pc98/sys/arm/at91/at91_pio.c
  user/nyan/pc98/sys/arm/at91/at91_pioreg.h
  user/nyan/pc98/sys/arm/at91/at91_piovar.h
  user/nyan/pc98/sys/arm/at91/at91_pmc.c
  user/nyan/pc98/sys/arm/at91/at91_pmcreg.h
  user/nyan/pc98/sys/arm/at91/at91_pmcvar.h
  user/nyan/pc98/sys/arm/at91/at91_rtc.c
  user/nyan/pc98/sys/arm/at91/at91_rtcreg.h
  user/nyan/pc98/sys/arm/at91/at91_spi.c
  user/nyan/pc98/sys/arm/at91/at91_spireg.h
  user/nyan/pc98/sys/arm/at91/at91_ssc.c
  user/nyan/pc98/sys/arm/at91/at91_sscreg.h
  user/nyan/pc98/sys/arm/at91/at91_st.c
  user/nyan/pc98/sys/arm/at91/at91_streg.h
  user/nyan/pc98/sys/arm/at91/at91_twi.c
  user/nyan/pc98/sys/arm/at91/at91_twiio.h
  user/nyan/pc98/sys/arm/at91/at91_twireg.h
  user/nyan/pc98/sys/arm/at91/at91_usartreg.h
  user/nyan/pc98/sys/arm/at91/at91rm92reg.h
  user/nyan/pc98/sys/arm/at91/at91var.h
  user/nyan/pc98/sys/arm/at91/files.at91
  user/nyan/pc98/sys/arm/at91/if_ate.c
  user/nyan/pc98/sys/arm/at91/if_atereg.h
  user/nyan/pc98/sys/arm/at91/ohci_atmelarm.c
  user/nyan/pc98/sys/arm/at91/std.at91
  user/nyan/pc98/sys/arm/at91/std.kb920x
  user/nyan/pc98/sys/arm/at91/uart_bus_at91usart.c
  user/nyan/pc98/sys/arm/at91/uart_cpu_at91rm9200usart.c
  user/nyan/pc98/sys/arm/at91/uart_dev_at91usart.c
  user/nyan/pc98/sys/arm/conf/AVILA
  user/nyan/pc98/sys/arm/conf/BWCT
  user/nyan/pc98/sys/arm/conf/CRB
  user/nyan/pc98/sys/arm/conf/EP80219
  user/nyan/pc98/sys/arm/conf/GUMSTIX
  user/nyan/pc98/sys/arm/conf/HL200
  user/nyan/pc98/sys/arm/conf/IQ31244
  user/nyan/pc98/sys/arm/conf/KB920X
  user/nyan/pc98/sys/arm/conf/NSLU
  user/nyan/pc98/sys/arm/conf/SIMICS
  user/nyan/pc98/sys/arm/conf/SKYEYE
  user/nyan/pc98/sys/arm/include/armreg.h
  user/nyan/pc98/sys/arm/include/atomic.h
  user/nyan/pc98/sys/arm/include/cpufunc.h
  user/nyan/pc98/sys/arm/include/elf.h
  user/nyan/pc98/sys/arm/include/intr.h
  user/nyan/pc98/sys/arm/include/md_var.h
  user/nyan/pc98/sys/arm/include/metadata.h
  user/nyan/pc98/sys/arm/include/pmap.h
  user/nyan/pc98/sys/arm/include/resource.h
  user/nyan/pc98/sys/arm/sa11x0/assabet_machdep.c
  user/nyan/pc98/sys/arm/xscale/i80321/ep80219_machdep.c
  user/nyan/pc98/sys/arm/xscale/i80321/iq31244_machdep.c
  user/nyan/pc98/sys/arm/xscale/i8134x/crb_machdep.c
  user/nyan/pc98/sys/arm/xscale/ixp425/avila_machdep.c
  user/nyan/pc98/sys/arm/xscale/ixp425/if_npe.c
  user/nyan/pc98/sys/arm/xscale/pxa/pxa_machdep.c
  user/nyan/pc98/sys/boot/Makefile
  user/nyan/pc98/sys/boot/arm/Makefile
  user/nyan/pc98/sys/boot/common/Makefile.inc
  user/nyan/pc98/sys/boot/common/bootstrap.h
  user/nyan/pc98/sys/boot/common/interp.c
  user/nyan/pc98/sys/boot/common/load_elf.c
  user/nyan/pc98/sys/boot/common/loader.8
  user/nyan/pc98/sys/boot/ficl/Makefile
  user/nyan/pc98/sys/boot/forth/loader.conf
  user/nyan/pc98/sys/boot/forth/support.4th
  user/nyan/pc98/sys/boot/i386/Makefile
  user/nyan/pc98/sys/boot/i386/boot0/Makefile
  user/nyan/pc98/sys/boot/i386/boot0/boot0.S
  user/nyan/pc98/sys/boot/i386/btx/btxldr/btxldr.S
  user/nyan/pc98/sys/boot/i386/libi386/biosdisk.c
  user/nyan/pc98/sys/boot/i386/libi386/bootinfo32.c
  user/nyan/pc98/sys/boot/i386/libi386/devicename.c
  user/nyan/pc98/sys/boot/i386/loader/Makefile
  user/nyan/pc98/sys/boot/i386/loader/conf.c
  user/nyan/pc98/sys/boot/i386/loader/main.c
  user/nyan/pc98/sys/boot/ofw/libofw/ofw_disk.c
  user/nyan/pc98/sys/boot/powerpc/Makefile
  user/nyan/pc98/sys/boot/powerpc/uboot/conf.c
  user/nyan/pc98/sys/boot/uboot/common/main.c
  user/nyan/pc98/sys/boot/uboot/lib/devicename.c
  user/nyan/pc98/sys/boot/uboot/lib/disk.c
  user/nyan/pc98/sys/boot/uboot/lib/glue.c
  user/nyan/pc98/sys/boot/uboot/lib/glue.h
  user/nyan/pc98/sys/boot/uboot/lib/libuboot.h
  user/nyan/pc98/sys/boot/uboot/lib/net.c
  user/nyan/pc98/sys/bsm/audit.h
  user/nyan/pc98/sys/bsm/audit_internal.h
  user/nyan/pc98/sys/bsm/audit_kevents.h
  user/nyan/pc98/sys/bsm/audit_record.h
  user/nyan/pc98/sys/cam/cam_sim.c
  user/nyan/pc98/sys/cam/cam_sim.h
  user/nyan/pc98/sys/cam/cam_xpt.c
  user/nyan/pc98/sys/cam/scsi/scsi_target.c
  user/nyan/pc98/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c
  user/nyan/pc98/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c
  user/nyan/pc98/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c
  user/nyan/pc98/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c
  user/nyan/pc98/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c
  user/nyan/pc98/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c
  user/nyan/pc98/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/atomic.h
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/cred.h
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/dnlc.h
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/kmem.h
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/misc.h
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/mntent.h
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/param.h
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/policy.h
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/proc.h
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/sunddi.h
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/sysmacros.h
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/time.h
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/types.h
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/uio.h
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/vfs.h
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/vnode.h
  user/nyan/pc98/sys/cddl/compat/opensolaris/sys/zone.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/common/acl/acl_common.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/common/acl/acl_common.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S
  user/nyan/pc98/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S
  user/nyan/pc98/sys/cddl/contrib/opensolaris/common/avl/avl.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/Makefile.files
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/os/callb.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/os/list.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/list.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h
  user/nyan/pc98/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c
  user/nyan/pc98/sys/cddl/dev/cyclic/cyclic.c
  user/nyan/pc98/sys/cddl/dev/dtrace/dtrace_ioctl.c
  user/nyan/pc98/sys/cddl/dev/dtrace/dtrace_load.c
  user/nyan/pc98/sys/cddl/dev/dtrace/dtrace_unload.c
  user/nyan/pc98/sys/cddl/dev/dtrace/i386/dtrace_subr.c
  user/nyan/pc98/sys/cddl/dev/systrace/systrace.c
  user/nyan/pc98/sys/compat/freebsd32/freebsd32.h
  user/nyan/pc98/sys/compat/freebsd32/freebsd32_misc.c
  user/nyan/pc98/sys/compat/freebsd32/freebsd32_proto.h
  user/nyan/pc98/sys/compat/freebsd32/freebsd32_signal.h
  user/nyan/pc98/sys/compat/freebsd32/freebsd32_syscall.h
  user/nyan/pc98/sys/compat/freebsd32/freebsd32_syscalls.c
  user/nyan/pc98/sys/compat/freebsd32/freebsd32_sysent.c
  user/nyan/pc98/sys/compat/freebsd32/syscalls.master
  user/nyan/pc98/sys/compat/ia32/ia32_sysvec.c
  user/nyan/pc98/sys/compat/linprocfs/linprocfs.c
  user/nyan/pc98/sys/compat/linux/linux_emul.c
  user/nyan/pc98/sys/compat/linux/linux_futex.c
  user/nyan/pc98/sys/compat/linux/linux_futex.h
  user/nyan/pc98/sys/compat/linux/linux_getcwd.c
  user/nyan/pc98/sys/compat/linux/linux_ioctl.c
  user/nyan/pc98/sys/compat/linux/linux_ipc.c
  user/nyan/pc98/sys/compat/linux/linux_misc.c
  user/nyan/pc98/sys/compat/linux/linux_signal.c
  user/nyan/pc98/sys/compat/linux/linux_signal.h
  user/nyan/pc98/sys/compat/linux/linux_socket.c
  user/nyan/pc98/sys/compat/linux/linux_socket.h
  user/nyan/pc98/sys/compat/linux/linux_util.c
  user/nyan/pc98/sys/compat/svr4/svr4_sockio.c
  user/nyan/pc98/sys/compat/svr4/svr4_sysvec.c
  user/nyan/pc98/sys/conf/Makefile.arm
  user/nyan/pc98/sys/conf/NOTES
  user/nyan/pc98/sys/conf/files
  user/nyan/pc98/sys/conf/files.amd64
  user/nyan/pc98/sys/conf/files.arm
  user/nyan/pc98/sys/conf/files.i386
  user/nyan/pc98/sys/conf/files.mips
  user/nyan/pc98/sys/conf/files.pc98
  user/nyan/pc98/sys/conf/files.powerpc
  user/nyan/pc98/sys/conf/files.sparc64
  user/nyan/pc98/sys/conf/files.sun4v
  user/nyan/pc98/sys/conf/kern.pre.mk
  user/nyan/pc98/sys/conf/kmod.mk
  user/nyan/pc98/sys/conf/ldscript.mips.cfe
  user/nyan/pc98/sys/conf/options
  user/nyan/pc98/sys/conf/options.arm
  user/nyan/pc98/sys/contrib/altq/altq/altq_cbq.c
  user/nyan/pc98/sys/contrib/altq/altq/altq_cdnr.c
  user/nyan/pc98/sys/contrib/altq/altq/altq_hfsc.c
  user/nyan/pc98/sys/contrib/altq/altq/altq_priq.c
  user/nyan/pc98/sys/contrib/altq/altq/altq_red.c
  user/nyan/pc98/sys/contrib/altq/altq/altq_rio.c
  user/nyan/pc98/sys/contrib/altq/altq/altq_rmclass.c
  user/nyan/pc98/sys/contrib/altq/altq/altq_subr.c
  user/nyan/pc98/sys/contrib/ipfilter/netinet/ip_compat.h
  user/nyan/pc98/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c
  user/nyan/pc98/sys/contrib/pf/   (props changed)
  user/nyan/pc98/sys/contrib/pf/net/pf.c
  user/nyan/pc98/sys/contrib/pf/net/pf_if.c
  user/nyan/pc98/sys/contrib/pf/net/pf_ioctl.c
  user/nyan/pc98/sys/contrib/pf/net/pf_subr.c
  user/nyan/pc98/sys/contrib/pf/net/pf_table.c
  user/nyan/pc98/sys/contrib/rdma/rdma_addr.c
  user/nyan/pc98/sys/contrib/rdma/rdma_cma.c
  user/nyan/pc98/sys/crypto/rc4/rc4.c
  user/nyan/pc98/sys/crypto/via/padlock.c
  user/nyan/pc98/sys/dev/aac/aac_pci.c
  user/nyan/pc98/sys/dev/acpi_support/acpi_asus.c
  user/nyan/pc98/sys/dev/acpica/Osd/OsdSchedule.c
  user/nyan/pc98/sys/dev/acpica/acpi.c
  user/nyan/pc98/sys/dev/acpica/acpi_hpet.c
  user/nyan/pc98/sys/dev/acpica/acpi_pcib.c
  user/nyan/pc98/sys/dev/acpica/acpi_smbat.c
  user/nyan/pc98/sys/dev/ae/if_ae.c
  user/nyan/pc98/sys/dev/age/if_age.c
  user/nyan/pc98/sys/dev/age/if_agevar.h
  user/nyan/pc98/sys/dev/amr/amr.c
  user/nyan/pc98/sys/dev/amr/amr_cam.c
  user/nyan/pc98/sys/dev/amr/amrvar.h
  user/nyan/pc98/sys/dev/an/if_an.c
  user/nyan/pc98/sys/dev/ar/if_ar.c
  user/nyan/pc98/sys/dev/asmc/asmc.c
  user/nyan/pc98/sys/dev/ata/ata-dma.c
  user/nyan/pc98/sys/dev/ata/ata-pci.c
  user/nyan/pc98/sys/dev/ata/ata-pci.h
  user/nyan/pc98/sys/dev/ata/ata-queue.c
  user/nyan/pc98/sys/dev/ata/chipsets/ata-ahci.c
  user/nyan/pc98/sys/dev/ata/chipsets/ata-cyrix.c
  user/nyan/pc98/sys/dev/ata/chipsets/ata-marvell.c
  user/nyan/pc98/sys/dev/ata/chipsets/ata-national.c
  user/nyan/pc98/sys/dev/ata/chipsets/ata-serverworks.c
  user/nyan/pc98/sys/dev/ath/ah_osdep.c
  user/nyan/pc98/sys/dev/ath/ah_osdep.h
  user/nyan/pc98/sys/dev/ath/ath_rate/amrr/amrr.c
  user/nyan/pc98/sys/dev/ath/ath_rate/onoe/onoe.c
  user/nyan/pc98/sys/dev/ath/ath_rate/sample/sample.c
  user/nyan/pc98/sys/dev/ath/ath_rate/sample/sample.h
  user/nyan/pc98/sys/dev/ath/if_ath.c
  user/nyan/pc98/sys/dev/ath/if_ath_pci.c
  user/nyan/pc98/sys/dev/ath/if_athrate.h
  user/nyan/pc98/sys/dev/ath/if_athvar.h
  user/nyan/pc98/sys/dev/atkbdc/psm.c
  user/nyan/pc98/sys/dev/bce/if_bce.c
  user/nyan/pc98/sys/dev/bce/if_bcereg.h
  user/nyan/pc98/sys/dev/bge/if_bge.c
  user/nyan/pc98/sys/dev/bge/if_bgereg.h
  user/nyan/pc98/sys/dev/bm/if_bm.c
  user/nyan/pc98/sys/dev/cardbus/cardbus.c
  user/nyan/pc98/sys/dev/cardbus/cardbus_cis.c
  user/nyan/pc98/sys/dev/cardbus/cardbus_device.c
  user/nyan/pc98/sys/dev/cardbus/cardbusreg.h
  user/nyan/pc98/sys/dev/cardbus/cardbusvar.h
  user/nyan/pc98/sys/dev/ce/if_ce.c
  user/nyan/pc98/sys/dev/cfe/cfe_console.c
  user/nyan/pc98/sys/dev/coretemp/coretemp.c
  user/nyan/pc98/sys/dev/cxgb/common/cxgb_ael1002.c
  user/nyan/pc98/sys/dev/cxgb/common/cxgb_common.h
  user/nyan/pc98/sys/dev/cxgb/common/cxgb_ctl_defs.h
  user/nyan/pc98/sys/dev/cxgb/common/cxgb_t3_hw.c
  user/nyan/pc98/sys/dev/cxgb/common/cxgb_xgmac.c
  user/nyan/pc98/sys/dev/cxgb/cxgb_adapter.h
  user/nyan/pc98/sys/dev/cxgb/cxgb_config.h
  user/nyan/pc98/sys/dev/cxgb/cxgb_main.c
  user/nyan/pc98/sys/dev/cxgb/cxgb_multiq.c
  user/nyan/pc98/sys/dev/cxgb/cxgb_osdep.h
  user/nyan/pc98/sys/dev/cxgb/cxgb_sge.c
  user/nyan/pc98/sys/dev/cxgb/sys/cxgb_support.c
  user/nyan/pc98/sys/dev/cxgb/sys/uipc_mvec.c
  user/nyan/pc98/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c
  user/nyan/pc98/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c
  user/nyan/pc98/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c
  user/nyan/pc98/sys/dev/cxgb/ulp/tom/cxgb_l2t.c
  user/nyan/pc98/sys/dev/cxgb/ulp/tom/cxgb_l2t.h
  user/nyan/pc98/sys/dev/cxgb/ulp/tom/cxgb_tom.c
  user/nyan/pc98/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c
  user/nyan/pc98/sys/dev/dc/if_dc.c
  user/nyan/pc98/sys/dev/dc/if_dcreg.h
  user/nyan/pc98/sys/dev/dcons/dcons_crom.c
  user/nyan/pc98/sys/dev/dcons/dcons_os.c
  user/nyan/pc98/sys/dev/drm/ati_pcigart.c
  user/nyan/pc98/sys/dev/drm/drmP.h
  user/nyan/pc98/sys/dev/drm/drm_agpsupport.c
  user/nyan/pc98/sys/dev/drm/drm_auth.c
  user/nyan/pc98/sys/dev/drm/drm_bufs.c
  user/nyan/pc98/sys/dev/drm/drm_context.c
  user/nyan/pc98/sys/dev/drm/drm_dma.c
  user/nyan/pc98/sys/dev/drm/drm_drawable.c
  user/nyan/pc98/sys/dev/drm/drm_drv.c
  user/nyan/pc98/sys/dev/drm/drm_fops.c
  user/nyan/pc98/sys/dev/drm/drm_ioctl.c
  user/nyan/pc98/sys/dev/drm/drm_irq.c
  user/nyan/pc98/sys/dev/drm/drm_linux_list.h
  user/nyan/pc98/sys/dev/drm/drm_lock.c
  user/nyan/pc98/sys/dev/drm/drm_memory.c
  user/nyan/pc98/sys/dev/drm/drm_pci.c
  user/nyan/pc98/sys/dev/drm/drm_pciids.h
  user/nyan/pc98/sys/dev/drm/drm_scatter.c
  user/nyan/pc98/sys/dev/drm/drm_sysctl.c
  user/nyan/pc98/sys/dev/drm/i915_dma.c
  user/nyan/pc98/sys/dev/drm/i915_drv.c
  user/nyan/pc98/sys/dev/drm/i915_irq.c
  user/nyan/pc98/sys/dev/drm/mach64_drv.c
  user/nyan/pc98/sys/dev/drm/mga_drv.c
  user/nyan/pc98/sys/dev/drm/r128_drv.c
  user/nyan/pc98/sys/dev/drm/radeon_cp.c
  user/nyan/pc98/sys/dev/drm/radeon_drv.c
  user/nyan/pc98/sys/dev/drm/radeon_drv.h
  user/nyan/pc98/sys/dev/drm/savage_drv.c
  user/nyan/pc98/sys/dev/drm/sis_drv.c
  user/nyan/pc98/sys/dev/drm/tdfx_drv.c
  user/nyan/pc98/sys/dev/e1000/e1000_80003es2lan.c
  user/nyan/pc98/sys/dev/e1000/e1000_82540.c
  user/nyan/pc98/sys/dev/e1000/e1000_82541.c
  user/nyan/pc98/sys/dev/e1000/e1000_82542.c
  user/nyan/pc98/sys/dev/e1000/e1000_82543.c
  user/nyan/pc98/sys/dev/e1000/e1000_82571.c
  user/nyan/pc98/sys/dev/e1000/e1000_82575.c
  user/nyan/pc98/sys/dev/e1000/e1000_82575.h
  user/nyan/pc98/sys/dev/e1000/e1000_api.c
  user/nyan/pc98/sys/dev/e1000/e1000_api.h
  user/nyan/pc98/sys/dev/e1000/e1000_defines.h
  user/nyan/pc98/sys/dev/e1000/e1000_hw.h
  user/nyan/pc98/sys/dev/e1000/e1000_ich8lan.c
  user/nyan/pc98/sys/dev/e1000/e1000_ich8lan.h
  user/nyan/pc98/sys/dev/e1000/e1000_mac.c
  user/nyan/pc98/sys/dev/e1000/e1000_mac.h
  user/nyan/pc98/sys/dev/e1000/e1000_manage.c
  user/nyan/pc98/sys/dev/e1000/e1000_nvm.c
  user/nyan/pc98/sys/dev/e1000/e1000_osdep.c
  user/nyan/pc98/sys/dev/e1000/e1000_osdep.h
  user/nyan/pc98/sys/dev/e1000/e1000_phy.c
  user/nyan/pc98/sys/dev/e1000/e1000_phy.h
  user/nyan/pc98/sys/dev/e1000/e1000_regs.h
  user/nyan/pc98/sys/dev/e1000/if_em.c
  user/nyan/pc98/sys/dev/e1000/if_em.h
  user/nyan/pc98/sys/dev/e1000/if_igb.c
  user/nyan/pc98/sys/dev/en/midway.c
  user/nyan/pc98/sys/dev/fb/s3_pci.c
  user/nyan/pc98/sys/dev/fdc/fdc.c
  user/nyan/pc98/sys/dev/fdc/fdc_pccard.c
  user/nyan/pc98/sys/dev/fxp/if_fxp.c
  user/nyan/pc98/sys/dev/fxp/if_fxpreg.h
  user/nyan/pc98/sys/dev/fxp/if_fxpvar.h
  user/nyan/pc98/sys/dev/glxsb/glxsb.c
  user/nyan/pc98/sys/dev/hwpmc/hwpmc_amd.c
  user/nyan/pc98/sys/dev/hwpmc/hwpmc_amd.h
  user/nyan/pc98/sys/dev/hwpmc/hwpmc_arm.c
  user/nyan/pc98/sys/dev/hwpmc/hwpmc_ia64.c
  user/nyan/pc98/sys/dev/hwpmc/hwpmc_logging.c
  user/nyan/pc98/sys/dev/hwpmc/hwpmc_mod.c
  user/nyan/pc98/sys/dev/hwpmc/hwpmc_pentium.c
  user/nyan/pc98/sys/dev/hwpmc/hwpmc_pentium.h
  user/nyan/pc98/sys/dev/hwpmc/hwpmc_piv.c
  user/nyan/pc98/sys/dev/hwpmc/hwpmc_piv.h
  user/nyan/pc98/sys/dev/hwpmc/hwpmc_powerpc.c
  user/nyan/pc98/sys/dev/hwpmc/hwpmc_ppro.c
  user/nyan/pc98/sys/dev/hwpmc/hwpmc_ppro.h
  user/nyan/pc98/sys/dev/hwpmc/hwpmc_sparc64.c
  user/nyan/pc98/sys/dev/hwpmc/hwpmc_x86.c
  user/nyan/pc98/sys/dev/hwpmc/pmc_events.h
  user/nyan/pc98/sys/dev/if_ndis/if_ndis.c
  user/nyan/pc98/sys/dev/ipmi/ipmi.c
  user/nyan/pc98/sys/dev/iscsi/initiator/isc_cam.c
  user/nyan/pc98/sys/dev/iscsi/initiator/isc_sm.c
  user/nyan/pc98/sys/dev/iscsi/initiator/isc_soc.c
  user/nyan/pc98/sys/dev/iscsi/initiator/isc_subr.c
  user/nyan/pc98/sys/dev/iscsi/initiator/iscsi.c
  user/nyan/pc98/sys/dev/iscsi/initiator/iscsi.h
  user/nyan/pc98/sys/dev/iscsi/initiator/iscsi_subr.c
  user/nyan/pc98/sys/dev/iscsi/initiator/iscsivar.h
  user/nyan/pc98/sys/dev/isp/isp.c
  user/nyan/pc98/sys/dev/ispfw/ispfw.c
  user/nyan/pc98/sys/dev/iwn/if_iwn.c
  user/nyan/pc98/sys/dev/ixgbe/ixgbe.c
  user/nyan/pc98/sys/dev/ixgbe/ixgbe.h
  user/nyan/pc98/sys/dev/ixgbe/ixgbe_82598.c
  user/nyan/pc98/sys/dev/ixgbe/ixgbe_api.c
  user/nyan/pc98/sys/dev/ixgbe/ixgbe_api.h
  user/nyan/pc98/sys/dev/ixgbe/ixgbe_common.c
  user/nyan/pc98/sys/dev/ixgbe/ixgbe_common.h
  user/nyan/pc98/sys/dev/ixgbe/ixgbe_osdep.h
  user/nyan/pc98/sys/dev/ixgbe/ixgbe_phy.c
  user/nyan/pc98/sys/dev/ixgbe/ixgbe_phy.h
  user/nyan/pc98/sys/dev/ixgbe/ixgbe_type.h
  user/nyan/pc98/sys/dev/jme/if_jme.c
  user/nyan/pc98/sys/dev/jme/if_jmereg.h
  user/nyan/pc98/sys/dev/jme/if_jmevar.h
  user/nyan/pc98/sys/dev/k8temp/k8temp.c
  user/nyan/pc98/sys/dev/lmc/if_lmc.c
  user/nyan/pc98/sys/dev/md/md.c
  user/nyan/pc98/sys/dev/mfi/mfi.c
  user/nyan/pc98/sys/dev/mfi/mfi_disk.c
  user/nyan/pc98/sys/dev/mfi/mfi_ioctl.h
  user/nyan/pc98/sys/dev/mfi/mfi_pci.c
  user/nyan/pc98/sys/dev/mfi/mfireg.h
  user/nyan/pc98/sys/dev/mfi/mfivar.h
  user/nyan/pc98/sys/dev/mii/atphy.c
  user/nyan/pc98/sys/dev/mii/ciphy.c
  user/nyan/pc98/sys/dev/mii/e1000phy.c
  user/nyan/pc98/sys/dev/mii/miidevs
  user/nyan/pc98/sys/dev/mii/truephy.c
  user/nyan/pc98/sys/dev/mmc/mmc.c
  user/nyan/pc98/sys/dev/mmc/mmcbrvar.h
  user/nyan/pc98/sys/dev/mmc/mmcreg.h
  user/nyan/pc98/sys/dev/mmc/mmcsd.c
  user/nyan/pc98/sys/dev/mmc/mmcvar.h
  user/nyan/pc98/sys/dev/msk/if_msk.c
  user/nyan/pc98/sys/dev/mxge/eth_z8e.h
  user/nyan/pc98/sys/dev/mxge/ethp_z8e.h
  user/nyan/pc98/sys/dev/mxge/if_mxge.c
  user/nyan/pc98/sys/dev/mxge/if_mxge_var.h
  user/nyan/pc98/sys/dev/mxge/rss_eth_z8e.h
  user/nyan/pc98/sys/dev/mxge/rss_ethp_z8e.h
  user/nyan/pc98/sys/dev/nmdm/nmdm.c
  user/nyan/pc98/sys/dev/nxge/xge-osdep.h
  user/nyan/pc98/sys/dev/ofw/ofw_bus_subr.c
  user/nyan/pc98/sys/dev/ofw/ofw_bus_subr.h
  user/nyan/pc98/sys/dev/ofw/ofw_console.c
  user/nyan/pc98/sys/dev/ofw/openfirm.h
  user/nyan/pc98/sys/dev/patm/if_patm_intr.c
  user/nyan/pc98/sys/dev/pccbb/pccbb.c
  user/nyan/pc98/sys/dev/pccbb/pccbb_pci.c
  user/nyan/pc98/sys/dev/pccbb/pccbbvar.h
  user/nyan/pc98/sys/dev/pci/pci.c
  user/nyan/pc98/sys/dev/pci/pcireg.h
  user/nyan/pc98/sys/dev/powermac_nvram/powermac_nvram.c
  user/nyan/pc98/sys/dev/ppbus/if_plip.c
  user/nyan/pc98/sys/dev/ppbus/immio.c
  user/nyan/pc98/sys/dev/ppbus/lpbb.c
  user/nyan/pc98/sys/dev/ppbus/lpt.c
  user/nyan/pc98/sys/dev/ppbus/lpt.h
  user/nyan/pc98/sys/dev/ppbus/pcfclock.c
  user/nyan/pc98/sys/dev/ppbus/ppb_1284.c
  user/nyan/pc98/sys/dev/ppbus/ppb_base.c
  user/nyan/pc98/sys/dev/ppbus/ppb_msq.c
  user/nyan/pc98/sys/dev/ppbus/ppbconf.c
  user/nyan/pc98/sys/dev/ppbus/ppbconf.h
  user/nyan/pc98/sys/dev/ppbus/ppi.c
  user/nyan/pc98/sys/dev/ppbus/ppi.h
  user/nyan/pc98/sys/dev/ppbus/pps.c
  user/nyan/pc98/sys/dev/ppbus/vpo.c
  user/nyan/pc98/sys/dev/ppbus/vpoio.c
  user/nyan/pc98/sys/dev/ppbus/vpoio.h
  user/nyan/pc98/sys/dev/ppc/ppc.c
  user/nyan/pc98/sys/dev/ppc/ppc_acpi.c
  user/nyan/pc98/sys/dev/ppc/ppcreg.h
  user/nyan/pc98/sys/dev/puc/pucdata.c
  user/nyan/pc98/sys/dev/ral/rt2560.c
  user/nyan/pc98/sys/dev/ral/rt2661.c
  user/nyan/pc98/sys/dev/random/randomdev.c
  user/nyan/pc98/sys/dev/random/randomdev_soft.c
  user/nyan/pc98/sys/dev/ray/if_ray.c
  user/nyan/pc98/sys/dev/ray/if_rayvar.h
  user/nyan/pc98/sys/dev/re/if_re.c
  user/nyan/pc98/sys/dev/sio/sio_pci.c
  user/nyan/pc98/sys/dev/sio/sio_puc.c
  user/nyan/pc98/sys/dev/sis/if_sis.c
  user/nyan/pc98/sys/dev/sis/if_sisreg.h
  user/nyan/pc98/sys/dev/snp/snp.c
  user/nyan/pc98/sys/dev/sound/pci/hda/hdac.c
  user/nyan/pc98/sys/dev/sound/pci/hda/hdac_private.h
  user/nyan/pc98/sys/dev/sound/pcm/channel.c
  user/nyan/pc98/sys/dev/sound/pcm/channel.h
  user/nyan/pc98/sys/dev/sound/pcm/mixer.c
  user/nyan/pc98/sys/dev/sound/pcm/mixer.h
  user/nyan/pc98/sys/dev/sr/if_sr.c
  user/nyan/pc98/sys/dev/sym/sym_hipd.c
  user/nyan/pc98/sys/dev/syscons/sysmouse.c
  user/nyan/pc98/sys/dev/uart/uart_dev_quicc.c
  user/nyan/pc98/sys/dev/uart/uart_tty.c
  user/nyan/pc98/sys/dev/usb/ehci.c
  user/nyan/pc98/sys/dev/usb/ehcivar.h
  user/nyan/pc98/sys/dev/usb/if_aue.c
  user/nyan/pc98/sys/dev/usb/if_upgt.c
  user/nyan/pc98/sys/dev/usb/if_ural.c
  user/nyan/pc98/sys/dev/usb/if_zyd.c
  user/nyan/pc98/sys/dev/usb/if_zydreg.h
  user/nyan/pc98/sys/dev/usb/rio500_usb.h
  user/nyan/pc98/sys/dev/usb/u3g.c
  user/nyan/pc98/sys/dev/usb/ubsa.c
  user/nyan/pc98/sys/dev/usb/ucom.c
  user/nyan/pc98/sys/dev/usb/ucomvar.h
  user/nyan/pc98/sys/dev/usb/udbp.c
  user/nyan/pc98/sys/dev/usb/ufoma.c
  user/nyan/pc98/sys/dev/usb/uftdi.c
  user/nyan/pc98/sys/dev/usb/ugen.c
  user/nyan/pc98/sys/dev/usb/umass.c
  user/nyan/pc98/sys/dev/usb/usb.h
  user/nyan/pc98/sys/dev/usb/usb_quirks.c
  user/nyan/pc98/sys/dev/usb/usb_subr.c
  user/nyan/pc98/sys/dev/usb/usbdevs
  user/nyan/pc98/sys/dev/usb/usbdi.c
  user/nyan/pc98/sys/dev/usb/usbdi.h
  user/nyan/pc98/sys/dev/vge/if_vge.c
  user/nyan/pc98/sys/dev/vr/if_vr.c
  user/nyan/pc98/sys/dev/wpi/if_wpi.c
  user/nyan/pc98/sys/dev/xen/blkfront/blkfront.c
  user/nyan/pc98/sys/dev/xen/blkfront/block.h
  user/nyan/pc98/sys/dev/xen/console/console.c
  user/nyan/pc98/sys/dev/xen/netfront/netfront.c
  user/nyan/pc98/sys/fs/cd9660/cd9660_bmap.c
  user/nyan/pc98/sys/fs/cd9660/cd9660_node.c
  user/nyan/pc98/sys/fs/cd9660/cd9660_node.h
  user/nyan/pc98/sys/fs/cd9660/cd9660_rrip.c
  user/nyan/pc98/sys/fs/cd9660/cd9660_vfsops.c
  user/nyan/pc98/sys/fs/cd9660/cd9660_vnops.c
  user/nyan/pc98/sys/fs/coda/cnode.h
  user/nyan/pc98/sys/fs/coda/coda_subr.c
  user/nyan/pc98/sys/fs/coda/coda_venus.c
  user/nyan/pc98/sys/fs/coda/coda_vnops.c
  user/nyan/pc98/sys/fs/deadfs/dead_vnops.c
  user/nyan/pc98/sys/fs/devfs/devfs_vnops.c
  user/nyan/pc98/sys/fs/fdescfs/fdesc_vfsops.c
  user/nyan/pc98/sys/fs/fdescfs/fdesc_vnops.c
  user/nyan/pc98/sys/fs/fifofs/fifo_vnops.c
  user/nyan/pc98/sys/fs/hpfs/hpfs_subr.c
  user/nyan/pc98/sys/fs/hpfs/hpfs_vfsops.c
  user/nyan/pc98/sys/fs/hpfs/hpfs_vnops.c
  user/nyan/pc98/sys/fs/msdosfs/msdosfs_denode.c
  user/nyan/pc98/sys/fs/msdosfs/msdosfs_vfsops.c
  user/nyan/pc98/sys/fs/msdosfs/msdosfs_vnops.c
  user/nyan/pc98/sys/fs/ntfs/ntfs_subr.c
  user/nyan/pc98/sys/fs/ntfs/ntfs_vfsops.c
  user/nyan/pc98/sys/fs/ntfs/ntfs_vnops.c
  user/nyan/pc98/sys/fs/nullfs/null_subr.c
  user/nyan/pc98/sys/fs/nullfs/null_vnops.c
  user/nyan/pc98/sys/fs/nwfs/nwfs_node.c
  user/nyan/pc98/sys/fs/nwfs/nwfs_vfsops.c
  user/nyan/pc98/sys/fs/nwfs/nwfs_vnops.c
  user/nyan/pc98/sys/fs/portalfs/portal_vfsops.c
  user/nyan/pc98/sys/fs/portalfs/portal_vnops.c
  user/nyan/pc98/sys/fs/procfs/procfs.c
  user/nyan/pc98/sys/fs/procfs/procfs_map.c
  user/nyan/pc98/sys/fs/pseudofs/pseudofs.c
  user/nyan/pc98/sys/fs/pseudofs/pseudofs_vncache.c
  user/nyan/pc98/sys/fs/pseudofs/pseudofs_vnops.c
  user/nyan/pc98/sys/fs/smbfs/smbfs_node.c
  user/nyan/pc98/sys/fs/smbfs/smbfs_vfsops.c
  user/nyan/pc98/sys/fs/smbfs/smbfs_vnops.c
  user/nyan/pc98/sys/fs/tmpfs/tmpfs_vnops.c
  user/nyan/pc98/sys/fs/udf/udf_vfsops.c
  user/nyan/pc98/sys/fs/udf/udf_vnops.c
  user/nyan/pc98/sys/fs/unionfs/union.h
  user/nyan/pc98/sys/fs/unionfs/union_subr.c
  user/nyan/pc98/sys/fs/unionfs/union_vfsops.c
  user/nyan/pc98/sys/fs/unionfs/union_vnops.c
  user/nyan/pc98/sys/geom/geom_bsd.c
  user/nyan/pc98/sys/geom/geom_ccd.c
  user/nyan/pc98/sys/geom/geom_subr.c
  user/nyan/pc98/sys/geom/geom_vfs.c
  user/nyan/pc98/sys/geom/journal/g_journal.c
  user/nyan/pc98/sys/geom/journal/g_journal.h
  user/nyan/pc98/sys/geom/part/g_part.c
  user/nyan/pc98/sys/geom/part/g_part_apm.c
  user/nyan/pc98/sys/geom/part/g_part_bsd.c
  user/nyan/pc98/sys/geom/part/g_part_gpt.c
  user/nyan/pc98/sys/geom/part/g_part_mbr.c
  user/nyan/pc98/sys/geom/part/g_part_pc98.c
  user/nyan/pc98/sys/geom/part/g_part_vtoc8.c
  user/nyan/pc98/sys/geom/vinum/geom_vinum.c
  user/nyan/pc98/sys/geom/vinum/geom_vinum.h
  user/nyan/pc98/sys/geom/vinum/geom_vinum_drive.c
  user/nyan/pc98/sys/geom/vinum/geom_vinum_init.c
  user/nyan/pc98/sys/geom/vinum/geom_vinum_list.c
  user/nyan/pc98/sys/geom/vinum/geom_vinum_move.c
  user/nyan/pc98/sys/geom/vinum/geom_vinum_plex.c
  user/nyan/pc98/sys/geom/vinum/geom_vinum_raid5.c
  user/nyan/pc98/sys/geom/vinum/geom_vinum_rename.c
  user/nyan/pc98/sys/geom/vinum/geom_vinum_rm.c
  user/nyan/pc98/sys/geom/vinum/geom_vinum_state.c
  user/nyan/pc98/sys/geom/vinum/geom_vinum_subr.c
  user/nyan/pc98/sys/geom/vinum/geom_vinum_volume.c
  user/nyan/pc98/sys/gnu/fs/ext2fs/ext2_inode.c
  user/nyan/pc98/sys/gnu/fs/ext2fs/ext2_lookup.c
  user/nyan/pc98/sys/gnu/fs/ext2fs/ext2_vfsops.c
  user/nyan/pc98/sys/gnu/fs/ext2fs/ext2_vnops.c
  user/nyan/pc98/sys/gnu/fs/reiserfs/reiserfs_inode.c
  user/nyan/pc98/sys/gnu/fs/reiserfs/reiserfs_vfsops.c
  user/nyan/pc98/sys/gnu/fs/reiserfs/reiserfs_vnops.c
  user/nyan/pc98/sys/gnu/fs/xfs/FreeBSD/xfs_super.c
  user/nyan/pc98/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h
  user/nyan/pc98/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c
  user/nyan/pc98/sys/gnu/fs/xfs/xfs_dfrag.c
  user/nyan/pc98/sys/gnu/fs/xfs/xfs_inode.c
  user/nyan/pc98/sys/gnu/fs/xfs/xfs_inode.h
  user/nyan/pc98/sys/gnu/fs/xfs/xfs_vnodeops.c
  user/nyan/pc98/sys/i386/conf/DEFAULTS
  user/nyan/pc98/sys/i386/conf/GENERIC
  user/nyan/pc98/sys/i386/conf/NOTES
  user/nyan/pc98/sys/i386/conf/PAE
  user/nyan/pc98/sys/i386/conf/XEN
  user/nyan/pc98/sys/i386/cpufreq/est.c
  user/nyan/pc98/sys/i386/cpufreq/p4tcc.c
  user/nyan/pc98/sys/i386/cpufreq/powernow.c
  user/nyan/pc98/sys/i386/i386/apic_vector.s
  user/nyan/pc98/sys/i386/i386/bios.c
  user/nyan/pc98/sys/i386/i386/dump_machdep.c
  user/nyan/pc98/sys/i386/i386/elf_machdep.c
  user/nyan/pc98/sys/i386/i386/exception.s
  user/nyan/pc98/sys/i386/i386/genassym.c
  user/nyan/pc98/sys/i386/i386/i686_mem.c
  user/nyan/pc98/sys/i386/i386/identcpu.c
  user/nyan/pc98/sys/i386/i386/initcpu.c
  user/nyan/pc98/sys/i386/i386/intr_machdep.c
  user/nyan/pc98/sys/i386/i386/k6_mem.c
  user/nyan/pc98/sys/i386/i386/local_apic.c
  user/nyan/pc98/sys/i386/i386/longrun.c
  user/nyan/pc98/sys/i386/i386/minidump_machdep.c
  user/nyan/pc98/sys/i386/i386/mp_machdep.c
  user/nyan/pc98/sys/i386/i386/msi.c
  user/nyan/pc98/sys/i386/i386/sys_machdep.c
  user/nyan/pc98/sys/i386/i386/trap.c
  user/nyan/pc98/sys/i386/i386/tsc.c
  user/nyan/pc98/sys/i386/ibcs2/ibcs2_sysvec.c
  user/nyan/pc98/sys/i386/include/apicreg.h
  user/nyan/pc98/sys/i386/include/apicvar.h
  user/nyan/pc98/sys/i386/include/atomic.h
  user/nyan/pc98/sys/i386/include/clock.h
  user/nyan/pc98/sys/i386/include/cpufunc.h
  user/nyan/pc98/sys/i386/include/cputypes.h
  user/nyan/pc98/sys/i386/include/elf.h
  user/nyan/pc98/sys/i386/include/md_var.h
  user/nyan/pc98/sys/i386/include/pcpu.h
  user/nyan/pc98/sys/i386/include/pmc_mdep.h
  user/nyan/pc98/sys/i386/include/smp.h
  user/nyan/pc98/sys/i386/include/specialreg.h
  user/nyan/pc98/sys/i386/include/trap.h
  user/nyan/pc98/sys/i386/include/xen/evtchn.h
  user/nyan/pc98/sys/i386/include/xen/xen-os.h
  user/nyan/pc98/sys/i386/include/xen/xen_intr.h
  user/nyan/pc98/sys/i386/include/xen/xenfunc.h
  user/nyan/pc98/sys/i386/isa/pmtimer.c
  user/nyan/pc98/sys/i386/isa/prof_machdep.c
  user/nyan/pc98/sys/i386/linux/linux.h
  user/nyan/pc98/sys/i386/linux/linux_machdep.c
  user/nyan/pc98/sys/i386/linux/linux_proto.h
  user/nyan/pc98/sys/i386/linux/linux_syscall.h
  user/nyan/pc98/sys/i386/linux/linux_sysent.c
  user/nyan/pc98/sys/i386/linux/linux_sysvec.c
  user/nyan/pc98/sys/i386/linux/syscalls.master
  user/nyan/pc98/sys/i386/xen/clock.c
  user/nyan/pc98/sys/i386/xen/exception.s
  user/nyan/pc98/sys/i386/xen/locore.s
  user/nyan/pc98/sys/i386/xen/mp_machdep.c
  user/nyan/pc98/sys/i386/xen/xen_machdep.c
  user/nyan/pc98/sys/ia64/conf/GENERIC
  user/nyan/pc98/sys/ia64/ia64/elf_machdep.c
  user/nyan/pc98/sys/ia64/ia64/mp_machdep.c
  user/nyan/pc98/sys/ia64/ia64/sscdisk.c
  user/nyan/pc98/sys/ia64/include/atomic.h
  user/nyan/pc98/sys/ia64/include/elf.h
  user/nyan/pc98/sys/isa/isa_common.c
  user/nyan/pc98/sys/isa/isa_common.h
  user/nyan/pc98/sys/isa/isahint.c
  user/nyan/pc98/sys/isa/isavar.h
  user/nyan/pc98/sys/isa/pnp.c
  user/nyan/pc98/sys/kern/Make.tags.inc
  user/nyan/pc98/sys/kern/bus_if.m
  user/nyan/pc98/sys/kern/imgact_aout.c
  user/nyan/pc98/sys/kern/imgact_elf.c
  user/nyan/pc98/sys/kern/init_main.c
  user/nyan/pc98/sys/kern/init_sysent.c
  user/nyan/pc98/sys/kern/kern_conf.c
  user/nyan/pc98/sys/kern/kern_cpu.c
  user/nyan/pc98/sys/kern/kern_cpuset.c
  user/nyan/pc98/sys/kern/kern_descrip.c
  user/nyan/pc98/sys/kern/kern_event.c
  user/nyan/pc98/sys/kern/kern_exec.c
  user/nyan/pc98/sys/kern/kern_exit.c
  user/nyan/pc98/sys/kern/kern_fork.c
  user/nyan/pc98/sys/kern/kern_jail.c
  user/nyan/pc98/sys/kern/kern_ktrace.c
  user/nyan/pc98/sys/kern/kern_linker.c
  user/nyan/pc98/sys/kern/kern_lockf.c
  user/nyan/pc98/sys/kern/kern_mbuf.c
  user/nyan/pc98/sys/kern/kern_module.c
  user/nyan/pc98/sys/kern/kern_mtxpool.c
  user/nyan/pc98/sys/kern/kern_poll.c
  user/nyan/pc98/sys/kern/kern_proc.c
  user/nyan/pc98/sys/kern/kern_prot.c
  user/nyan/pc98/sys/kern/kern_resource.c
  user/nyan/pc98/sys/kern/kern_rwlock.c
  user/nyan/pc98/sys/kern/kern_shutdown.c
  user/nyan/pc98/sys/kern/kern_sig.c
  user/nyan/pc98/sys/kern/kern_synch.c
  user/nyan/pc98/sys/kern/kern_sysctl.c
  user/nyan/pc98/sys/kern/kern_thr.c
  user/nyan/pc98/sys/kern/kern_thread.c
  user/nyan/pc98/sys/kern/kern_time.c
  user/nyan/pc98/sys/kern/kern_timeout.c
  user/nyan/pc98/sys/kern/kern_uuid.c
  user/nyan/pc98/sys/kern/kern_xxx.c
  user/nyan/pc98/sys/kern/sched_ule.c
  user/nyan/pc98/sys/kern/subr_acl_posix1e.c
  user/nyan/pc98/sys/kern/subr_blist.c
  user/nyan/pc98/sys/kern/subr_bus.c
  user/nyan/pc98/sys/kern/subr_firmware.c
  user/nyan/pc98/sys/kern/subr_param.c
  user/nyan/pc98/sys/kern/subr_prf.c
  user/nyan/pc98/sys/kern/subr_rman.c
  user/nyan/pc98/sys/kern/subr_sleepqueue.c
  user/nyan/pc98/sys/kern/subr_smp.c
  user/nyan/pc98/sys/kern/subr_stack.c
  user/nyan/pc98/sys/kern/subr_trap.c
  user/nyan/pc98/sys/kern/subr_witness.c
  user/nyan/pc98/sys/kern/sys_pipe.c
  user/nyan/pc98/sys/kern/sys_process.c
  user/nyan/pc98/sys/kern/syscalls.c
  user/nyan/pc98/sys/kern/syscalls.master
  user/nyan/pc98/sys/kern/systrace_args.c
  user/nyan/pc98/sys/kern/tty.c
  user/nyan/pc98/sys/kern/tty_pts.c
  user/nyan/pc98/sys/kern/tty_ttydisc.c
  user/nyan/pc98/sys/kern/uipc_accf.c
  user/nyan/pc98/sys/kern/uipc_mqueue.c
  user/nyan/pc98/sys/kern/uipc_shm.c
  user/nyan/pc98/sys/kern/uipc_socket.c
  user/nyan/pc98/sys/kern/uipc_syscalls.c
  user/nyan/pc98/sys/kern/uipc_usrreq.c
  user/nyan/pc98/sys/kern/vfs_aio.c
  user/nyan/pc98/sys/kern/vfs_cache.c
  user/nyan/pc98/sys/kern/vfs_default.c
  user/nyan/pc98/sys/kern/vfs_export.c
  user/nyan/pc98/sys/kern/vfs_lookup.c
  user/nyan/pc98/sys/kern/vfs_mount.c
  user/nyan/pc98/sys/kern/vfs_subr.c
  user/nyan/pc98/sys/kern/vfs_syscalls.c
  user/nyan/pc98/sys/kern/vfs_vnops.c
  user/nyan/pc98/sys/kern/vnode_if.src
  user/nyan/pc98/sys/libkern/iconv.c
  user/nyan/pc98/sys/mips/adm5120/adm5120_machdep.c
  user/nyan/pc98/sys/mips/conf/ADM5120
  user/nyan/pc98/sys/mips/conf/IDT
  user/nyan/pc98/sys/mips/conf/MALTA
  user/nyan/pc98/sys/mips/conf/QEMU
  user/nyan/pc98/sys/mips/conf/SENTRY5
  user/nyan/pc98/sys/mips/idt/if_kr.c
  user/nyan/pc98/sys/mips/include/atomic.h
  user/nyan/pc98/sys/mips/include/elf.h
  user/nyan/pc98/sys/mips/mips/elf_machdep.c
  user/nyan/pc98/sys/mips/mips/machdep.c
  user/nyan/pc98/sys/modules/Makefile
  user/nyan/pc98/sys/modules/aio/Makefile
  user/nyan/pc98/sys/modules/amr/Makefile
  user/nyan/pc98/sys/modules/ath/Makefile
  user/nyan/pc98/sys/modules/bridgestp/Makefile
  user/nyan/pc98/sys/modules/cxgb/Makefile
  user/nyan/pc98/sys/modules/cxgb/cxgb/Makefile
  user/nyan/pc98/sys/modules/cxgb/iw_cxgb/Makefile
  user/nyan/pc98/sys/modules/cxgb/toecore/Makefile
  user/nyan/pc98/sys/modules/em/Makefile
  user/nyan/pc98/sys/modules/hwpmc/Makefile
  user/nyan/pc98/sys/modules/if_ef/Makefile
  user/nyan/pc98/sys/modules/if_vlan/Makefile
  user/nyan/pc98/sys/modules/igb/Makefile
  user/nyan/pc98/sys/modules/ip_mroute_mod/Makefile
  user/nyan/pc98/sys/modules/ipfw/Makefile
  user/nyan/pc98/sys/modules/krpc/Makefile
  user/nyan/pc98/sys/modules/linprocfs/Makefile
  user/nyan/pc98/sys/modules/linux/Makefile
  user/nyan/pc98/sys/modules/mac_bsdextended/Makefile
  user/nyan/pc98/sys/modules/netgraph/atm/atm/Makefile
  user/nyan/pc98/sys/modules/netgraph/ether/Makefile
  user/nyan/pc98/sys/modules/netgraph/gif/Makefile
  user/nyan/pc98/sys/modules/nfsclient/Makefile
  user/nyan/pc98/sys/modules/nfsserver/Makefile
  user/nyan/pc98/sys/modules/pf/Makefile
  user/nyan/pc98/sys/modules/powermac_nvram/Makefile
  user/nyan/pc98/sys/modules/snp/Makefile
  user/nyan/pc98/sys/modules/u3g/Makefile
  user/nyan/pc98/sys/modules/uart/Makefile
  user/nyan/pc98/sys/modules/wlan/Makefile
  user/nyan/pc98/sys/modules/zfs/Makefile
  user/nyan/pc98/sys/net/bpf.c
  user/nyan/pc98/sys/net/bridgestp.c
  user/nyan/pc98/sys/net/bsd_comp.c
  user/nyan/pc98/sys/net/ieee8023ad_lacp.c
  user/nyan/pc98/sys/net/if.c
  user/nyan/pc98/sys/net/if_arcsubr.c
  user/nyan/pc98/sys/net/if_atmsubr.c
  user/nyan/pc98/sys/net/if_bridge.c
  user/nyan/pc98/sys/net/if_ef.c
  user/nyan/pc98/sys/net/if_ethersubr.c
  user/nyan/pc98/sys/net/if_faith.c
  user/nyan/pc98/sys/net/if_fddisubr.c
  user/nyan/pc98/sys/net/if_fwsubr.c
  user/nyan/pc98/sys/net/if_gif.c
  user/nyan/pc98/sys/net/if_gif.h
  user/nyan/pc98/sys/net/if_gre.c
  user/nyan/pc98/sys/net/if_iso88025subr.c
  user/nyan/pc98/sys/net/if_lagg.c
  user/nyan/pc98/sys/net/if_loop.c
  user/nyan/pc98/sys/net/if_media.h
  user/nyan/pc98/sys/net/if_mib.c
  user/nyan/pc98/sys/net/if_ppp.c
  user/nyan/pc98/sys/net/if_sl.c
  user/nyan/pc98/sys/net/if_spppsubr.c
  user/nyan/pc98/sys/net/if_stf.c
  user/nyan/pc98/sys/net/if_tap.c
  user/nyan/pc98/sys/net/if_tun.c
  user/nyan/pc98/sys/net/if_var.h
  user/nyan/pc98/sys/net/if_vlan.c
  user/nyan/pc98/sys/net/pfil.c
  user/nyan/pc98/sys/net/pfil.h
  user/nyan/pc98/sys/net/ppp_deflate.c
  user/nyan/pc98/sys/net/radix.c
  user/nyan/pc98/sys/net/radix.h
  user/nyan/pc98/sys/net/radix_mpath.c
  user/nyan/pc98/sys/net/raw_cb.c
  user/nyan/pc98/sys/net/raw_cb.h
  user/nyan/pc98/sys/net/raw_usrreq.c
  user/nyan/pc98/sys/net/route.c
  user/nyan/pc98/sys/net/route.h
  user/nyan/pc98/sys/net/rtsock.c
  user/nyan/pc98/sys/net/vnet.h
  user/nyan/pc98/sys/net80211/_ieee80211.h
  user/nyan/pc98/sys/net80211/ieee80211.c
  user/nyan/pc98/sys/net80211/ieee80211_adhoc.c
  user/nyan/pc98/sys/net80211/ieee80211_crypto.c
  user/nyan/pc98/sys/net80211/ieee80211_crypto.h
  user/nyan/pc98/sys/net80211/ieee80211_ddb.c
  user/nyan/pc98/sys/net80211/ieee80211_dfs.h
  user/nyan/pc98/sys/net80211/ieee80211_freebsd.h
  user/nyan/pc98/sys/net80211/ieee80211_hostap.c
  user/nyan/pc98/sys/net80211/ieee80211_ht.c
  user/nyan/pc98/sys/net80211/ieee80211_ht.h
  user/nyan/pc98/sys/net80211/ieee80211_input.c
  user/nyan/pc98/sys/net80211/ieee80211_ioctl.c
  user/nyan/pc98/sys/net80211/ieee80211_node.c
  user/nyan/pc98/sys/net80211/ieee80211_node.h
  user/nyan/pc98/sys/net80211/ieee80211_output.c
  user/nyan/pc98/sys/net80211/ieee80211_power.c
  user/nyan/pc98/sys/net80211/ieee80211_power.h
  user/nyan/pc98/sys/net80211/ieee80211_proto.h
  user/nyan/pc98/sys/net80211/ieee80211_regdomain.c
  user/nyan/pc98/sys/net80211/ieee80211_scan_sta.c
  user/nyan/pc98/sys/net80211/ieee80211_sta.c
  user/nyan/pc98/sys/net80211/ieee80211_var.h
  user/nyan/pc98/sys/net80211/ieee80211_wds.c
  user/nyan/pc98/sys/netatalk/ddp_pcb.c
  user/nyan/pc98/sys/netgraph/atm/ng_atm.c
  user/nyan/pc98/sys/netgraph/atm/sscfu/ng_sscfu_cust.h
  user/nyan/pc98/sys/netgraph/bluetooth/drivers/h4/ng_h4.c
  user/nyan/pc98/sys/netgraph/bluetooth/hci/ng_hci_main.c
  user/nyan/pc98/sys/netgraph/bluetooth/hci/ng_hci_misc.c
  user/nyan/pc98/sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c
  user/nyan/pc98/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c
  user/nyan/pc98/sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h
  user/nyan/pc98/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c
  user/nyan/pc98/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c
  user/nyan/pc98/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c
  user/nyan/pc98/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c
  user/nyan/pc98/sys/netgraph/bluetooth/socket/ng_btsocket_sco.c
  user/nyan/pc98/sys/netgraph/netflow/netflow.c
  user/nyan/pc98/sys/netgraph/netflow/ng_netflow.c
  user/nyan/pc98/sys/netgraph/netgraph.h
  user/nyan/pc98/sys/netgraph/ng_UI.c
  user/nyan/pc98/sys/netgraph/ng_async.c
  user/nyan/pc98/sys/netgraph/ng_atmllc.c
  user/nyan/pc98/sys/netgraph/ng_base.c
  user/nyan/pc98/sys/netgraph/ng_bpf.c
  user/nyan/pc98/sys/netgraph/ng_bridge.c
  user/nyan/pc98/sys/netgraph/ng_cisco.c
  user/nyan/pc98/sys/netgraph/ng_device.c
  user/nyan/pc98/sys/netgraph/ng_eiface.c
  user/nyan/pc98/sys/netgraph/ng_etf.c
  user/nyan/pc98/sys/netgraph/ng_ether.c
  user/nyan/pc98/sys/netgraph/ng_fec.c
  user/nyan/pc98/sys/netgraph/ng_frame_relay.c
  user/nyan/pc98/sys/netgraph/ng_gif.c
  user/nyan/pc98/sys/netgraph/ng_gif_demux.c
  user/nyan/pc98/sys/netgraph/ng_hole.c
  user/nyan/pc98/sys/netgraph/ng_iface.c
  user/nyan/pc98/sys/netgraph/ng_ipfw.c
  user/nyan/pc98/sys/netgraph/ng_ksocket.c
  user/nyan/pc98/sys/netgraph/ng_l2tp.c
  user/nyan/pc98/sys/netgraph/ng_lmi.c
  user/nyan/pc98/sys/netgraph/ng_message.h
  user/nyan/pc98/sys/netgraph/ng_mppc.c
  user/nyan/pc98/sys/netgraph/ng_nat.c
  user/nyan/pc98/sys/netgraph/ng_one2many.c
  user/nyan/pc98/sys/netgraph/ng_parse.c
  user/nyan/pc98/sys/netgraph/ng_pipe.c
  user/nyan/pc98/sys/netgraph/ng_ppp.c
  user/nyan/pc98/sys/netgraph/ng_pptpgre.c
  user/nyan/pc98/sys/netgraph/ng_rfc1490.c
  user/nyan/pc98/sys/netgraph/ng_sample.c
  user/nyan/pc98/sys/netgraph/ng_socket.c
  user/nyan/pc98/sys/netgraph/ng_split.c
  user/nyan/pc98/sys/netgraph/ng_sppp.c
  user/nyan/pc98/sys/netgraph/ng_tag.c
  user/nyan/pc98/sys/netgraph/ng_tcpmss.c
  user/nyan/pc98/sys/netgraph/ng_tee.c
  user/nyan/pc98/sys/netgraph/ng_tty.c
  user/nyan/pc98/sys/netgraph/ng_tty.h
  user/nyan/pc98/sys/netgraph/ng_vjc.c
  user/nyan/pc98/sys/netgraph/ng_vlan.c
  user/nyan/pc98/sys/netinet/icmp6.h
  user/nyan/pc98/sys/netinet/icmp_var.h
  user/nyan/pc98/sys/netinet/if_atm.c
  user/nyan/pc98/sys/netinet/if_ether.c
  user/nyan/pc98/sys/netinet/if_ether.h
  user/nyan/pc98/sys/netinet/igmp.c
  user/nyan/pc98/sys/netinet/in.c
  user/nyan/pc98/sys/netinet/in.h
  user/nyan/pc98/sys/netinet/in_gif.c
  user/nyan/pc98/sys/netinet/in_mcast.c
  user/nyan/pc98/sys/netinet/in_pcb.c
  user/nyan/pc98/sys/netinet/in_pcb.h
  user/nyan/pc98/sys/netinet/in_proto.c
  user/nyan/pc98/sys/netinet/in_rmx.c
  user/nyan/pc98/sys/netinet/in_var.h
  user/nyan/pc98/sys/netinet/ip6.h
  user/nyan/pc98/sys/netinet/ip_carp.c
  user/nyan/pc98/sys/netinet/ip_divert.c
  user/nyan/pc98/sys/netinet/ip_dummynet.c
  user/nyan/pc98/sys/netinet/ip_dummynet.h
  user/nyan/pc98/sys/netinet/ip_fastfwd.c
  user/nyan/pc98/sys/netinet/ip_fw.h
  user/nyan/pc98/sys/netinet/ip_fw2.c
  user/nyan/pc98/sys/netinet/ip_fw_nat.c
  user/nyan/pc98/sys/netinet/ip_fw_pfil.c
  user/nyan/pc98/sys/netinet/ip_icmp.c
  user/nyan/pc98/sys/netinet/ip_icmp.h
  user/nyan/pc98/sys/netinet/ip_input.c
  user/nyan/pc98/sys/netinet/ip_ipsec.c
  user/nyan/pc98/sys/netinet/ip_mroute.c
  user/nyan/pc98/sys/netinet/ip_options.c
  user/nyan/pc98/sys/netinet/ip_output.c
  user/nyan/pc98/sys/netinet/ip_var.h
  user/nyan/pc98/sys/netinet/libalias/alias_db.c
  user/nyan/pc98/sys/netinet/raw_ip.c
  user/nyan/pc98/sys/netinet/sctp.h
  user/nyan/pc98/sys/netinet/sctp_asconf.c
  user/nyan/pc98/sys/netinet/sctp_asconf.h
  user/nyan/pc98/sys/netinet/sctp_auth.c
  user/nyan/pc98/sys/netinet/sctp_auth.h
  user/nyan/pc98/sys/netinet/sctp_constants.h
  user/nyan/pc98/sys/netinet/sctp_crc32.c
  user/nyan/pc98/sys/netinet/sctp_header.h
  user/nyan/pc98/sys/netinet/sctp_indata.c
  user/nyan/pc98/sys/netinet/sctp_indata.h
  user/nyan/pc98/sys/netinet/sctp_input.c
  user/nyan/pc98/sys/netinet/sctp_os_bsd.h
  user/nyan/pc98/sys/netinet/sctp_output.c
  user/nyan/pc98/sys/netinet/sctp_output.h
  user/nyan/pc98/sys/netinet/sctp_pcb.c
  user/nyan/pc98/sys/netinet/sctp_pcb.h
  user/nyan/pc98/sys/netinet/sctp_structs.h
  user/nyan/pc98/sys/netinet/sctp_sysctl.c
  user/nyan/pc98/sys/netinet/sctp_sysctl.h
  user/nyan/pc98/sys/netinet/sctp_timer.c
  user/nyan/pc98/sys/netinet/sctp_timer.h
  user/nyan/pc98/sys/netinet/sctp_uio.h
  user/nyan/pc98/sys/netinet/sctp_usrreq.c
  user/nyan/pc98/sys/netinet/sctp_var.h
  user/nyan/pc98/sys/netinet/sctputil.c
  user/nyan/pc98/sys/netinet/sctputil.h
  user/nyan/pc98/sys/netinet/tcp_hostcache.c
  user/nyan/pc98/sys/netinet/tcp_input.c
  user/nyan/pc98/sys/netinet/tcp_offload.c
  user/nyan/pc98/sys/netinet/tcp_output.c
  user/nyan/pc98/sys/netinet/tcp_reass.c
  user/nyan/pc98/sys/netinet/tcp_sack.c
  user/nyan/pc98/sys/netinet/tcp_subr.c
  user/nyan/pc98/sys/netinet/tcp_syncache.c
  user/nyan/pc98/sys/netinet/tcp_syncache.h
  user/nyan/pc98/sys/netinet/tcp_timer.c
  user/nyan/pc98/sys/netinet/tcp_timewait.c
  user/nyan/pc98/sys/netinet/tcp_usrreq.c
  user/nyan/pc98/sys/netinet/tcp_var.h
  user/nyan/pc98/sys/netinet/udp_usrreq.c
  user/nyan/pc98/sys/netinet/udp_var.h
  user/nyan/pc98/sys/netinet/vinet.h
  user/nyan/pc98/sys/netinet6/dest6.c
  user/nyan/pc98/sys/netinet6/frag6.c
  user/nyan/pc98/sys/netinet6/icmp6.c
  user/nyan/pc98/sys/netinet6/in6.c
  user/nyan/pc98/sys/netinet6/in6_gif.c
  user/nyan/pc98/sys/netinet6/in6_ifattach.c
  user/nyan/pc98/sys/netinet6/in6_pcb.c
  user/nyan/pc98/sys/netinet6/in6_pcb.h
  user/nyan/pc98/sys/netinet6/in6_proto.c
  user/nyan/pc98/sys/netinet6/in6_rmx.c
  user/nyan/pc98/sys/netinet6/in6_src.c
  user/nyan/pc98/sys/netinet6/in6_var.h
  user/nyan/pc98/sys/netinet6/ip6_forward.c
  user/nyan/pc98/sys/netinet6/ip6_input.c
  user/nyan/pc98/sys/netinet6/ip6_ipsec.c
  user/nyan/pc98/sys/netinet6/ip6_mroute.c
  user/nyan/pc98/sys/netinet6/ip6_output.c
  user/nyan/pc98/sys/netinet6/ip6_var.h
  user/nyan/pc98/sys/netinet6/mld6.c
  user/nyan/pc98/sys/netinet6/nd6.c
  user/nyan/pc98/sys/netinet6/nd6.h
  user/nyan/pc98/sys/netinet6/nd6_nbr.c
  user/nyan/pc98/sys/netinet6/nd6_rtr.c
  user/nyan/pc98/sys/netinet6/raw_ip6.c
  user/nyan/pc98/sys/netinet6/raw_ip6.h
  user/nyan/pc98/sys/netinet6/route6.c
  user/nyan/pc98/sys/netinet6/scope6.c
  user/nyan/pc98/sys/netinet6/sctp6_usrreq.c
  user/nyan/pc98/sys/netinet6/tcp6_var.h
  user/nyan/pc98/sys/netinet6/udp6_usrreq.c
  user/nyan/pc98/sys/netinet6/vinet6.h
  user/nyan/pc98/sys/netipsec/ipip_var.h
  user/nyan/pc98/sys/netipsec/ipsec.c
  user/nyan/pc98/sys/netipsec/ipsec.h
  user/nyan/pc98/sys/netipsec/ipsec6.h
  user/nyan/pc98/sys/netipsec/ipsec_input.c
  user/nyan/pc98/sys/netipsec/ipsec_output.c
  user/nyan/pc98/sys/netipsec/key.c
  user/nyan/pc98/sys/netipsec/keysock.c
  user/nyan/pc98/sys/netipsec/keysock.h
  user/nyan/pc98/sys/netipsec/vipsec.h
  user/nyan/pc98/sys/netipsec/xform_ah.c
  user/nyan/pc98/sys/netipsec/xform_esp.c
  user/nyan/pc98/sys/netipsec/xform_ipcomp.c
  user/nyan/pc98/sys/netipsec/xform_ipip.c
  user/nyan/pc98/sys/netipx/ipx_pcb.c
  user/nyan/pc98/sys/netipx/ipx_usrreq.c
  user/nyan/pc98/sys/netipx/spx_usrreq.c
  user/nyan/pc98/sys/netnatm/natm.c
  user/nyan/pc98/sys/netnatm/natm_pcb.c
  user/nyan/pc98/sys/netncp/ncp_conn.c
  user/nyan/pc98/sys/netncp/ncp_rq.c
  user/nyan/pc98/sys/netncp/ncp_sock.c
  user/nyan/pc98/sys/netncp/ncp_subr.c
  user/nyan/pc98/sys/netsmb/smb_conn.c
  user/nyan/pc98/sys/netsmb/smb_conn.h
  user/nyan/pc98/sys/netsmb/smb_dev.c
  user/nyan/pc98/sys/netsmb/smb_rq.c
  user/nyan/pc98/sys/netsmb/smb_trantcp.c
  user/nyan/pc98/sys/nfs4client/nfs4_dev.c
  user/nyan/pc98/sys/nfs4client/nfs4_idmap.c
  user/nyan/pc98/sys/nfs4client/nfs4_socket.c
  user/nyan/pc98/sys/nfs4client/nfs4_vfsops.c
  user/nyan/pc98/sys/nfs4client/nfs4_vn_subs.c
  user/nyan/pc98/sys/nfs4client/nfs4_vnops.c
  user/nyan/pc98/sys/nfsclient/bootp_subr.c
  user/nyan/pc98/sys/nfsclient/krpc_subr.c
  user/nyan/pc98/sys/nfsclient/nfs.h
  user/nyan/pc98/sys/nfsclient/nfs_diskless.c
  user/nyan/pc98/sys/nfsclient/nfs_lock.c
  user/nyan/pc98/sys/nfsclient/nfs_nfsiod.c
  user/nyan/pc98/sys/nfsclient/nfs_node.c
  user/nyan/pc98/sys/nfsclient/nfs_socket.c
  user/nyan/pc98/sys/nfsclient/nfs_subs.c
  user/nyan/pc98/sys/nfsclient/nfs_vfsops.c
  user/nyan/pc98/sys/nfsclient/nfs_vnops.c
  user/nyan/pc98/sys/nfsclient/nfsmount.h
  user/nyan/pc98/sys/nfsserver/nfs.h
  user/nyan/pc98/sys/nfsserver/nfs_serv.c
  user/nyan/pc98/sys/nfsserver/nfs_srvcache.c
  user/nyan/pc98/sys/nfsserver/nfs_srvsock.c
  user/nyan/pc98/sys/nfsserver/nfs_srvsubs.c
  user/nyan/pc98/sys/nfsserver/nfs_syscalls.c
  user/nyan/pc98/sys/nfsserver/nfsm_subs.h
  user/nyan/pc98/sys/nfsserver/nfsrvcache.h
  user/nyan/pc98/sys/nlm/nlm.h
  user/nyan/pc98/sys/nlm/nlm_advlock.c
  user/nyan/pc98/sys/nlm/nlm_prot_impl.c
  user/nyan/pc98/sys/nlm/nlm_prot_svc.c
  user/nyan/pc98/sys/opencrypto/cryptodev.c
  user/nyan/pc98/sys/opencrypto/cryptosoft.c
  user/nyan/pc98/sys/opencrypto/deflate.c
  user/nyan/pc98/sys/opencrypto/xform.c
  user/nyan/pc98/sys/pc98/conf/DEFAULTS
  user/nyan/pc98/sys/pc98/conf/GENERIC
  user/nyan/pc98/sys/pc98/conf/NOTES
  user/nyan/pc98/sys/pci/if_rl.c
  user/nyan/pc98/sys/pci/if_rlreg.h
  user/nyan/pc98/sys/powerpc/aim/locore.S
  user/nyan/pc98/sys/powerpc/aim/nexus.c
  user/nyan/pc98/sys/powerpc/aim/ofw_machdep.c
  user/nyan/pc98/sys/powerpc/booke/interrupt.c
  user/nyan/pc98/sys/powerpc/booke/locore.S
  user/nyan/pc98/sys/powerpc/booke/machdep.c
  user/nyan/pc98/sys/powerpc/booke/pmap.c
  user/nyan/pc98/sys/powerpc/booke/trap.c
  user/nyan/pc98/sys/powerpc/conf/GENERIC
  user/nyan/pc98/sys/powerpc/conf/MPC85XX
  user/nyan/pc98/sys/powerpc/conf/NOTES
  user/nyan/pc98/sys/powerpc/include/atomic.h
  user/nyan/pc98/sys/powerpc/include/cpu.h
  user/nyan/pc98/sys/powerpc/include/cpufunc.h
  user/nyan/pc98/sys/powerpc/include/elf.h
  user/nyan/pc98/sys/powerpc/include/endian.h
  user/nyan/pc98/sys/powerpc/include/float.h
  user/nyan/pc98/sys/powerpc/include/param.h
  user/nyan/pc98/sys/powerpc/include/profile.h
  user/nyan/pc98/sys/powerpc/include/spr.h
  user/nyan/pc98/sys/powerpc/mpc85xx/mpc85xx.c
  user/nyan/pc98/sys/powerpc/mpc85xx/nexus.c
  user/nyan/pc98/sys/powerpc/mpc85xx/ocpbus.c
  user/nyan/pc98/sys/powerpc/ofw/ofw_pcib_pci.c
  user/nyan/pc98/sys/powerpc/ofw/ofw_syscons.c
  user/nyan/pc98/sys/powerpc/ofw/ofw_syscons.h
  user/nyan/pc98/sys/powerpc/powermac/ata_dbdma.c
  user/nyan/pc98/sys/powerpc/powermac/ata_kauai.c
  user/nyan/pc98/sys/powerpc/powermac/dbdma.c
  user/nyan/pc98/sys/powerpc/powermac/dbdmavar.h
  user/nyan/pc98/sys/powerpc/powermac/grackle.c
  user/nyan/pc98/sys/powerpc/powermac/gracklevar.h
  user/nyan/pc98/sys/powerpc/powermac/hrowpic.c
  user/nyan/pc98/sys/powerpc/powermac/macio.c
  user/nyan/pc98/sys/powerpc/powermac/openpic_macio.c
  user/nyan/pc98/sys/powerpc/powermac/uninorth.c
  user/nyan/pc98/sys/powerpc/powermac/uninorthvar.h
  user/nyan/pc98/sys/powerpc/powerpc/elf_machdep.c
  user/nyan/pc98/sys/powerpc/psim/iobus.c
  user/nyan/pc98/sys/powerpc/psim/openpic_iobus.c
  user/nyan/pc98/sys/rpc/auth.h
  user/nyan/pc98/sys/rpc/auth_none.c
  user/nyan/pc98/sys/rpc/auth_unix.c
  user/nyan/pc98/sys/rpc/clnt.h
  user/nyan/pc98/sys/rpc/clnt_dg.c
  user/nyan/pc98/sys/rpc/clnt_rc.c
  user/nyan/pc98/sys/rpc/clnt_vc.c
  user/nyan/pc98/sys/rpc/rpc_com.h
  user/nyan/pc98/sys/rpc/rpc_generic.c
  user/nyan/pc98/sys/rpc/rpc_msg.h
  user/nyan/pc98/sys/rpc/rpc_prot.c
  user/nyan/pc98/sys/rpc/rpcclnt.c
  user/nyan/pc98/sys/rpc/svc.c
  user/nyan/pc98/sys/rpc/svc.h
  user/nyan/pc98/sys/rpc/svc_auth.c
  user/nyan/pc98/sys/rpc/svc_auth.h
  user/nyan/pc98/sys/rpc/svc_auth_unix.c
  user/nyan/pc98/sys/rpc/svc_dg.c
  user/nyan/pc98/sys/rpc/svc_generic.c
  user/nyan/pc98/sys/rpc/svc_vc.c
  user/nyan/pc98/sys/rpc/xdr.h
  user/nyan/pc98/sys/security/audit/audit.c
  user/nyan/pc98/sys/security/audit/audit_arg.c
  user/nyan/pc98/sys/security/audit/audit_bsm.c
  user/nyan/pc98/sys/security/audit/audit_bsm_klib.c
  user/nyan/pc98/sys/security/audit/audit_bsm_token.c
  user/nyan/pc98/sys/security/audit/audit_pipe.c
  user/nyan/pc98/sys/security/audit/audit_private.h
  user/nyan/pc98/sys/security/audit/audit_syscalls.c
  user/nyan/pc98/sys/security/audit/audit_worker.c
  user/nyan/pc98/sys/security/mac/mac_framework.h
  user/nyan/pc98/sys/security/mac/mac_inet.c
  user/nyan/pc98/sys/security/mac/mac_inet6.c
  user/nyan/pc98/sys/security/mac/mac_policy.h
  user/nyan/pc98/sys/security/mac/mac_process.c
  user/nyan/pc98/sys/security/mac/mac_syscalls.c
  user/nyan/pc98/sys/security/mac/mac_vfs.c
  user/nyan/pc98/sys/security/mac_biba/mac_biba.c
  user/nyan/pc98/sys/security/mac_bsdextended/mac_bsdextended.c
  user/nyan/pc98/sys/security/mac_lomac/mac_lomac.c
  user/nyan/pc98/sys/security/mac_mls/mac_mls.c
  user/nyan/pc98/sys/security/mac_partition/mac_partition.c
  user/nyan/pc98/sys/security/mac_seeotheruids/mac_seeotheruids.c
  user/nyan/pc98/sys/security/mac_stub/mac_stub.c
  user/nyan/pc98/sys/security/mac_test/mac_test.c
  user/nyan/pc98/sys/sparc64/conf/DEFAULTS
  user/nyan/pc98/sys/sparc64/conf/GENERIC
  user/nyan/pc98/sys/sparc64/ebus/ebus.c
  user/nyan/pc98/sys/sparc64/include/atomic.h
  user/nyan/pc98/sys/sparc64/include/elf.h
  user/nyan/pc98/sys/sparc64/include/intr_machdep.h
  user/nyan/pc98/sys/sparc64/include/iommureg.h
  user/nyan/pc98/sys/sparc64/include/iommuvar.h
  user/nyan/pc98/sys/sparc64/isa/ofw_isa.c
  user/nyan/pc98/sys/sparc64/pci/apb.c
  user/nyan/pc98/sys/sparc64/pci/ofw_pci.h
  user/nyan/pc98/sys/sparc64/pci/ofw_pcib.c
  user/nyan/pc98/sys/sparc64/pci/ofw_pcib_subr.c
  user/nyan/pc98/sys/sparc64/pci/ofw_pcibus.c
  user/nyan/pc98/sys/sparc64/pci/psycho.c
  user/nyan/pc98/sys/sparc64/pci/schizo.c
  user/nyan/pc98/sys/sparc64/pci/schizoreg.h
  user/nyan/pc98/sys/sparc64/pci/schizovar.h
  user/nyan/pc98/sys/sparc64/sbus/sbus.c
  user/nyan/pc98/sys/sparc64/sparc64/db_trace.c
  user/nyan/pc98/sys/sparc64/sparc64/elf_machdep.c
  user/nyan/pc98/sys/sparc64/sparc64/intr_machdep.c
  user/nyan/pc98/sys/sparc64/sparc64/iommu.c
  user/nyan/pc98/sys/sparc64/sparc64/machdep.c
  user/nyan/pc98/sys/sparc64/sparc64/nexus.c
  user/nyan/pc98/sys/sparc64/sparc64/ofw_machdep.c
  user/nyan/pc98/sys/sparc64/sparc64/stack_machdep.c
  user/nyan/pc98/sys/sparc64/sparc64/support.S
  user/nyan/pc98/sys/sun4v/conf/DEFAULTS
  user/nyan/pc98/sys/sun4v/conf/GENERIC
  user/nyan/pc98/sys/sun4v/include/atomic.h
  user/nyan/pc98/sys/sun4v/include/elf.h
  user/nyan/pc98/sys/sun4v/sun4v/db_trace.c
  user/nyan/pc98/sys/sun4v/sun4v/stack_machdep.c
  user/nyan/pc98/sys/sys/_types.h
  user/nyan/pc98/sys/sys/aio.h
  user/nyan/pc98/sys/sys/cdefs.h
  user/nyan/pc98/sys/sys/conf.h
  user/nyan/pc98/sys/sys/cons.h
  user/nyan/pc98/sys/sys/cpuset.h
  user/nyan/pc98/sys/sys/disklabel.h
  user/nyan/pc98/sys/sys/extattr.h
  user/nyan/pc98/sys/sys/imgact_elf.h
  user/nyan/pc98/sys/sys/jail.h
  user/nyan/pc98/sys/sys/kernel.h
  user/nyan/pc98/sys/sys/mbuf.h
  user/nyan/pc98/sys/sys/module.h
  user/nyan/pc98/sys/sys/mount.h
  user/nyan/pc98/sys/sys/namei.h
  user/nyan/pc98/sys/sys/param.h
  user/nyan/pc98/sys/sys/pmc.h
  user/nyan/pc98/sys/sys/pmclog.h
  user/nyan/pc98/sys/sys/priv.h
  user/nyan/pc98/sys/sys/proc.h
  user/nyan/pc98/sys/sys/resource.h
  user/nyan/pc98/sys/sys/rwlock.h
  user/nyan/pc98/sys/sys/syscall.h
  user/nyan/pc98/sys/sys/syscall.mk
  user/nyan/pc98/sys/sys/syscallsubr.h
  user/nyan/pc98/sys/sys/sysctl.h
  user/nyan/pc98/sys/sys/sysent.h
  user/nyan/pc98/sys/sys/sysproto.h
  user/nyan/pc98/sys/sys/systm.h
  user/nyan/pc98/sys/sys/termios.h
  user/nyan/pc98/sys/sys/tty.h
  user/nyan/pc98/sys/sys/ttydefaults.h
  user/nyan/pc98/sys/sys/ttyhook.h
  user/nyan/pc98/sys/sys/types.h
  user/nyan/pc98/sys/sys/user.h
  user/nyan/pc98/sys/sys/vimage.h
  user/nyan/pc98/sys/sys/vnode.h
  user/nyan/pc98/sys/sys/vtoc.h
  user/nyan/pc98/sys/tools/vnode_if.awk
  user/nyan/pc98/sys/ufs/ffs/ffs_inode.c
  user/nyan/pc98/sys/ufs/ffs/ffs_snapshot.c
  user/nyan/pc98/sys/ufs/ffs/ffs_softdep.c
  user/nyan/pc98/sys/ufs/ffs/ffs_vfsops.c
  user/nyan/pc98/sys/ufs/ffs/ffs_vnops.c
  user/nyan/pc98/sys/ufs/ufs/ufs_acl.c
  user/nyan/pc98/sys/ufs/ufs/ufs_dirhash.c
  user/nyan/pc98/sys/ufs/ufs/ufs_extattr.c
  user/nyan/pc98/sys/ufs/ufs/ufs_lookup.c
  user/nyan/pc98/sys/ufs/ufs/ufs_quota.c
  user/nyan/pc98/sys/ufs/ufs/ufs_vfsops.c
  user/nyan/pc98/sys/ufs/ufs/ufs_vnops.c
  user/nyan/pc98/sys/vm/uma.h
  user/nyan/pc98/sys/vm/vm_mmap.c
  user/nyan/pc98/sys/vm/vm_page.c
  user/nyan/pc98/sys/vm/vm_pageout.c
  user/nyan/pc98/sys/xdr/xdr_mbuf.c
  user/nyan/pc98/sys/xen/evtchn/evtchn.c
  user/nyan/pc98/sys/xen/gnttab.c
  user/nyan/pc98/sys/xen/gnttab.h
  user/nyan/pc98/sys/xen/xenbus/xenbus_client.c
  user/nyan/pc98/sys/xen/xenbus/xenbus_comms.c
  user/nyan/pc98/sys/xen/xenbus/xenbus_comms.h
  user/nyan/pc98/sys/xen/xenbus/xenbus_dev.c
  user/nyan/pc98/sys/xen/xenbus/xenbus_probe.c
  user/nyan/pc98/sys/xen/xenbus/xenbus_probe_backend.c
  user/nyan/pc98/sys/xen/xenbus/xenbus_xs.c

Modified: user/nyan/pc98/sys/amd64/Makefile
==============================================================================
--- user/nyan/pc98/sys/amd64/Makefile	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/Makefile	Thu Dec 18 14:21:06 2008	(r186281)
@@ -1,39 +1,38 @@
 # $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/11/93
 
-# Makefile for i386 links, tags file
+# Makefile for amd64 links, tags file
 
 # SYS is normally set in Make.tags.inc
-# SYS=/sys
-SYS=/nsys
+SYS=/sys
 
-TAGDIR=	i386
+TAGDIR=	amd64
 
 .include "../kern/Make.tags.inc"
 
 all:
 	@echo "make links or tags only"
 
-# Directories in which to place i386 tags links
-DI386=	apm i386 ibcs2 include isa linux
+# Directories in which to place amd64 tags links
+DAMD64=	acpica amd64 ia32 include isa linux32 pci
 
 links::
 	-for i in ${COMMDIR1}; do \
 	    (cd $$i && { rm -f tags; ln -s ../${TAGDIR}/tags tags; }) done
 	-for i in ${COMMDIR2}; do \
 	    (cd $$i && { rm -f tags; ln -s ../../${TAGDIR}/tags tags; }) done
-	-for i in ${DI386}; do \
+	-for i in ${DAMD64}; do \
 	    (cd $$i && { rm -f tags; ln -s ../tags tags; }) done
 
-SI386=	${SYS}/i386/apm/*.[ch] \
-	${SYS}/i386/i386/*.[ch] ${SYS}/i386/ibcs2/*.[ch] \
-	${SYS}/i386/include/*.[ch] ${SYS}/i386/isa/*.[ch] \
-	${SYS}/i386/linux/*.[ch]
-AI386=	${SYS}/i386/i386/*.s
+SAMD64=	${SYS}/amd64/acpica/*.[ch] \
+	${SYS}/amd64/amd64/*.[ch] ${SYS}/amd64/ia32/*.[ch] \
+	${SYS}/amd64/include/*.[ch] ${SYS}/amd64/isa/*.[ch] \
+	${SYS}/amd64/linux32/*.[ch] ${SYS}/amd64/pci/*.[ch]
+AAMD64=	${SYS}/amd64/amd64/*.S
 
 tags::
-	-ctags -wdt ${COMM} ${SI386}
-	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AI386} | \
+	-ctags -wdt ${COMM} ${SAMD64}
+	egrep "^ENTRY(.*)|^ALTENTRY(.*)" ${AAMD64} | \
 	    sed "s;\([^:]*\):\([^(]*\)(\([^, )]*\)\(.*\);\3 \1 /^\2(\3\4$$/;" \
 		>> tags
 	sort -o tags tags

Modified: user/nyan/pc98/sys/amd64/amd64/amd64_mem.c
==============================================================================
--- user/nyan/pc98/sys/amd64/amd64/amd64_mem.c	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/amd64/amd64_mem.c	Thu Dec 18 14:21:06 2008	(r186281)
@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/smp.h>
 #include <sys/sysctl.h>
 
+#include <machine/cputypes.h>
 #include <machine/md_var.h>
 #include <machine/specialreg.h>
 
@@ -677,8 +678,8 @@ amd64_mem_drvinit(void *unused)
 		return;
 	if ((cpu_id & 0xf00) != 0x600 && (cpu_id & 0xf00) != 0xf00)
 		return;
-	if ((strcmp(cpu_vendor, "GenuineIntel") != 0) &&
-	    (strcmp(cpu_vendor, "AuthenticAMD") != 0))
+	if (cpu_vendor_id != CPU_VENDOR_INTEL &&
+	    cpu_vendor_id != CPU_VENDOR_AMD)
 		return;
 	mem_range_softc.mr_op = &amd64_mrops;
 }

Modified: user/nyan/pc98/sys/amd64/amd64/db_trace.c
==============================================================================
--- user/nyan/pc98/sys/amd64/amd64/db_trace.c	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/amd64/db_trace.c	Thu Dec 18 14:21:06 2008	(r186281)
@@ -27,6 +27,8 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_compat.h"
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kdb.h>
@@ -318,6 +320,10 @@ db_nextframe(struct amd64_frame **fp, db
 			frame_type = INTERRUPT;
 		else if (strcmp(name, "Xfast_syscall") == 0)
 			frame_type = SYSCALL;
+#ifdef COMPAT_IA32
+		else if (strcmp(name, "Xint0x80_syscall") == 0)
+			frame_type = SYSCALL;
+#endif
 		/* XXX: These are interrupts with trap frames. */
 		else if (strcmp(name, "Xtimerint") == 0 ||
 		    strcmp(name, "Xcpustop") == 0 ||

Modified: user/nyan/pc98/sys/amd64/amd64/dump_machdep.c
==============================================================================
--- user/nyan/pc98/sys/amd64/amd64/dump_machdep.c	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/amd64/dump_machdep.c	Thu Dec 18 14:21:06 2008	(r186281)
@@ -165,7 +165,7 @@ cb_dumpdata(struct md_pa *mdp, int seqnr
 	va = 0;
 	pgs = mdp->md_size / PAGE_SIZE;
 	pa = mdp->md_start;
-	maxdumppgs = di->maxiosize / PAGE_SIZE;
+	maxdumppgs = min(di->maxiosize / PAGE_SIZE, MAXDUMPPGS);
 	if (maxdumppgs == 0)	/* seatbelt */
 		maxdumppgs = 1;
 

Modified: user/nyan/pc98/sys/amd64/amd64/elf_machdep.c
==============================================================================
--- user/nyan/pc98/sys/amd64/amd64/elf_machdep.c	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/amd64/elf_machdep.c	Thu Dec 18 14:21:06 2008	(r186281)
@@ -72,7 +72,8 @@ struct sysentvec elf64_freebsd_sysvec = 
 	.sv_copyout_strings	= exec_copyout_strings,
 	.sv_setregs	= exec_setregs,
 	.sv_fixlimit	= NULL,
-	.sv_maxssiz	= NULL
+	.sv_maxssiz	= NULL,
+	.sv_flags	= SV_ABI_FREEBSD | SV_LP64
 };
 
 static Elf64_Brandinfo freebsd_brand_info = {

Modified: user/nyan/pc98/sys/amd64/amd64/exception.S
==============================================================================
--- user/nyan/pc98/sys/amd64/amd64/exception.S	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/amd64/exception.S	Thu Dec 18 14:21:06 2008	(r186281)
@@ -459,9 +459,9 @@ nmi_calltrap:
 	 */
 	movq	%rsp,%rsi	/* source stack pointer */
 	movq	$TF_SIZE,%rcx
-	movq	PCPU(RSP0),%rbx
-	subq	%rcx,%rbx
-	movq	%rbx,%rdi	/* destination stack pointer */
+	movq	PCPU(RSP0),%rdx
+	subq	%rcx,%rdx
+	movq	%rdx,%rdi	/* destination stack pointer */
 
 	shrq	$3,%rcx		/* trap frame size in long words */
 	cld
@@ -470,7 +470,7 @@ nmi_calltrap:
 
 	movl	%ss,%eax
 	pushq	%rax		/* tf_ss */
-	pushq	%rbx		/* tf_rsp (on kernel stack) */
+	pushq	%rdx		/* tf_rsp (on kernel stack) */
 	pushfq			/* tf_rflags */
 	movl	%cs,%eax
 	pushq	%rax		/* tf_cs */
@@ -480,16 +480,20 @@ outofnmi:
 	/*
 	 * At this point the processor has exited NMI mode and is running
 	 * with interrupts turned off on the normal kernel stack.
-	 * We turn interrupts back on, and take the usual 'doreti' exit
-	 * path.
 	 *
 	 * If a pending NMI gets recognized at or after this point, it 
-	 * will cause a kernel callchain to be traced.  Since this path
-	 * is only taken for NMI interrupts from user space, our `swapgs'
-	 * state is correct for taking the doreti path.
+	 * will cause a kernel callchain to be traced.
+	 *
+	 * We turn interrupts back on, and call the user callchain capture hook.
 	 */
+	movq	pmc_hook,%rax
+	orq	%rax,%rax
+	jz	nocallchain
+	movq	PCPU(CURTHREAD),%rdi		/* thread */
+	movq	$PMC_FN_USER_CALLCHAIN,%rsi	/* command */
+	movq	%rsp,%rdx			/* frame */
 	sti
-	jmp	doreti
+	call	*%rax
 nocallchain:
 #endif
 	testl	%ebx,%ebx

Modified: user/nyan/pc98/sys/amd64/amd64/genassym.c
==============================================================================
--- user/nyan/pc98/sys/amd64/amd64/genassym.c	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/amd64/genassym.c	Thu Dec 18 14:21:06 2008	(r186281)
@@ -36,6 +36,7 @@
 __FBSDID("$FreeBSD$");
 
 #include "opt_compat.h"
+#include "opt_hwpmc_hooks.h"
 #include "opt_kstack_pages.h"
 
 #include <sys/param.h>
@@ -44,6 +45,9 @@ __FBSDID("$FreeBSD$");
 #include <sys/bio.h>
 #include <sys/buf.h>
 #include <sys/proc.h>
+#ifdef	HWPMC_HOOKS
+#include <sys/pmckern.h>
+#endif
 #include <sys/errno.h>
 #include <sys/mount.h>
 #include <sys/mutex.h>
@@ -216,3 +220,7 @@ ASSYM(KUC32SEL, GSEL(GUCODE32_SEL, SEL_U
 ASSYM(SEL_RPL_MASK, SEL_RPL_MASK);
 
 ASSYM(MSR_GSBASE, MSR_GSBASE);
+
+#ifdef	HWPMC_HOOKS
+ASSYM(PMC_FN_USER_CALLCHAIN, PMC_FN_USER_CALLCHAIN);
+#endif

Modified: user/nyan/pc98/sys/amd64/amd64/identcpu.c
==============================================================================
--- user/nyan/pc98/sys/amd64/amd64/identcpu.c	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/amd64/identcpu.c	Thu Dec 18 14:21:06 2008	(r186281)
@@ -69,6 +69,7 @@ void identify_cpu(void);
 void earlysetcpuclass(void);
 void panicifcpuunsupported(void);
 
+static u_int find_cpu_vendor_id(void);
 static void print_AMD_info(void);
 static void print_AMD_assoc(int i);
 
@@ -95,6 +96,14 @@ static struct {
 	{ "Sledgehammer",	CPUCLASS_K8 },		/* CPU_SLEDGEHAMMER */
 };
 
+static struct {
+	char	*vendor;
+	u_int	vendor_id;
+} cpu_vendors[] = {
+	{ INTEL_VENDOR_ID,	CPU_VENDOR_INTEL },	/* GenuineIntel */
+	{ AMD_VENDOR_ID,	CPU_VENDOR_AMD },	/* AuthenticAMD */
+};
+
 int cpu_cores;
 int cpu_logical;
 
@@ -122,10 +131,10 @@ printcpuinfo(void)
 		}
 	}
 
-	if (strcmp(cpu_vendor, "GenuineIntel") == 0) {
+	if (cpu_vendor_id == CPU_VENDOR_INTEL) {
 		/* Please make up your mind folks! */
 		strcat(cpu_model, "EM64T");
-	} else if (strcmp(cpu_vendor, "AuthenticAMD") == 0) {
+	} else if (cpu_vendor_id == CPU_VENDOR_AMD) {
 		/*
 		 * Values taken from AMD Processor Recognition
 		 * http://www.amd.com/K6/k6docs/pdf/20734g.pdf
@@ -165,13 +174,13 @@ printcpuinfo(void)
 		printf("Unknown");	/* will panic below... */
 	}
 	printf("-class CPU)\n");
-	if(*cpu_vendor)
-		printf("  Origin = \"%s\"",cpu_vendor);
-	if(cpu_id)
+	if (*cpu_vendor)
+		printf("  Origin = \"%s\"", cpu_vendor);
+	if (cpu_id)
 		printf("  Id = 0x%x", cpu_id);
 
-	if (strcmp(cpu_vendor, "GenuineIntel") == 0 ||
-	    strcmp(cpu_vendor, "AuthenticAMD") == 0) {
+	if (cpu_vendor_id == CPU_VENDOR_INTEL ||
+	    cpu_vendor_id == CPU_VENDOR_AMD) {
 		printf("  Stepping = %u", cpu_id & 0xf);
 		if (cpu_high > 0) {
 			u_int cmp = 1, htt = 1;
@@ -313,15 +322,15 @@ printcpuinfo(void)
 				"\003SVM"	/* Secure Virtual Mode */
 				"\004ExtAPIC"	/* Extended APIC register */
 				"\005CR8"	/* CR8 in legacy mode */
-				"\006<b5>"
-				"\007<b6>"
-				"\010<b7>"
+				"\006ABM"	/* LZCNT instruction */
+				"\007SSE4A"	/* SSE4A */
+				"\010MAS"	/* Misaligned SSE mode */
 				"\011Prefetch"	/* 3DNow! Prefetch/PrefetchW */
-				"\012<b9>"
-				"\013<b10>"
-				"\014<b11>"
-				"\015<b12>"
-				"\016<b13>"
+				"\012OSVW"	/* OS visible workaround */
+				"\013IBS"	/* Instruction based sampling */
+				"\014SSE5"	/* SSE5 */
+				"\015SKINIT"	/* SKINIT/STGI */
+				"\016WDT"	/* Watchdog timer */
 				"\017<b14>"
 				"\020<b15>"
 				"\021<b16>"
@@ -343,20 +352,43 @@ printcpuinfo(void)
 				);
 			}
 
-			if (cpu_feature & CPUID_HTT && strcmp(cpu_vendor,
-			    "AuthenticAMD") == 0)
+			if ((cpu_feature & CPUID_HTT) &&
+			    cpu_vendor_id == CPU_VENDOR_AMD)
 				cpu_feature &= ~CPUID_HTT;
 
 			/*
+			 * If this CPU supports P-state invariant TSC then
+			 * mention the capability.
+			 */
+			switch (cpu_vendor_id) {
+			case CPU_VENDOR_AMD:
+				if ((amd_pminfo & AMDPM_TSC_INVARIANT) ||
+				    AMD64_CPU_FAMILY(cpu_id) >= 0x10 ||
+				    cpu_id == 0x60fb2)
+					tsc_is_invariant = 1;
+				break;
+			case CPU_VENDOR_INTEL:
+				if ((amd_pminfo & AMDPM_TSC_INVARIANT) ||
+				    (AMD64_CPU_FAMILY(cpu_id) == 0x6 &&
+				    AMD64_CPU_MODEL(cpu_id) >= 0xe) ||
+				    (AMD64_CPU_FAMILY(cpu_id) == 0xf &&
+				    AMD64_CPU_MODEL(cpu_id) >= 0x3))
+					tsc_is_invariant = 1;
+				break;
+			}
+			if (tsc_is_invariant)
+				printf("\n  TSC: P-state invariant");
+
+			/*
 			 * If this CPU supports HTT or CMP then mention the
 			 * number of physical/logical cores it contains.
 			 */
 			if (cpu_feature & CPUID_HTT)
 				htt = (cpu_procinfo & CPUID_HTT_CORES) >> 16;
-			if (strcmp(cpu_vendor, "AuthenticAMD") == 0 &&
+			if (cpu_vendor_id == CPU_VENDOR_AMD &&
 			    (amd_feature2 & AMDID2_CMP))
 				cmp = (cpu_procinfo2 & AMDID_CMP_CORES) + 1;
-			else if (strcmp(cpu_vendor, "GenuineIntel") == 0 &&
+			else if (cpu_vendor_id == CPU_VENDOR_INTEL &&
 			    (cpu_high >= 4)) {
 				cpuid_count(4, 0, regs);
 				if ((regs[0] & 0x1f) != 0)
@@ -378,7 +410,7 @@ printcpuinfo(void)
 	if (!bootverbose)
 		return;
 
-	if (strcmp(cpu_vendor, "AuthenticAMD") == 0)
+	if (cpu_vendor_id == CPU_VENDOR_AMD)
 		print_AMD_info();
 }
 
@@ -409,8 +441,11 @@ panicifcpuunsupported(void)
 static void
 tsc_freq_changed(void *arg, const struct cf_level *level, int status)
 {
-	/* If there was an error during the transition, don't do anything. */
-	if (status != 0)
+	/*
+	 * If there was an error during the transition or
+	 * TSC is P-state invariant, don't do anything.
+	 */
+	if (status != 0 || tsc_is_invariant)
 		return;
 
 	/* Total setting for this level gives the new frequency in MHz. */
@@ -434,6 +469,7 @@ identify_cpu(void)
 	((u_int *)&cpu_vendor)[1] = regs[3];
 	((u_int *)&cpu_vendor)[2] = regs[2];
 	cpu_vendor[12] = '\0';
+	cpu_vendor_id = find_cpu_vendor_id();
 
 	do_cpuid(1, regs);
 	cpu_id = regs[0];
@@ -441,8 +477,8 @@ identify_cpu(void)
 	cpu_feature = regs[3];
 	cpu_feature2 = regs[2];
 
-	if (strcmp(cpu_vendor, "GenuineIntel") == 0 ||
-	    strcmp(cpu_vendor, "AuthenticAMD") == 0) {
+	if (cpu_vendor_id == CPU_VENDOR_INTEL ||
+	    cpu_vendor_id == CPU_VENDOR_AMD) {
 		do_cpuid(0x80000000, regs);
 		cpu_exthigh = regs[0];
 	}
@@ -451,6 +487,10 @@ identify_cpu(void)
 		amd_feature = regs[3] & ~(cpu_feature & 0x0183f3ff);
 		amd_feature2 = regs[2];
 	}
+	if (cpu_exthigh >= 0x80000007) {
+		do_cpuid(0x80000007, regs);
+		amd_pminfo = regs[3];
+	}
 	if (cpu_exthigh >= 0x80000008) {
 		do_cpuid(0x80000008, regs);
 		cpu_procinfo2 = regs[2];
@@ -460,6 +500,17 @@ identify_cpu(void)
 	cpu = CPU_CLAWHAMMER;
 }
 
+static u_int
+find_cpu_vendor_id(void)
+{
+	int	i;
+
+	for (i = 0; i < sizeof(cpu_vendors) / sizeof(cpu_vendors[0]); i++)
+		if (strcmp(cpu_vendor, cpu_vendors[i].vendor) == 0)
+			return (cpu_vendors[i].vendor_id);
+	return (0);
+}
+
 static void
 print_AMD_assoc(int i)
 {

Modified: user/nyan/pc98/sys/amd64/amd64/initcpu.c
==============================================================================
--- user/nyan/pc98/sys/amd64/amd64/initcpu.c	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/amd64/initcpu.c	Thu Dec 18 14:21:06 2008	(r186281)
@@ -53,12 +53,14 @@ u_int	cpu_feature;		/* Feature flags */
 u_int	cpu_feature2;		/* Feature flags */
 u_int	amd_feature;		/* AMD feature flags */
 u_int	amd_feature2;		/* AMD feature flags */
+u_int	amd_pminfo;		/* AMD advanced power management info */
 u_int	cpu_high;		/* Highest arg to CPUID */
 u_int	cpu_exthigh;		/* Highest arg to extended CPUID */
 u_int	cpu_id;			/* Stepping ID */
 u_int	cpu_procinfo;		/* HyperThreading Info / Brand Index / CLFUSH */
 u_int	cpu_procinfo2;		/* Multicore info */
 char	cpu_vendor[20];		/* CPU Origin code */
+u_int	cpu_vendor_id;		/* CPU vendor ID */
 u_int	cpu_fxsr;		/* SSE enabled */
 u_int	cpu_mxcsr_mask;		/* Valid bits in mxcsr */
 

Modified: user/nyan/pc98/sys/amd64/amd64/intr_machdep.c
==============================================================================
--- user/nyan/pc98/sys/amd64/amd64/intr_machdep.c	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/amd64/intr_machdep.c	Thu Dec 18 14:21:06 2008	(r186281)
@@ -239,11 +239,8 @@ void
 intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame)
 {
 	struct intr_event *ie;
-	struct thread *td;
 	int vector;
 
-	td = curthread;
-
 	/*
 	 * We count software interrupts when we process them.  The
 	 * code here follows previous practice, but there's an

Modified: user/nyan/pc98/sys/amd64/amd64/local_apic.c
==============================================================================
--- user/nyan/pc98/sys/amd64/amd64/local_apic.c	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/amd64/local_apic.c	Thu Dec 18 14:21:06 2008	(r186281)
@@ -299,6 +299,7 @@ lapic_setup(int boot)
 	/* Program LINT[01] LVT entries. */
 	lapic->lvt_lint0 = lvt_mode(la, LVT_LINT0, lapic->lvt_lint0);
 	lapic->lvt_lint1 = lvt_mode(la, LVT_LINT1, lapic->lvt_lint1);
+
 #ifdef	HWPMC_HOOKS
 	/* Program the PMC LVT entry if present. */
 	if (maxlvt >= LVT_PMC)
@@ -323,7 +324,7 @@ lapic_setup(int boot)
 
 	/* XXX: Error and thermal LVTs */
 
-	if (strcmp(cpu_vendor, "AuthenticAMD") == 0) {
+	if (cpu_vendor_id == CPU_VENDOR_AMD) {
 		/*
 		 * Detect the presence of C1E capability mostly on latest
 		 * dual-cores (or future) k8 family.  This feature renders
@@ -401,7 +402,10 @@ lapic_setup_clock(void)
 		lapic_timer_hz = hz * 2;
 	else
 		lapic_timer_hz = hz * 4;
-	stathz = lapic_timer_hz / (lapic_timer_hz / 128);
+	if (lapic_timer_hz < 128)
+		stathz = lapic_timer_hz;
+	else
+		stathz = lapic_timer_hz / (lapic_timer_hz / 128);
 	profhz = lapic_timer_hz;
 	lapic_timer_period = value / lapic_timer_hz;
 
@@ -641,6 +645,18 @@ lapic_eoi(void)
 	lapic->eoi = 0;
 }
 
+/*
+ * Read the contents of the error status register.  We have to write
+ * to the register first before reading from it.
+ */
+u_int
+lapic_error(void)
+{
+
+	lapic->esr = 0;
+	return (lapic->esr);
+}
+
 void
 lapic_handle_intr(int vector, struct trapframe *frame)
 {

Modified: user/nyan/pc98/sys/amd64/amd64/minidump_machdep.c
==============================================================================
--- user/nyan/pc98/sys/amd64/amd64/minidump_machdep.c	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/amd64/minidump_machdep.c	Thu Dec 18 14:21:06 2008	(r186281)
@@ -104,7 +104,7 @@ blk_write(struct dumperinfo *di, char *p
 	int error, i, c;
 	u_int maxdumpsz;
 
-	maxdumpsz = di->maxiosize;
+	maxdumpsz = min(di->maxiosize, MAXDUMPPGS * PAGE_SIZE);
 	if (maxdumpsz == 0)	/* seatbelt */
 		maxdumpsz = PAGE_SIZE;
 	error = 0;

Modified: user/nyan/pc98/sys/amd64/amd64/mp_machdep.c
==============================================================================
--- user/nyan/pc98/sys/amd64/amd64/mp_machdep.c	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/amd64/mp_machdep.c	Thu Dec 18 14:21:06 2008	(r186281)
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
 #include <vm/vm_extern.h>
 
 #include <machine/apicreg.h>
+#include <machine/cputypes.h>
 #include <machine/md_var.h>
 #include <machine/mp_watchdog.h>
 #include <machine/pcb.h>
@@ -374,8 +375,7 @@ cpu_mp_start(void)
 	 * First determine if this is an Intel processor which claims
 	 * to have hyperthreading support.
 	 */
-	if ((cpu_feature & CPUID_HTT) &&
-	    (strcmp(cpu_vendor, "GenuineIntel") == 0)) {
+	if ((cpu_feature & CPUID_HTT) && cpu_vendor_id == CPU_VENDOR_INTEL) {
 		/*
 		 * If the "deterministic cache parameters" cpuid calls
 		 * are available, use them.

Modified: user/nyan/pc98/sys/amd64/amd64/msi.c
==============================================================================
--- user/nyan/pc98/sys/amd64/amd64/msi.c	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/amd64/msi.c	Thu Dec 18 14:21:06 2008	(r186281)
@@ -46,6 +46,7 @@ __FBSDID("$FreeBSD$");
 #include <sys/sx.h>
 #include <sys/systm.h>
 #include <machine/apicreg.h>
+#include <machine/cputypes.h>
 #include <machine/md_var.h>
 #include <machine/frame.h>
 #include <machine/intr_machdep.h>
@@ -211,8 +212,8 @@ msi_init(void)
 {
 
 	/* Check if we have a supported CPU. */
-	if (!(strcmp(cpu_vendor, "GenuineIntel") == 0 ||
-	      strcmp(cpu_vendor, "AuthenticAMD") == 0))
+	if (!(cpu_vendor_id == CPU_VENDOR_INTEL ||
+	    cpu_vendor_id == CPU_VENDOR_AMD))
 		return;
 
 	msi_enabled = 1;

Modified: user/nyan/pc98/sys/amd64/amd64/pmap.c
==============================================================================
--- user/nyan/pc98/sys/amd64/amd64/pmap.c	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/amd64/pmap.c	Thu Dec 18 14:21:06 2008	(r186281)
@@ -180,7 +180,7 @@ pt_entry_t pg_nx;
 
 SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters");
 
-static int pg_ps_enabled;
+static int pg_ps_enabled = 1;
 SYSCTL_INT(_vm_pmap, OID_AUTO, pg_ps_enabled, CTLFLAG_RD, &pg_ps_enabled, 0,
     "Are large page mappings enabled?");
 

Modified: user/nyan/pc98/sys/amd64/amd64/prof_machdep.c
==============================================================================
--- user/nyan/pc98/sys/amd64/amd64/prof_machdep.c	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/amd64/prof_machdep.c	Thu Dec 18 14:21:06 2008	(r186281)
@@ -383,8 +383,11 @@ static void
 tsc_freq_changed(void *arg, const struct cf_level *level, int status)
 {
 
-	/* If there was an error during the transition, don't do anything. */
-	if (status != 0)
+	/*
+	 * If there was an error during the transition or
+	 * TSC is P-state invariant, don't do anything.
+	 */
+	if (status != 0 || tsc_is_invariant)
 		return;
 	if (cputime_prof_active && cputime_clock == CPUTIME_CLOCK_TSC)
 		printf("warning: cpu freq changed while profiling active\n");

Modified: user/nyan/pc98/sys/amd64/amd64/tsc.c
==============================================================================
--- user/nyan/pc98/sys/amd64/amd64/tsc.c	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/amd64/tsc.c	Thu Dec 18 14:21:06 2008	(r186281)
@@ -48,8 +48,13 @@ __FBSDID("$FreeBSD$");
 
 uint64_t	tsc_freq;
 int		tsc_is_broken;
+int		tsc_is_invariant;
 static eventhandler_tag tsc_levels_tag, tsc_pre_tag, tsc_post_tag;
 
+SYSCTL_INT(_kern_timecounter, OID_AUTO, invariant_tsc, CTLFLAG_RDTUN,
+    &tsc_is_invariant, 0, "Indicates whether the TSC is P-state invariant");
+TUNABLE_INT("kern.timecounter.invariant_tsc", &tsc_is_invariant);
+
 #ifdef SMP
 static int	smp_tsc;
 SYSCTL_INT(_kern_timecounter, OID_AUTO, smp_tsc, CTLFLAG_RDTUN, &smp_tsc, 0,
@@ -174,11 +179,12 @@ static void
 tsc_freq_changing(void *arg, const struct cf_level *level, int *status)
 {
 
-	if (*status != 0 || timecounter != &tsc_timecounter)
+	if (*status != 0 || timecounter != &tsc_timecounter ||
+	    tsc_is_invariant)
 		return;
 
 	printf("timecounter TSC must not be in use when "
-	     "changing frequencies; change denied\n");
+	    "changing frequencies; change denied\n");
 	*status = EBUSY;
 }
 
@@ -186,8 +192,11 @@ tsc_freq_changing(void *arg, const struc
 static void
 tsc_freq_changed(void *arg, const struct cf_level *level, int status)
 {
-	/* If there was an error during the transition, don't do anything. */
-	if (status != 0)
+	/*
+	 * If there was an error during the transition or
+	 * TSC is P-state invariant, don't do anything.
+	 */
+	if (status != 0 || tsc_is_invariant)
 		return;
 
 	/* Total setting for this level gives the new frequency in MHz. */

Modified: user/nyan/pc98/sys/amd64/conf/DEFAULTS
==============================================================================
--- user/nyan/pc98/sys/amd64/conf/DEFAULTS	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/conf/DEFAULTS	Thu Dec 18 14:21:06 2008	(r186281)
@@ -16,5 +16,5 @@ device		io		# I/O device
 device		uart_ns8250
 
 # Default partitioning schemes
-options 	GEOM_BSD
-options 	GEOM_MBR
+options 	GEOM_PART_BSD
+options 	GEOM_PART_MBR

Modified: user/nyan/pc98/sys/amd64/conf/GENERIC
==============================================================================
--- user/nyan/pc98/sys/amd64/conf/GENERIC	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/conf/GENERIC	Thu Dec 18 14:21:06 2008	(r186281)
@@ -48,7 +48,7 @@ options 	PROCFS			# Process filesystem (
 options 	PSEUDOFS		# Pseudo-filesystem framework
 options 	GEOM_PART_GPT		# GUID Partition Tables.
 options 	GEOM_LABEL		# Provides labelization
-options 	COMPAT_43TTY		# BSD 4.3 TTY compat [KEEP THIS!]
+options 	COMPAT_43TTY		# BSD 4.3 TTY compat (sgtty)
 options 	COMPAT_IA32		# Compatible with i386 binaries
 options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
 options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
@@ -202,6 +202,7 @@ device		vx		# 3Com 3c590, 3c595 (``Vorte
 device		miibus		# MII bus support
 device		ae		# Attansic/Atheros L2 FastEthernet
 device		age		# Attansic/Atheros L1 Gigabit Ethernet
+device		ale		# Atheros AR8121/AR8113/AR8114 Ethernet
 device		bce		# Broadcom BCM5706/BCM5708 Gigabit Ethernet
 device		bfe		# Broadcom BCM440x 10/100 Ethernet
 device		bge		# Broadcom BCM570xx Gigabit Ethernet
@@ -248,7 +249,8 @@ device		wlan_tkip	# 802.11 TKIP support
 device		wlan_amrr	# AMRR transmit rate control algorithm
 device		an		# Aironet 4500/4800 802.11 wireless NICs.
 device		ath		# Atheros pci/cardbus NIC's
-device		ath_hal		# Atheros HAL (Hardware Access Layer)
+device		ath_hal		# pci/cardbus chip support
+options		AH_SUPPORT_AR5416	# enable AR5416 tx/rx descriptors
 device		ath_rate_sample	# SampleRate tx rate control for ath
 device		ral		# Ralink Technology RT2500 wireless NICs.
 device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.

Modified: user/nyan/pc98/sys/amd64/conf/NOTES
==============================================================================
--- user/nyan/pc98/sys/amd64/conf/NOTES	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/conf/NOTES	Thu Dec 18 14:21:06 2008	(r186281)
@@ -258,7 +258,6 @@ options 	DRM_DEBUG	# Include debug print
 # Network interfaces:
 #
 
-# ath:  Atheros a/b/g WiFi adapters (requires ath_hal and wlan)
 # ed:   Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503
 #       HP PC Lan+, various PC Card devices
 #       (requires miibus)
@@ -284,12 +283,12 @@ device		ral
 device		ural
 device		wpi
 
-device		ath
-device		ath_hal		# Atheros HAL (includes binary component)
-#device		ath_rate_amrr	# AMRR rate control for ath driver
-#device		ath_rate_onoe	# Onoe rate control for ath driver
-device		ath_rate_sample	# SampleRate rate control for the ath driver
-#device		wlan		# 802.11 layer
+device		ath			# Atheros pci/cardbus NIC's
+device		ath_hal			# pci/cardbus chip support
+options		AH_SUPPORT_AR5416	# enable AR5416 tx/rx descriptors
+device		ath_rate_sample		# SampleRate tx rate control for ath
+#device		ath_rate_amrr		# AMRR rate control for ath driver
+#device		ath_rate_onoe		# Onoe rate control for ath driver
 
 #
 #XXX this stores pointers in a 32bit field that is defined by the hardware

Modified: user/nyan/pc98/sys/amd64/include/apicreg.h
==============================================================================
--- user/nyan/pc98/sys/amd64/include/apicreg.h	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/include/apicreg.h	Thu Dec 18 14:21:06 2008	(r186281)
@@ -260,6 +260,14 @@ typedef struct IOAPIC ioapic_t;
 # define APIC_TPR_INT		0x000000f0
 # define APIC_TPR_SUB		0x0000000f
 
+/* fields in ESR */
+#define	APIC_ESR_SEND_CS_ERROR		0x00000001
+#define	APIC_ESR_RECEIVE_CS_ERROR	0x00000002
+#define	APIC_ESR_SEND_ACCEPT		0x00000004
+#define	APIC_ESR_RECEIVE_ACCEPT		0x00000008
+#define	APIC_ESR_SEND_ILLEGAL_VECTOR	0x00000020
+#define	APIC_ESR_RECEIVE_ILLEGAL_VECTOR	0x00000040
+#define	APIC_ESR_ILLEGAL_REGISTER	0x00000080
 
 /* fields in ICR_LOW */
 #define APIC_VECTOR_MASK	0x000000ff

Modified: user/nyan/pc98/sys/amd64/include/apicvar.h
==============================================================================
--- user/nyan/pc98/sys/amd64/include/apicvar.h	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/include/apicvar.h	Thu Dec 18 14:21:06 2008	(r186281)
@@ -200,6 +200,7 @@ void	lapic_create(u_int apic_id, int boo
 void	lapic_disable(void);
 void	lapic_dump(const char *str);
 void	lapic_eoi(void);
+u_int	lapic_error(void);
 int	lapic_id(void);
 void	lapic_init(vm_paddr_t addr);
 int	lapic_intr_pending(u_int vector);

Modified: user/nyan/pc98/sys/amd64/include/atomic.h
==============================================================================
--- user/nyan/pc98/sys/amd64/include/atomic.h	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/include/atomic.h	Thu Dec 18 14:21:06 2008	(r186281)
@@ -32,6 +32,10 @@
 #error this file needs sys/cdefs.h as a prerequisite
 #endif
 
+#define mb()	__asm__ __volatile__ ("mfence;": : :"memory")
+#define wmb()	__asm__ __volatile__ ("sfence;": : :"memory")
+#define rmb()	__asm__ __volatile__ ("lfence;": : :"memory")
+
 /*
  * Various simple operations on memory, each of which is atomic in the
  * presence of interrupts and multiple processors.

Modified: user/nyan/pc98/sys/amd64/include/clock.h
==============================================================================
--- user/nyan/pc98/sys/amd64/include/clock.h	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/include/clock.h	Thu Dec 18 14:21:06 2008	(r186281)
@@ -20,6 +20,7 @@ extern u_int	i8254_freq;
 extern int	i8254_max_count;
 extern uint64_t	tsc_freq;
 extern int	tsc_is_broken;
+extern int	tsc_is_invariant;
 
 void	i8254_init(void);
 

Modified: user/nyan/pc98/sys/amd64/include/cputypes.h
==============================================================================
--- user/nyan/pc98/sys/amd64/include/cputypes.h	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/include/cputypes.h	Thu Dec 18 14:21:06 2008	(r186281)
@@ -33,15 +33,21 @@
 /*
  * Classes of processor.
  */
-#define	CPUCLASS_X86	0	/* X86 */
-#define	CPUCLASS_K8	1	/* K8 AMD64 class */
+#define	CPUCLASS_X86		0	/* X86 */
+#define	CPUCLASS_K8		1	/* K8 AMD64 class */
 
 /*
  * Kinds of processor.
  */
-#define	CPU_X86		0	/* Intel */
-#define	CPU_CLAWHAMMER	1	/* AMD Clawhammer */
-#define	CPU_SLEDGEHAMMER 2	/* AMD Sledgehammer */
+#define	CPU_X86			0	/* Intel */
+#define	CPU_CLAWHAMMER		1	/* AMD Clawhammer */
+#define	CPU_SLEDGEHAMMER	2	/* AMD Sledgehammer */
+
+/*
+ * Vendors of processor.
+ */
+#define	CPU_VENDOR_AMD		0x1022		/* AMD */
+#define	CPU_VENDOR_INTEL	0x8086		/* Intel */
 
 #ifndef LOCORE
 extern int	cpu;

Modified: user/nyan/pc98/sys/amd64/include/elf.h
==============================================================================
--- user/nyan/pc98/sys/amd64/include/elf.h	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/include/elf.h	Thu Dec 18 14:21:06 2008	(r186281)
@@ -81,18 +81,6 @@ __ElfType(Auxinfo);
 #define	AT_BASE		7	/* Interpreter's base address. */
 #define	AT_FLAGS	8	/* Flags (unused for i386). */
 #define	AT_ENTRY	9	/* Where interpreter should transfer control. */
-
-/*
- * The following non-standard values are used for passing information
- * from John Polstra's testbed program to the dynamic linker.  These
- * are expected to go away soon.
- *
- * Unfortunately, these overlap the Linux non-standard values, so they
- * must not be used in the same context.
- */
-#define	AT_BRK		10	/* Starting point for sbrk and brk. */
-#define	AT_DEBUG	11	/* Debugging level. */
-
 /*
  * The following non-standard values are used in Linux ELF binaries.
  */

Modified: user/nyan/pc98/sys/amd64/include/md_var.h
==============================================================================
--- user/nyan/pc98/sys/amd64/include/md_var.h	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/include/md_var.h	Thu Dec 18 14:21:06 2008	(r186281)
@@ -44,6 +44,7 @@ extern	u_int	cpu_feature;
 extern	u_int	cpu_feature2;
 extern	u_int	amd_feature;
 extern	u_int	amd_feature2;
+extern	u_int	amd_pminfo;
 extern	u_int	cpu_fxsr;
 extern	u_int	cpu_high;
 extern	u_int	cpu_id;
@@ -51,6 +52,7 @@ extern	u_int	cpu_mxcsr_mask;
 extern	u_int	cpu_procinfo;
 extern	u_int	cpu_procinfo2;
 extern	char	cpu_vendor[];
+extern	u_int	cpu_vendor_id;
 extern	char	kstack[];
 extern	char	sigcode[];
 extern	int	szsigcode;

Modified: user/nyan/pc98/sys/amd64/include/pmc_mdep.h
==============================================================================
--- user/nyan/pc98/sys/amd64/include/pmc_mdep.h	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/include/pmc_mdep.h	Thu Dec 18 14:21:06 2008	(r186281)
@@ -35,11 +35,40 @@
 #ifndef _MACHINE_PMC_MDEP_H
 #define	_MACHINE_PMC_MDEP_H 1
 
+#ifdef	_KERNEL
+struct pmc_mdep;
+#endif
+
 #include <dev/hwpmc/hwpmc_amd.h>
+#include <dev/hwpmc/hwpmc_core.h>
 #include <dev/hwpmc/hwpmc_piv.h>
+#include <dev/hwpmc/hwpmc_tsc.h>
+
+/*
+ * Intel processors implementing V2 and later of the Intel performance
+ * measurement architecture have PMCs of the following classes: TSC,
+ * IAF and IAP.
+ */
+#define	PMC_MDEP_CLASS_INDEX_TSC	0
+#define	PMC_MDEP_CLASS_INDEX_K8		1
+#define	PMC_MDEP_CLASS_INDEX_P4		1
+#define	PMC_MDEP_CLASS_INDEX_IAP	1
+#define	PMC_MDEP_CLASS_INDEX_IAF	2
+
+/*
+ * On the amd64 platform we support the following PMCs.
+ *
+ * TSC		The timestamp counter
+ * K8		AMD Athlon64 and Opteron PMCs in 64 bit mode.
+ * PIV		Intel P4/HTT and P4/EMT64
+ * IAP		Intel Core/Core2/Atom CPUs in 64 bits mode.
+ * IAF		Intel fixed-function PMCs in Core2 and later CPUs.
+ */
 
 union pmc_md_op_pmcallocate  {
 	struct pmc_md_amd_op_pmcallocate	pm_amd;
+	struct pmc_md_iaf_op_pmcallocate	pm_iaf;
+	struct pmc_md_iap_op_pmcallocate	pm_iap;
 	struct pmc_md_p4_op_pmcallocate		pm_p4;
 	uint64_t				__pad[4];
 };
@@ -52,11 +81,11 @@ union pmc_md_op_pmcallocate  {
 
 union pmc_md_pmc {
 	struct pmc_md_amd_pmc	pm_amd;
+	struct pmc_md_iaf_pmc	pm_iaf;
+	struct pmc_md_iap_pmc	pm_iap;
 	struct pmc_md_p4_pmc	pm_p4;
 };
 
-struct pmc;
-
 #define	PMC_TRAPFRAME_TO_PC(TF)	((TF)->tf_rip)
 #define	PMC_TRAPFRAME_TO_FP(TF)	((TF)->tf_rbp)
 #define	PMC_TRAPFRAME_TO_USER_SP(TF)	((TF)->tf_rsp)
@@ -88,5 +117,10 @@ struct pmc;
 void	start_exceptions(void), end_exceptions(void);
 void	pmc_x86_lapic_enable_pmc_interrupt(void);
 
-#endif
+struct pmc_mdep *pmc_amd_initialize(void);
+void	pmc_amd_finalize(struct pmc_mdep *_md);
+struct pmc_mdep *pmc_intel_initialize(void);
+void	pmc_intel_finalize(struct pmc_mdep *_md);
+
+#endif /* _KERNEL */
 #endif /* _MACHINE_PMC_MDEP_H */

Modified: user/nyan/pc98/sys/amd64/include/specialreg.h
==============================================================================
--- user/nyan/pc98/sys/amd64/include/specialreg.h	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/include/specialreg.h	Thu Dec 18 14:21:06 2008	(r186281)
@@ -150,7 +150,30 @@
 #define	AMDID2_SVM	0x00000004
 #define	AMDID2_EXT_APIC	0x00000008
 #define	AMDID2_CR8	0x00000010
+#define	AMDID2_ABM	0x00000020
+#define	AMDID2_SSE4A	0x00000040
+#define	AMDID2_MAS	0x00000080
 #define	AMDID2_PREFETCH	0x00000100
+#define	AMDID2_OSVW	0x00000200
+#define	AMDID2_IBS	0x00000400
+#define	AMDID2_SSE5	0x00000800
+#define	AMDID2_SKINIT	0x00001000
+#define	AMDID2_WDT	0x00002000
+
+/*
+ * CPUID instruction 1 eax info
+ */
+#define	CPUID_STEPPING		0x0000000f
+#define	CPUID_MODEL		0x000000f0
+#define	CPUID_FAMILY		0x00000f00
+#define	CPUID_EXT_MODEL		0x000f0000
+#define	CPUID_EXT_FAMILY	0x0ff00000
+#define	AMD64_CPU_MODEL(id) \
+    ((((id) & CPUID_MODEL) >> 4) | \
+    (((id) & CPUID_EXT_MODEL) >> 12))
+#define	AMD64_CPU_FAMILY(id) \
+    ((((id) & CPUID_FAMILY) >> 8) + \
+    (((id) & CPUID_EXT_FAMILY) >> 20))
 
 /*
  * CPUID instruction 1 ebx info
@@ -161,6 +184,19 @@
 #define	CPUID_LOCAL_APIC_ID	0xff000000
 
 /*
+ * AMD extended function 8000_0007h edx info
+ */
+#define	AMDPM_TS		0x00000001
+#define	AMDPM_FID		0x00000002
+#define	AMDPM_VID		0x00000004
+#define	AMDPM_TTP		0x00000008
+#define	AMDPM_TM		0x00000010
+#define	AMDPM_STC		0x00000020
+#define	AMDPM_100MHZ_STEPS	0x00000040
+#define	AMDPM_HW_PSTATE		0x00000080
+#define	AMDPM_TSC_INVARIANT	0x00000100
+
+/*
  * AMD extended function 8000_0008h ecx info
  */
 #define	AMDID_CMP_CORES		0x000000ff
@@ -168,8 +204,8 @@
 /*
  * CPUID manufacturers identifiers
  */
-#define	INTEL_VENDOR_ID	"GenuineIntel"
-#define	AMD_VENDOR_ID	"AuthenticAMD"
+#define	AMD_VENDOR_ID		"AuthenticAMD"
+#define	INTEL_VENDOR_ID		"GenuineIntel"
 
 /*
  * Model-specific registers for the i386 family

Modified: user/nyan/pc98/sys/amd64/linux32/linux.h
==============================================================================
--- user/nyan/pc98/sys/amd64/linux32/linux.h	Thu Dec 18 14:19:54 2008	(r186280)
+++ user/nyan/pc98/sys/amd64/linux32/linux.h	Thu Dec 18 14:21:06 2008	(r186281)
@@ -86,6 +86,8 @@ typedef l_long		l_suseconds_t;
 typedef l_long		l_time_t;
 typedef l_uint		l_uid_t;
 typedef l_ushort	l_uid16_t;
+typedef l_int		l_timer_t;
+typedef l_int		l_mqd_t;
 
 typedef struct {
 	l_int		val[2];
@@ -399,10 +401,10 @@ struct l_ucontext {
 #define	LINUX_SI_MAX_SIZE	128
 #define	LINUX_SI_PAD_SIZE	((LINUX_SI_MAX_SIZE/sizeof(l_int)) - 3)
 
-union l_sigval {
+typedef union l_sigval {
 	l_int		sival_int;
 	l_uintptr_t	sival_ptr;
-};
+} l_sigval_t;
 
 typedef struct l_siginfo {
 	l_int		lsi_signo;
@@ -413,23 +415,26 @@ typedef struct l_siginfo {
 
 		struct {
 			l_pid_t		_pid;
-			l_uid16_t	_uid;
+			l_uid_t		_uid;
 		} __packed _kill;
 
 		struct {
-			l_uint		_timer1;
-			l_uint		_timer2;
+			l_timer_t	_tid;
+			l_int		_overrun;
+			char		_pad[sizeof(l_uid_t) - sizeof(l_int)];
+			l_sigval_t	_sigval;
+			l_int		_sys_private;
 		} __packed _timer;
 
 		struct {
 			l_pid_t		_pid;		/* sender's pid */
-			l_uid16_t	_uid;		/* sender's uid */
-			union l_sigval _sigval;
+			l_uid_t		_uid;		/* sender's uid */
+			l_sigval_t	_sigval;
 		} __packed _rt;
 
 		struct {
 			l_pid_t		_pid;		/* which child */
-			l_uid16_t	_uid;		/* sender's uid */
+			l_uid_t		_uid;		/* sender's uid */
 			l_int		_status;	/* exit code */
 			l_clock_t	_utime;
 			l_clock_t	_stime;
@@ -440,7 +445,7 @@ typedef struct l_siginfo {
 		} __packed _sigfault;
 
 		struct {
-			l_int		_band;	/* POLL_IN,POLL_OUT,POLL_MSG */
+			l_long		_band;	/* POLL_IN,POLL_OUT,POLL_MSG */
 			l_int		_fd;
 		} __packed _sigpoll;
 	} _sifields;
@@ -448,6 +453,9 @@ typedef struct l_siginfo {
 
 #define	lsi_pid		_sifields._kill._pid
 #define	lsi_uid		_sifields._kill._uid
+#define	lsi_tid		_sifields._timer._tid
+#define	lsi_overrun	_sifields._timer._overrun
+#define	lsi_sys_private	_sifields._timer._sys_private
 #define	lsi_status	_sifields._sigchld._status
 #define	lsi_utime	_sifields._sigchld._utime
 #define	lsi_stime	_sifields._sigchld._stime

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