 @@ -1,14 +1,14 @@
-/*	$NetBSD: at91bus.c,v 1.13 2012/07/30 23:35:27 matt Exp $	*/
+/*	$NetBSD: at91bus.c,v 1.14 2012/09/01 14:48:06 matt Exp $	*/
 /*
  * Copyright (c) 2007 Embedtronics Oy
  * 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.
 @@ -17,32 +17,41 @@
  * ``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 FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.13 2012/07/30 23:35:27 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.14 2012/09/01 14:48:06 matt Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
 /* Define various stack sizes in pages */
 #define IRQ_STACK_SIZE	8
 #define ABT_STACK_SIZE	8
 #ifdef IPKDB
 #define UND_STACK_SIZE	16
 #else
 #define UND_STACK_SIZE	8
 #endif
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/exec.h>
 #include <sys/proc.h>
 #include <sys/msgbuf.h>
 #include <sys/reboot.h>
 #include <sys/termios.h>
 #include <sys/ksyms.h>
 #include <machine/bootconfig.h>
 #include <uvm/uvm_extern.h>
 @@ -81,35 +90,26 @@ __KERNEL_RCSID(0, "$NetBSD: at91bus.c,v
 int cnspeed = CONSPEED;
 int cnmode = CONMODE;
 /* kernel mapping: */
 #define	KERNEL_BASE_PHYS	0x20200000
 #define	KERNEL_TEXT_BASE	(KERNEL_BASE + 0x00200000)
 #define	KERNEL_VM_BASE		(KERNEL_BASE + 0x01000000)
 #define	KERNEL_VM_SIZE		0x0C000000
 /* Define various stack sizes in pages */
 #define IRQ_STACK_SIZE	8
 #define ABT_STACK_SIZE	8
 #ifdef IPKDB
 #define UND_STACK_SIZE	16
 #else
 #define UND_STACK_SIZE	8
 #endif
 /* boot configuration: */
 vm_offset_t physical_start;
 vm_offset_t physical_freestart;
 vm_offset_t physical_freeend;
 vm_offset_t physical_freeend_low;
 vm_offset_t physical_end;
 u_int free_pages;
 vm_offset_t msgbufphys;
 //static struct arm32_dma_range dma_ranges[4];
 #ifdef PMAP_DEBUG

 @@ -1,14 +1,14 @@
-/*	$NetBSD: sa11x0_irqhandler.c,v 1.17 2010/12/20 00:25:29 matt Exp $	*/
+/*	$NetBSD: sa11x0_irqhandler.c,v 1.18 2012/09/01 14:48:05 matt Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to the NetBSD Foundation
  * by IWAMOTO Toshihiro.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum and by Jason R. Thorpe of the Numerical Aerospace
  * Simulation Facility, NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -59,43 +59,44 @@
  * 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.
+ *
  *	@(#)isa.c	7.2 (Berkeley) 5/13/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sa11x0_irqhandler.c,v 1.17 2010/12/20 00:25:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sa11x0_irqhandler.c,v 1.18 2012/09/01 14:48:05 matt Exp $");
 #include "opt_irqstats.h"
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/syslog.h>
 #include <sys/cpu.h>
 #include <sys/intr.h>
 #include <sys/malloc.h>
 #include <uvm/uvm_extern.h>
 #include <arm/arm32/machdep.h>
 #include <arm/sa11x0/sa11x0_reg.h>
 #include <arm/sa11x0/sa11x0_var.h>
 #include <machine/intr.h>
 #include <machine/cpu.h>
 irqhandler_t *irqhandlers[NIRQS];
 u_int actual_mask;
 u_int irqmasks[NIPL];
 static int fakeintr(void *);
 #ifdef INTR_DEBUG
 static int dumpirqhandlers(void);
 #endif
 void intr_calculatemasks(void);
 const struct evcnt *sa11x0_intr_evcnt(sa11x0_chipset_tag_t, int);
 void stray_irqhandler(void *);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: autoconf.c,v 1.20 2012/07/29 18:05:43 mlelstv Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.21 2012/09/01 14:48:05 matt Exp $	*/
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * 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
 @@ -26,43 +26,46 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.20 2012/07/29 18:05:43 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.21 2012/09/01 14:48:05 matt Exp $");
 #include "opt_md.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/reboot.h>
 #include <sys/disklabel.h>
 #include <sys/device.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
 #include <sys/intr.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/reboot.h>
 #include <uvm/uvm_extern.h>
 #include <arm/arm32/machdep.h>
 #include <machine/bootconfig.h>
 #include <machine/config_hook.h>
 #include <machine/intr.h>
 #include <arm/arm32/machdep.h>
 #include "opt_cputypes.h"
 #if defined(CPU_SA1100) || defined(CPU_SA1110)
 #include "sacom.h"
 #endif
 extern dev_t dumpdev;
 void dumpconf(void);
 void isa_intr_init(void);
 #ifndef MEMORY_DISK_IS_ROOT
 static void get_device(const char *);