diff --git a/sys/arch/arc/arc/machdep.c b/sys/arch/arc/arc/machdep.c
index cc2214197ff8..80897679434a 100644
--- a/sys/arch/arc/arc/machdep.c
+++ b/sys/arch/arc/arc/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.118 2009/11/27 03:23:04 rmind Exp $	*/
+/*	$NetBSD: machdep.c,v 1.119 2009/12/16 23:19:06 matt Exp $	*/
 /*	$OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $	*/
 
 /*
@@ -78,7 +78,7 @@
 /* from: Utah Hdr: machdep.c 1.63 91/04/24 */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.118 2009/11/27 03:23:04 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.119 2009/12/16 23:19:06 matt Exp $");
 
 #include "fs_mfs.h"
 #include "opt_ddb.h"
@@ -231,8 +231,6 @@ mach_init(int argc, char *argv[], u_int bim, void *bip)
 	int i;
 	paddr_t kernstartpfn, kernendpfn, first, last;
 	char *kernend;
-	struct pcb *pcb0;
-	vaddr_t v;
 #if NKSYMS > 0 || defined(DDB) || defined(MODULAR)
 	char *ssym = NULL;
 	char *esym = NULL;
@@ -491,13 +489,8 @@ mach_init(int argc, char *argv[], u_int bim, void *bip)
 	/*
 	 * Allocate uarea page for lwp0 and set it.
 	 */
-	v = uvm_pageboot_alloc(USPACE);
-	uvm_lwp_setuarea(&lwp0, v);
+	mips_init_lwp0_uarea();
 
-	pcb0 = lwp_getpcb(&lwp0);
-	pcb0->pcb_context[11] = MIPS_INT_MASK | MIPS_SR_INT_IE; /* SR */
-
-	lwp0.l_md.md_regs = (struct frame *)(v + USPACE) - 1;
 }
 
 void
diff --git a/sys/arch/arc/arc/wired_map_machdep.c b/sys/arch/arc/arc/wired_map_machdep.c
index 60a3aa16fe3c..5b0113537ff8 100644
--- a/sys/arch/arc/arc/wired_map_machdep.c
+++ b/sys/arch/arc/arc/wired_map_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: wired_map_machdep.c,v 1.5 2007/02/22 05:09:01 thorpej Exp $	*/
+/*	$NetBSD: wired_map_machdep.c,v 1.6 2009/12/16 23:19:06 matt Exp $	*/
 
 /*-
  * Copyright (C) 2000 Shuichiro URATA.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wired_map_machdep.c,v 1.5 2007/02/22 05:09:01 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wired_map_machdep.c,v 1.6 2009/12/16 23:19:06 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -169,7 +169,7 @@ arc_contiguously_wired_mapped(paddr_t pa, vsize_t size)
 vaddr_t
 arc_map_wired(paddr_t pa, vsize_t size)
 {
-	vaddr_t va;
+	u_long va;
 	vsize_t off;
 	int error;
 
@@ -183,7 +183,7 @@ arc_map_wired(paddr_t pa, vsize_t size)
 	    MIPS3_WIRED_ENTRY_SIZE(MIPS3_WIRED_SIZE) >
 	    MIPS3_NWIRED_ENTRY - mips3_nwired_page) {
 #ifdef DIAGNOSTIC
-		printf("arc_map_wired(0x%llx, 0x%lx): %d is not enough\n",
+		printf("arc_map_wired(0x%"PRIxPADDR", 0x%"PRIxVSIZE"): %d is not enough\n",
 		    pa + off, size - off,
 		    MIPS3_NWIRED_ENTRY - mips3_nwired_page);
 #endif
diff --git a/sys/arch/arc/include/elf_machdep.h b/sys/arch/arc/include/elf_machdep.h
index bf939fe252fa..c3815543f181 100644
--- a/sys/arch/arc/include/elf_machdep.h
+++ b/sys/arch/arc/include/elf_machdep.h
@@ -1,11 +1,3 @@
-/*	$NetBSD: elf_machdep.h,v 1.4 2000/01/31 15:51:35 soda Exp $	*/
+/*	$NetBSD: elf_machdep.h,v 1.5 2009/12/16 23:19:06 matt Exp $	*/
 
 #include <mips/elf_machdep.h>
-
-/*
- * arc is mipsel platform
- */
-
-#define ELF32_MACHDEP_ENDIANNESS	ELFDATA2LSB
-
-#define ELF64_MACHDEP_ENDIANNESS	XXX	/* break compilation */
diff --git a/sys/arch/arc/include/vmparam.h b/sys/arch/arc/include/vmparam.h
index d7e055de9e38..eb0523817b48 100644
--- a/sys/arch/arc/include/vmparam.h
+++ b/sys/arch/arc/include/vmparam.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: vmparam.h,v 1.9 2005/12/11 12:16:39 christos Exp $	*/
+/*	$NetBSD: vmparam.h,v 1.10 2009/12/16 23:19:06 matt Exp $	*/
 /*	$OpenBSD: vmparam.h,v 1.3 1997/04/19 17:19:59 pefo Exp $	*/
 /*	NetBSD: vmparam.h,v 1.5 1994/10/26 21:10:10 cgd Exp 	*/
 
@@ -14,11 +14,9 @@
 /*
  * Maximum number of contigous physical memory segment.
  */
+#undef	VM_PHYSSEG_MAX
 #define	VM_PHYSSEG_MAX		16
 
-#define	VM_NFREELIST		1
-#define	VM_FREELIST_DEFAULT	0
-
 #ifndef KSEG2IOBUFSIZE
 #define KSEG2IOBUFSIZE	kseg2iobufsize	/* reserve PTEs for KSEG2 I/O space */
 
diff --git a/sys/arch/arc/isa/isabus.c b/sys/arch/arc/isa/isabus.c
index 0321ab8b628a..262be75d1efa 100644
--- a/sys/arch/arc/isa/isabus.c
+++ b/sys/arch/arc/isa/isabus.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: isabus.c,v 1.46 2009/11/27 03:23:04 rmind Exp $	*/
+/*	$NetBSD: isabus.c,v 1.47 2009/12/16 23:19:07 matt Exp $	*/
 /*	$OpenBSD: isabus.c,v 1.15 1998/03/16 09:38:46 pefo Exp $	*/
 /*	NetBSD: isa.c,v 1.33 1995/06/28 04:30:51 cgd Exp 	*/
 
@@ -120,7 +120,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isabus.c,v 1.46 2009/11/27 03:23:04 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isabus.c,v 1.47 2009/12/16 23:19:07 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -216,7 +216,7 @@ isabrprint(void *aux, const char *pnp)
 
         if (pnp)
                 aprint_normal("isa at %s", pnp);
-        aprint_verbose(" isa_io_base 0x%lx isa_mem_base 0x%lx",
+        aprint_verbose(" isa_io_base 0x%"PRIxVADDR" isa_mem_base 0x%"PRIxVADDR,
 	    arc_bus_io.bs_vbase, arc_bus_mem.bs_vbase);
         return UNCONF;
 }
diff --git a/sys/arch/hpcmips/hpcmips/machdep.c b/sys/arch/hpcmips/hpcmips/machdep.c
index bc16b52a7797..e52b11f55945 100644
--- a/sys/arch/hpcmips/hpcmips/machdep.c
+++ b/sys/arch/hpcmips/hpcmips/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.106 2009/12/14 00:46:04 matt Exp $	*/
+/*	$NetBSD: machdep.c,v 1.107 2009/12/16 23:19:07 matt Exp $	*/
 
 /*-
  * Copyright (c) 1999 Shin Takemura, All rights reserved.
@@ -108,7 +108,7 @@
  */
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.106 2009/12/14 00:46:04 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.107 2009/12/16 23:19:07 matt Exp $");
 
 #include "opt_vr41xx.h"
 #include "opt_tx39xx.h"
@@ -263,7 +263,6 @@ mach_init(int argc, char *argv[], struct bootinfo *bi)
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	extern void *esym;
 #endif
-	struct pcb *pcb0;
 	void *kernend;
 	char *cp;
 	int i;
diff --git a/sys/arch/mipsco/mipsco/machdep.c b/sys/arch/mipsco/mipsco/machdep.c
index 3c2b7af7d5fe..c4bf68577263 100644
--- a/sys/arch/mipsco/mipsco/machdep.c
+++ b/sys/arch/mipsco/mipsco/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.69 2009/11/27 03:23:11 rmind Exp $	*/
+/*	$NetBSD: machdep.c,v 1.70 2009/12/16 23:19:07 matt Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -76,7 +76,7 @@
 
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.69 2009/11/27 03:23:11 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.70 2009/12/16 23:19:07 matt Exp $");
 
 /* from: Utah Hdr: machdep.c 1.63 91/04/24 */
 
@@ -229,9 +229,7 @@ void
 mach_init(int argc, char *argv[], char *envp[], u_int bim, char *bip)
 {
 	u_long first, last;
-	struct pcb *pcb0;
 	char *kernend;
-	vaddr_t v;
 	char *cp;
 	int i, howto;
 	extern char edata[], end[];
@@ -370,13 +368,7 @@ mach_init(int argc, char *argv[], char *envp[], u_int bim, char *bip)
 	/*
 	 * Allocate uarea page for lwp0 and set it.
 	 */
-	v = uvm_pageboot_alloc(USPACE);
-	uvm_lwp_setuarea(&lwp0, v);
-
-	pcb0 = lwp_getpcb(&lwp0);
-	pcb0->pcb_context[11] = MIPS_INT_MASK | MIPS_SR_INT_IE; /* SR */
-
-	lwp0.l_md.md_regs = (struct frame *)(v + USPACE) - 1;
+	mips_init_lwp0_uarea();
 
 	/*
 	 * Set up interrupt handling and I/O addresses.
diff --git a/sys/arch/newsmips/stand/boot/Makefile b/sys/arch/newsmips/stand/boot/Makefile
index 2c473b1ff564..e4963421e22c 100644
--- a/sys/arch/newsmips/stand/boot/Makefile
+++ b/sys/arch/newsmips/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.20 2009/04/15 17:15:13 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.21 2009/12/16 23:19:07 matt Exp $
 
 S!= cd ${.CURDIR}/../../../..; pwd
 
@@ -25,6 +25,7 @@ CPPFLAGS+= -DSUN_BOOTPARAMS
 CPPFLAGS+= -D_STANDALONE #-DBOOT_DEBUG
 CPPFLAGS+= -I${.CURDIR} -I. -I${S}
 CPPFLAGS+= -D__daddr_t=int32_t
+CPPFLAGS+= -DMIPS_KSEG1_START=0xa0000000
 
 AFLAGS= -D_LOCORE -mno-abicalls
 
diff --git a/sys/arch/sgimips/sgimips/machdep.c b/sys/arch/sgimips/sgimips/machdep.c
index 5de119d7daf2..b5144611c108 100644
--- a/sys/arch/sgimips/sgimips/machdep.c
+++ b/sys/arch/sgimips/sgimips/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.131 2009/12/14 00:46:14 matt Exp $	*/
+/*	$NetBSD: machdep.c,v 1.132 2009/12/16 23:19:07 matt Exp $	*/
 
 /*
  * Copyright (c) 2000 Soren S. Jorvang
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.131 2009/12/14 00:46:14 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.132 2009/12/16 23:19:07 matt Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -283,10 +283,9 @@ mach_init(int argc, char *argv[], uintptr_t magic, void *bip)
 	int firstpfn, lastpfn;
 	vsize_t size;
 	struct arcbios_mem *mem;
-	struct pcb *pcb0;
 	const char *cpufreq, *osload;
 	char *bootpath = NULL;
-	vaddr_t kernend, v;
+	vaddr_t kernend;
 	int kernstartpfn, kernendpfn;
 	int i, rv;
 #if NKSYMS > 0 || defined(DDB) || defined(MODULAR)