 @@ -1,14 +1,14 @@
-/*	$NetBSD: evbppc_machdep.c,v 1.9 2009/11/07 07:27:43 cegger Exp $	*/
+/*	$NetBSD: evbppc_machdep.c,v 1.10 2011/06/12 03:42:41 mrg Exp $	*/
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Eduardo Horvath and Simon Burge for Wasabi Systems, Inc.
+ *
  * 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
 @@ -57,39 +57,45 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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: evbppc_machdep.c,v 1.9 2009/11/07 07:27:43 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: evbppc_machdep.c,v 1.10 2011/06/12 03:42:41 mrg Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mount.h>
 #include <sys/vnode.h>
 #include <uvm/uvm_extern.h>
 #include <machine/cpu.h>
 #include <machine/bus.h>
 #include <machine/pmap.h>
 /*
  * ibm4xx/booke kernels need to set module_machine to this for modules to work.
  */
 char module_machine_ibm4xx[] = "powerpc-ibm4xx";
 char module_machine_booke[] = "powerpc-booke";
 int fake_mapiodev = 1;
 /*
  * mapiodev:
+ *
  * 	Allocate vm space and mapin the I/O address. Use reserved TLB
  * 	mapping if one is found.
  */
 void *
 mapiodev(paddr_t pa, psize_t len)
+{
 	void *p;
 	paddr_t faddr;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.32 2011/01/14 02:06:25 rmind Exp $	*/
+/*	$NetBSD: machdep.c,v 1.33 2011/06/12 03:42:41 mrg Exp $	*/
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Juergen Hannken-Illjes.
+ *
  * 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.
 @@ -20,42 +20,43 @@
  * ``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: machdep.c,v 1.32 2011/01/14 02:06:25 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.33 2011/06/12 03:42:41 mrg Exp $");
 #include "opt_explora.h"
 #include "opt_modular.h"
 #include "ksyms.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/msgbuf.h>
 #include <sys/kernel.h>
 #include <sys/mount.h>
 #include <sys/proc.h>
 #include <sys/reboot.h>
 #include <sys/ksyms.h>
 #include <sys/device.h>
 #include <sys/module.h>
 #include <uvm/uvm_extern.h>
 #include <prop/proplib.h>
 #include <machine/explora.h>
 #include <machine/bus.h>
 #include <machine/powerpc.h>
 #include <machine/tlb.h>
 #include <machine/pcb.h>
 #include <machine/trap.h>
 #include <powerpc/spr.h>
 @@ -334,26 +335,31 @@ cpu_startup(void)
 	KASSERT(pn != NULL);
 	if (prop_dictionary_set(board_properties, "mem-size", pn) == false)
 		panic("setting mem-size");
 	prop_object_release(pn);
 	pn = prop_number_create_integer(cpuspeed);
 	KASSERT(pn != NULL);
 	if (prop_dictionary_set(board_properties, "processor-frequency",
 				pn) == false)
 		panic("setting processor-frequency");
 	prop_object_release(pn);
 	intr_init();
 	/*
 	 * Look for the ibm4xx modules in the right place.
 	 */
 	module_machine = module_machine_ibm4xx;
+}
 int
 lcsplx(int ipl)
+{
 	return spllower(ipl);	/*XXX*/
+}
 void
 cpu_reboot(int howto, char *what)
+{
 	static int syncing = 0;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu.h,v 1.4 2005/12/11 12:17:12 christos Exp $	*/
+/*	$NetBSD: cpu.h,v 1.5 2011/06/12 03:42:41 mrg Exp $	*/
 /*
  * Copyright 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Eduardo Horvath for Wasabi Systems, Inc.
+ *
  * 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
 @@ -47,14 +47,17 @@
 #include <powerpc/ibm4xx/cpu.h>
 #ifdef _KERNEL
 extern int fake_mapiodev;
 #endif
 #else
 #ifdef MULTIPROCESSOR
 #define CPU_MAXNUM 2
 #else
 #define CPU_MAXNUM 1
 #endif
 #include <powerpc/cpu.h>
 #endif
 extern char module_machine_booke[];
 extern char module_machine_ibm4xx[];
 #endif	/* _MACHINE_CPU_H_ */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.7 2011/06/05 16:52:23 matt Exp $	*/
+/*	$NetBSD: machdep.c,v 1.8 2011/06/12 03:42:41 mrg Exp $	*/
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Raytheon BBN Technologies Corp and Defense Advanced Research Projects
  * Agency and which was developed by Matt Thomas of 3am Software Foundry.
+ *
  * This material is based upon work supported by the Defense Advanced Research
  * Projects Agency and Space and Naval Warfare Systems Center, Pacific, under
  * Contract No. N66001-09-C-2073.
  * Approved for Public Release, Distribution Unlimited
+ *
 @@ -50,26 +50,27 @@ __KERNEL_RCSID(0, "$NetSBD$");
 #define	L2CACHE_PRIVATE
 #define _POWERPC_BUS_DMA_PRIVATE
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/intr.h>
 #include <sys/msgbuf.h>
 #include <sys/tty.h>
 #include <sys/kcore.h>
 #include <sys/bitops.h>
 #include <sys/bus.h>
 #include <sys/extent.h>
 #include <sys/malloc.h>
 #include <sys/module.h>
 #include <uvm/uvm_extern.h>
 #include <prop/proplib.h>
 #include <machine/stdarg.h>
 #include <dev/cons.h>
 #include <dev/ic/comreg.h>
 #include <dev/ic/comvar.h>
 #include <net/if.h>
 @@ -917,26 +918,31 @@ initppc(vaddr_t startkernel, vaddr_t end
 	/*
 	 * Set some more MD helpers
 	 */
 	cpu_md_ops.md_cpunode_locs = mpc8548_cpunode_locs;
 	cpu_md_ops.md_device_register = e500_device_register;
 	cpu_md_ops.md_cpu_attach = e500_cpu_attach;
 	cpu_md_ops.md_cpu_reset = e500_cpu_reset;
 #if NGPIO > 0
 	cpu_md_ops.md_cpunode_attach = pq3gpio_attach;
 #endif
 		printf(" initppc done!\n");
 	/*
 	 * Look for the Book-E modules in the right place.
 	 */
 	module_machine = module_machine_booke;
+}
 #ifdef MPC8548
 static const char * const mpc8548cds_extirq_names[] = {
 	[0] = "pci inta",
 	[1] = "pci intb",
 	[2] = "pci intc",
 	[3] = "pci intd",
 	[4] = "irq4",
 	[5] = "gige phy",
 	[6] = "atm phy",
 	[7] = "cpld",
 	[8] = "irq8",

 @@ -1,14 +1,14 @@
-/*	$NetBSD: obs200_machdep.c,v 1.14 2011/04/04 20:37:50 dyoung Exp $	*/
+/*	$NetBSD: obs200_machdep.c,v 1.15 2011/06/12 03:42:41 mrg Exp $	*/
 /*	Original: machdep.c,v 1.3 2005/01/17 17:24:09 shige Exp	*/
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Eduardo Horvath and Simon Burge for Wasabi Systems, Inc.
+ *
  * 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.
 @@ -58,40 +58,41 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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: obs200_machdep.c,v 1.14 2011/04/04 20:37:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs200_machdep.c,v 1.15 2011/06/12 03:42:41 mrg Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include "opt_ipkdb.h"
 #include "opt_modular.h"
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/ksyms.h>
 #include <sys/mount.h>
 #include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/module.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/obs200.h>
 #include <machine/century_bios.h>
 #include <powerpc/spr.h>
 #include <powerpc/ibm4xx/spr.h>
 #include <powerpc/ibm4xx/dcr4xx.h>
 #include <powerpc/ibm4xx/ibm405gp.h>
 #include <powerpc/ibm4xx/dev/comopbvar.h>
 @@ -184,26 +185,31 @@ initppc(u_int startkernel, u_int endkern
 #endif
 #ifdef DDB
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 #ifdef IPKDB
 	/*
 	 * Now trap to IPKDB
 	 */
 	ipkdb_init();
 	if (boothowto & RB_KDB)
 		ipkdb_connect(0);
 #endif
 	/*
 	 * Look for the ibm4xx modules in the right place.
 	 */
 	module_machine = module_machine_ibm4xx;
+}
 void
 consinit(void)
+{
 #if (NCOM > 0)
 	com_opb_cnattach(OBS200_COM_FREQ, CONADDR, CONSPEED, CONMODE);
 #endif
+}
 int
 lcsplx(int ipl)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: obs266_machdep.c,v 1.15 2011/04/04 20:37:50 dyoung Exp $	*/
+/*	$NetBSD: obs266_machdep.c,v 1.16 2011/06/12 03:42:41 mrg Exp $	*/
 /*	Original: md_machdep.c,v 1.3 2005/01/24 18:47:37 shige Exp $	*/
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Eduardo Horvath and Simon Burge for Wasabi Systems, Inc.
+ *
  * 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.
 @@ -58,40 +58,41 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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: obs266_machdep.c,v 1.15 2011/04/04 20:37:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs266_machdep.c,v 1.16 2011/06/12 03:42:41 mrg Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include "opt_ipkdb.h"
 #include "opt_modular.h"
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/ksyms.h>
 #include <sys/mount.h>
 #include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/module.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/obs266.h>
 #include <powerpc/spr.h>
 #include <powerpc/ibm4xx/dcr4xx.h>
 #include <powerpc/ibm4xx/dev/comopbvar.h>
 #include <powerpc/ibm4xx/ibm405gp.h>
 #include <powerpc/ibm4xx/openbios.h>
 #include <powerpc/ibm4xx/spr.h>
 @@ -175,26 +176,31 @@ initppc(u_int startkernel, u_int endkern
 #endif
 #ifdef DDB
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 #ifdef IPKDB
 	/*
 	 * Now trap to IPKDB
 	 */
 	ipkdb_init();
 	if (boothowto & RB_KDB)
 		ipkdb_connect(0);
 #endif
 	/*
 	 * Look for the ibm4xx modules in the right place.
 	 */
 	module_machine = module_machine_ibm4xx;
+}
 void
 consinit(void)
+{
 #if (NCOM > 0)
 	com_opb_cnattach(OBS266_COM_FREQ, CONADDR, CONSPEED, CONMODE);
 #endif
+}
 int
 lcsplx(int ipl)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: obs600_machdep.c,v 1.3 2011/02/25 10:18:09 kiyohara Exp $	*/
+/*	$NetBSD: obs600_machdep.c,v 1.4 2011/06/12 03:42:41 mrg Exp $	*/
 /*	Original: md_machdep.c,v 1.3 2005/01/24 18:47:37 shige Exp $	*/
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Eduardo Horvath and Simon Burge for Wasabi Systems, Inc.
+ *
  * 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.
 @@ -58,42 +58,43 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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: obs600_machdep.c,v 1.3 2011/02/25 10:18:09 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs600_machdep.c,v 1.4 2011/06/12 03:42:41 mrg Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include "opt_ipkdb.h"
 #include "opt_modular.h"
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/errno.h>
 #include <sys/kernel.h>
 #include <sys/ksyms.h>
 #include <sys/mount.h>
 #include <sys/reboot.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/module.h>
 #include <uvm/uvm_extern.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/obs600.h>
 #include <powerpc/ibm4xx/amcc405ex.h>
 #include <powerpc/ibm4xx/dcr4xx.h>
 #include <powerpc/ibm4xx/dev/comopbvar.h>
 #include <powerpc/ibm4xx/dev/gpiicreg.h>
 #include <powerpc/ibm4xx/dev/opbvar.h>
 #include <powerpc/ibm4xx/spr.h>
 @@ -187,26 +188,31 @@ initppc(u_int startkernel, u_int endkern
 #endif
 #ifdef DDB
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 #ifdef IPKDB
 	/*
 	 * Now trap to IPKDB
 	 */
 	ipkdb_init();
 	if (boothowto & RB_KDB)
 		ipkdb_connect(0);
 #endif
 	/*
 	 * Look for the ibm4xx modules in the right place.
 	 */
 	module_machine = module_machine_ibm4xx;
+}
 void
 consinit(void)
+{
 #if (NCOM > 0)
 	com_opb_cnattach(OBS600_COM_FREQ, CONADDR, CONSPEED, CONMODE);
 #endif /* NCOM */
+}
 int
 lcsplx(int ipl)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.15 2011/01/17 07:32:54 matt Exp $ */
+/*	$NetBSD: machdep.c,v 1.16 2011/06/12 03:42:41 mrg Exp $ */
 /*
  * Copyright (c) 2006 Jachym Holecek
  * All rights reserved.
+ *
  * Written for DFC Design, s.r.o.
+ *
  * 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.
 @@ -24,51 +24,52 @@
  * 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.
  */
 /*
  * Based on Walnut and Explora.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.15 2011/01/17 07:32:54 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.16 2011/06/12 03:42:41 mrg Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include "opt_ipkdb.h"
 #include "opt_modular.h"
 #include "opt_virtex.h"
 #include "opt_kgdb.h"
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/exec.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/mount.h>
 #include <sys/msgbuf.h>
 #include <sys/proc.h>
 #include <sys/reboot.h>
 #include <sys/syscallargs.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/boot_flag.h>
 #include <sys/ksyms.h>
 #include <sys/device.h>
 #include <sys/module.h>
 #include <uvm/uvm_extern.h>
 #include <net/netisr.h>
 #include <dev/cons.h>
 #include <machine/bus.h>
 #include <machine/powerpc.h>
 #include <machine/trap.h>
 #include <machine/pcb.h>
 #include <powerpc/spr.h>
 @@ -255,26 +256,31 @@ initppc(u_int startkernel, u_int endkern
 	/*
 	 * Now trap to IPKDB
 	 */
 	ipkdb_init();
 	if (boothowto & RB_KDB)
 		ipkdb_connect(0);
 #endif
 #ifdef KGDB
 	/*
 	 * Now trap to KGDB
 	 */
 	kgdb_connect(1);
 #endif /* KGDB */
 	/*
 	 * Look for the ibm4xx modules in the right place.
 	 */
 	module_machine = module_machine_ibm4xx;
+}
 /*
  * trapcpy:
+ *
  * 	Install a trap vector. We cannot use memcpy because the
  * 	destination may be zero. Borrowed from Explora.
  */
 static void
 trapcpy(int dest, void *src, size_t len)
+{
 	uint32_t 		*dest_p = (void *)dest;
 	uint32_t 		*src_p = src;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.48 2011/04/04 20:37:50 dyoung Exp $	*/
+/*	$NetBSD: machdep.c,v 1.49 2011/06/12 03:42:42 mrg Exp $	*/
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Eduardo Horvath and Simon Burge for Wasabi Systems, Inc.
+ *
  * 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
 @@ -57,49 +57,50 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``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 TOOLS GMBH 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.48 2011/04/04 20:37:50 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.49 2011/06/12 03:42:42 mrg Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include "opt_ipkdb.h"
 #include "opt_modular.h"
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/exec.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/mount.h>
 #include <sys/msgbuf.h>
 #include <sys/proc.h>
 #include <sys/reboot.h>
 #include <sys/syscallargs.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/boot_flag.h>
 #include <sys/ksyms.h>
 #include <sys/device.h>
 #include <sys/module.h>
 #include <uvm/uvm_extern.h>
 #include <net/netisr.h>
 #include <prop/proplib.h>
 #include <machine/bus.h>
 #include <machine/powerpc.h>
 #include <machine/trap.h>
 #include <machine/walnut.h>
 #include <machine/pcb.h>
 @@ -326,26 +327,31 @@ initppc(u_int startkernel, u_int endkern
 #endif
 #ifdef DDB
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 #ifdef IPKDB
 	/*
 	 * Now trap to IPKDB
 	 */
 	ipkdb_init();
 	if (boothowto & RB_KDB)
 		ipkdb_connect(0);
 #endif
 	/*
 	 * Look for the ibm4xx modules in the right place.
 	 */
 	module_machine = module_machine_ibm4xx;
+}
 static void
 install_extint(void (*handler)(void))
+{
 	extern int extint, extsize;
 	extern u_long extint_call;
 	u_long offset = (u_long)handler - (u_long)&extint_call;
 	int msr;
 #ifdef	DIAGNOSTIC
 	if (offset > 0x1ffffff)
 		panic("install_extint: too far away");