 @@ -1,14 +1,14 @@
-/*	$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 $	*/
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department, The Mach Operating System project at
  * Carnegie-Mellon University and Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
 @@ -68,27 +68,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	from: @(#)machdep.c	8.3 (Berkeley) 1/12/94
  */
 /* 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"
 #include "opt_ddbparam.h"
 #include "opt_md.h"
 #include "opt_modular.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 @@ -221,28 +221,26 @@ extern char kernel_text[], edata[], end[
 /*
  * Do all the stuff that locore normally does before calling main().
  * Process arguments passed to us by the BIOS.
  * Reset mapping and set up mapping to hardware and init "wired" reg.
  * Return the first page address following the system.
  */
 void
 mach_init(int argc, char *argv[], u_int bim, void *bip)
+{
 	const char *cp;
 	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;
 	struct btinfo_symtab *bi_syms;
 #endif
 	/* set up bootinfo structures */
 	if (bim == BOOTINFO_MAGIC && bip != NULL) {
 		struct btinfo_magic *bi_magic;
 		memcpy(bi_buf, bip, BOOTINFO_SIZE);
 		bootinfo = bi_buf;
 		bi_magic = lookup_bootinfo(BTINFO_MAGIC);
 @@ -481,33 +479,28 @@ mach_init(int argc, char *argv[], u_int
 	/*
 	 * Initialize error message buffer (at end of core).
 	 */
 	mips_init_msgbuf();
 	/*
 	 * Initialize the virtual memory system.
 	 */
 	pmap_bootstrap();
 	/*
 	 * Allocate uarea page for lwp0 and set it.
 	 */
-	v = uvm_pageboot_alloc(USPACE);
+	mips_init_lwp0_uarea();
 	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;
+}
 void
 mips_machdep_cache_config(void)
+{
 	mips_sdcache_size = arc_cpu_l2cache_size;
+}
 /*
  * Return a pointer to the given environment variable.
  */
 const char *

 @@ -1,14 +1,14 @@
-/*	$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.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
 @@ -17,27 +17,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__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>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <uvm/uvm_extern.h>
 #include <machine/cpu.h>
 #include <machine/wired_map.h>
 #include <machine/vmparam.h>
 #include <mips/locore.h>
 #include <mips/pte.h>
 @@ -159,41 +159,41 @@ arc_contiguously_wired_mapped(paddr_t pa
 		size -= vsize;
 		if (size <= 0)
 			break;
 		if (!arc_wired_map_vaddr_entry(va, &p, &vsize) || p != pa)
 			return 0; /* not contiguously wired mapped */
+	}
 	return rva + offset;
+}
 /* Allocate new wired entries */
 vaddr_t
 arc_map_wired(paddr_t pa, vsize_t size)
+{
-	vaddr_t va;
+	u_long va;
 	vsize_t off;
 	int error;
 	/* XXX: may be already partially wired mapped */
 	off = pa & MIPS3_WIRED_OFFMASK;
 	pa &= ~(paddr_t)MIPS3_WIRED_OFFMASK;
 	size += off;
 	if ((size + MIPS3_WIRED_ENTRY_SIZE(MIPS3_WIRED_SIZE) - 1) /
 	    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
 		return 0; /* free wired TLB is not enough */
+	}
 	error = extent_alloc(arc_wired_map_ex, size, MIPS3_WIRED_SIZE,
 , EX_NOWAIT, &va);
 	if (error) {
 #ifdef DIAGNOSTIC
 		printf("arc_map_wired: can't allocate region\n");
 #endif
 		return 0;

 @@ -1,26 +1,24 @@
-/*	$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 	*/
 #include <mips/vmparam.h>
 /* VA 0xe0000000-0xffffffff is used for wired_map TLB entries. */
 #undef  VM_MAX_KERNEL_ADDRESS
 #define VM_MAX_KERNEL_ADDRESS		((vaddr_t)0xDFFFF000)
 #define VM_MIN_WIRED_MAP_ADDRESS	((vaddr_t)0xE0000000)
 #define VM_MAX_WIRED_MAP_ADDRESS	((vaddr_t)0xFFFFC000)
 /*
  * 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 */
 extern vsize_t kseg2iobufsize;
 #endif

 @@ -1,14 +1,14 @@
-/*	$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 	*/
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * William Jolitz and Don Ahn.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -110,27 +110,27 @@ appear in supporting documentation, and
 not be used in advertising or publicity pertaining to distribution
 of the software without specific, written prior permission.
 INTEL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE
 INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
 IN NO EVENT SHALL INTEL BE LIABLE FOR ANY SPECIAL, INDIRECT, OR
 CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
 LOSS OF USE, DATA OR PROFITS, WHETHER IN ACTION OF CONTRACT,
 NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
 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>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/extent.h>
 #include <uvm/uvm_extern.h>
 @@ -206,27 +206,27 @@ isabrattach(struct isabr_softc *sc)
 	iba.iba_iot = &arc_bus_io;
 	iba.iba_memt = &arc_bus_mem;
 	iba.iba_dmat = &sc->sc_dmat;
 	iba.iba_ic = &sc->arc_isa_cs;
 	config_found_ia(sc->sc_dev, "isabus", &iba, isabrprint);
+}
 static int
 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;
+}
 /*
  *	Interrupt system driver code
  *	============================
  */
 #define LEGAL_IRQ(x)    ((x) >= 0 && (x) < ICU_LEN && (x) != 2)
 int	imen;
 int	intrtype[ICU_LEN], intrmask[ICU_LEN], intrlevel[ICU_LEN];

 @@ -1,14 +1,14 @@
-/*	$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.
  * Copyright (c) 1999-2001 SATO Kazumi, All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -98,27 +98,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  * from: Utah Hdr: machdep.c 1.63 91/04/24
+ *
  *	@(#)machdep.c	8.3 (Berkeley) 1/12/94
  */
 #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"
 #include "opt_boot_standalone.h"
 #include "opt_modular.h"
 #include "opt_spec_platform.h"
 #include "biconsdev.h"
 #include "fs_mfs.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_rtc_offset.h"
 #include "fs_nfs.h"
 #include "opt_kloader.h"
 @@ -253,27 +253,26 @@ mach_init(int argc, char *argv[], struct
+{
 	/*
 	 * this routines stack is never polluted since stack pointer
 	 * is lower than kernel text segment, and at exiting, stack pointer
 	 * is changed to proc0.
 	 */
 #ifdef KLOADER
 	struct kloader_bootinfo kbi;
 #endif
 	extern char edata[], end[];
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	extern void *esym;
 #endif
 	struct pcb *pcb0;
 	void *kernend;
 	char *cp;
 	int i;
 	/* clear the BSS segment */
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	size_t symbolsz = 0;
 	Elf_Ehdr *eh = (void *)end;
 	if (memcmp(eh->e_ident, ELFMAG, SELFMAG) == 0 &&
 	    eh->e_ident[EI_CLASS] == ELFCLASS) {
 		esym = end;
 #ifndef NO_SYMBOLSZ_ENTRY
 		if (eh->e_entry != 0) {

 @@ -1,14 +1,14 @@
-/*	$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
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department, The Mach Operating System project at
  * Carnegie-Mellon University and Ralph Campbell.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -66,27 +66,27 @@
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)machdep.c	8.3 (Berkeley) 1/12/94
  */
 #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 */
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_modular.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 @@ -219,29 +219,27 @@ struct consdev consdev_prom = {
         null_cnpollc,
 };
 /*
  * Do all the stuff that locore normally does before calling main().
  * Process arguments passed to us by the prom monitor.
  * Return the first page address following the system.
  */
 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[];
 	const char *bi_msg;
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	int nsym = 0;
 	char *ssym = 0;
 	char *esym = 0;
 	struct btinfo_symtab *bi_syms;
 #endif
 	/* Check for valid bootinfo passed from bootstrap */
 @@ -360,33 +358,27 @@ mach_init(int argc, char *argv[], char *
 	/*
 	 * Initialize error message buffer (at end of core).
 	 */
 	mips_init_msgbuf();
 	/*
 	 * Initialize the virtual memory system.
 	 */
 	pmap_bootstrap();
 	/*
 	 * Allocate uarea page for lwp0 and set it.
 	 */
-	v = uvm_pageboot_alloc(USPACE);
+	mips_init_lwp0_uarea();
 	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;
 	/*
 	 * Set up interrupt handling and I/O addresses.
 	 */
 	pizazz_init();
+}
 /*
  * cpu_startup: allocate memory for variable-sized tables,
  * initialize CPU, and do autoconfiguration.
  */

 @@ -1,40 +1,41 @@
-#	$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
 PROG= boot
 SRCS= locore.S boot.c bootinfo.c devopen.c net.c netif_news.c
 NOMAN= # defined
 STRIPFLAG=
 BINMODE= 444
 WARNS?= 1
 .include <bsd.own.mk>
 COMMON!=  cd ${.CURDIR}/../common && ${PRINTOBJDIR}
 CLEANFILES+= ${PROG}.elf ${PROG}.tmp
 LINKFLAGS= -x -N -Ttext a0700000 -e _start
 LINKFLAGS+= -T ${S}/arch/mips/conf/stand.ldscript
 CFLAGS= -Os -ffreestanding -mmemcpy -mno-abicalls -msoft-float -G 0
 CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
 CPPFLAGS+= -DSUPPORT_USTARFS -DHAVE_CHANGEDISK_HOOK
 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
 LIBS = ${COMMON}/romcalls.o
 LIBS+= ${COMMON}/lib/sa/libsa.a
 LIBS+= ${COMMON}/lib/z/libz.a
 LIBS+= ${COMMON}/lib/kern/libkern.a
 ${PROG}: ${OBJS}
 	${_MKTARGET_LINK}
 	${LD} ${LINKFLAGS} -o ${PROG}.elf ${OBJS} ${LIBS}
 	-${SIZE} ${PROG}.elf
 	${OBJCOPY} -O binary ${PROG}.elf ${PROG}

 @@ -1,14 +1,14 @@
-/*	$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
  * Copyright (c) 2001, 2002, 2003 Rafal K. Boni
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -24,27 +24,27 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__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"
 #include "opt_execfmt.h"
 #include "opt_cputype.h"
 #include "opt_mips_cache.h"
 #include "opt_modular.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 @@ -273,30 +273,29 @@ static const char *bootinfo_msg = NULL;
 #define ARCS_VECTOR MIPS_PHYS_TO_KSEG0(0x00001000)
 /*
  * Do all the stuff that locore normally does before calling main().
  * Process arguments passed to us by the ARCS firmware.
  */
 void
 mach_init(int argc, char *argv[], uintptr_t magic, void *bip)
+{
 	paddr_t first, last;
 	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)
 	int nsym = 0;
 	char *ssym = NULL;
 	char *esym = NULL;
 	struct btinfo_symtab *bi_syms;
 #endif
 	/*
 	 * Initialize firmware.  This will set up the bootstrap console.
 	 * At this point we do not yet know the machine type, so we
 	 * try to init real arcbios, and if that fails (return value 1),

 @@ -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 */