 @@ -1,14 +1,14 @@
-/* $NetBSD: cons_machdep.c,v 1.8 2008/11/12 12:35:54 ad Exp $ */
+/* $NetBSD: cons_machdep.c,v 1.9 2008/11/30 18:21:31 martin Exp $ */
 /*-
  * Copyright (c) 1998 Ben Harris
  * 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
 @@ -20,27 +20,27 @@
  * 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.
  */
 /*
  * cons_machdep.c -- machine dependent console routines
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cons_machdep.c,v 1.8 2008/11/12 12:35:54 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cons_machdep.c,v 1.9 2008/11/30 18:21:31 martin Exp $");
 #include <sys/param.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
 #include <sys/ksyms.h>
 #include <dev/cons.h>
 #include "arcvideo.h"
 #include "opt_ddb.h"
 #include "ksyms.h"
 #ifdef DDB
 @@ -57,18 +57,18 @@ extern void arccons_init __P((void));
 void
 consinit()
+{
 #if NARCVIDEO > 0
 	arccons_init();
 #endif
 /*       	cninit();*/
 #ifdef DDB
 	db_machine_init();
 #endif /* DDB */
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-	ksyms_init(bootconfig.esym - bootconfig.ssym,
+	ksyms_addsyms_elf(bootconfig.esym - bootconfig.ssym,
 		 (char*)MEMC_PHYS_BASE + bootconfig.ssym,
 		 (char*)MEMC_PHYS_BASE + bootconfig.esym);
 #endif
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rpc_machdep.c,v 1.73 2008/11/12 12:35:55 ad Exp $	*/
+/*	$NetBSD: rpc_machdep.c,v 1.74 2008/11/30 18:21:31 martin Exp $	*/
 /*
  * Copyright (c) 2000-2002 Reinoud Zandijk.
  * Copyright (c) 1994-1998 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * All rights reserved.
+ *
  * This code is derived from software written for Brini by Mark Brinicombe
+ *
  * 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
 @@ -44,27 +44,27 @@
  * This file still needs a lot of work
+ *
  * Created      : 17/09/94
  * Updated for yet another new bootloader 28/12/02
  */
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
 #include "vidcvideo.h"
 #include "podulebus.h"
 #include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.73 2008/11/12 12:35:55 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.74 2008/11/30 18:21:31 martin Exp $");
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/reboot.h>
 #include <sys/proc.h>
 #include <sys/msgbuf.h>
 #include <sys/exec.h>
 #include <sys/ksyms.h>
 #include <dev/cons.h>
 #include <machine/db_machdep.h>
 #include <ddb/db_sym.h>
 @@ -1034,27 +1034,27 @@ initarm(void *cookie)
 	 */
 	acorn32_i2c_tag = iomdiic_bootstrap_cookie();
 	if (cmos_read(RTC_ADDR_REBOOTCNT) > 0)
 		printf("Warning: REBOOTCNT = %d\n",
 		    cmos_read(RTC_ADDR_REBOOTCNT));
 #ifdef CPU_SA110
 	if (cputype == CPU_ID_SA110)
 		rpc_sa110_cc_setup();
 #endif	/* CPU_SA110 */
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-	ksyms_init(bootconfig.ksym_end - bootconfig.ksym_start,
+	ksyms_addsyms_elf(bootconfig.ksym_end - bootconfig.ksym_start,
 		(void *) bootconfig.ksym_start, (void *) bootconfig.ksym_end);
 #endif
 #ifdef DDB
 	db_machine_init();
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif	/* DDB */
 	/* We return the new stack pointer address */
 	return(kernelstack.pv_va + USPACE_SVC_STACK_TOP);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: eb7500atx_machdep.c,v 1.12 2008/11/23 11:55:27 chris Exp $	*/
+/*	$NetBSD: eb7500atx_machdep.c,v 1.13 2008/11/30 18:21:31 martin Exp $	*/
 /*
  * Copyright (c) 2000-2002 Reinoud Zandijk.
  * Copyright (c) 1994-1998 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * All rights reserved.
+ *
  * This code is derived from software written for Brini by Mark Brinicombe
+ *
  * 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
 @@ -44,27 +44,27 @@
  * This file still needs a lot of work
+ *
  * Created      : 17/09/94
  * Updated for yet another new bootloader 28/12/02
  */
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
 #include "vidcvideo.h"
 #include "pckbc.h"
 #include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.12 2008/11/23 11:55:27 chris Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.13 2008/11/30 18:21:31 martin Exp $");
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/reboot.h>
 #include <sys/proc.h>
 #include <sys/msgbuf.h>
 #include <sys/exec.h>
 #include <sys/ksyms.h>
 #include <dev/cons.h>
 #include <machine/db_machdep.h>
 #include <ddb/db_sym.h>
 @@ -945,27 +945,27 @@ initarm(void *cookie)
 	    bootconfig.dram[1].address,
 	    bootconfig.dram[1].pages * bootconfig.pagesize);
 	printf(" DRAM block 1a at %08x size %08x "
 	    "DRAM block 1b at %08x size %08x\n\r",
 	    bootconfig.dram[2].address,
 	    bootconfig.dram[2].pages * bootconfig.pagesize,
 	    bootconfig.dram[3].address,
 	    bootconfig.dram[3].pages * bootconfig.pagesize);
 	printf(" VRAM block 0  at %08x size %08x\n\r",
 	    bootconfig.vram[0].address,
 	    bootconfig.vram[0].pages * bootconfig.pagesize);
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-	ksyms_init(bootconfig.ksym_end - bootconfig.ksym_start,
+	ksyms_addsyms_elf(bootconfig.ksym_end - bootconfig.ksym_start,
 		(void *) bootconfig.ksym_start, (void *) bootconfig.ksym_end);
 #endif
 #ifdef DDB
 	db_machine_init();
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif	/* DDB */
 	/* We return the new stack pointer address */
 	return(kernelstack.pv_va + USPACE_SVC_STACK_TOP);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.40 2008/11/12 12:35:55 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.41 2008/11/30 18:21:32 martin Exp $	*/
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe.
+ *
  * 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.
 @@ -96,27 +96,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
  *	from: Utah Hdr: machdep.c 1.63 91/04/24
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.40 2008/11/12 12:35:55 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.41 2008/11/30 18:21:32 martin Exp $");
 #include "opt_algor_p4032.h"
 #include "opt_algor_p5064.h"
 #include "opt_algor_p6032.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_memsize.h"
 #include "opt_ethaddr.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 @@ -564,34 +564,26 @@ mach_init(int argc, char *argv[], char *
 	/*
 	 * Init mapping for u page(s) for lwp0.
 	 */
 	led_display('u', 's', 'p', 'c');
 	v = (void *) uvm_pageboot_alloc(USPACE);
 	lwp0.l_addr = proc0paddr = (struct user *) v;
 	lwp0.l_md.md_regs = (struct frame *)((char*)v + USPACE) - 1;
 	proc0paddr->u_pcb.pcb_context[11] =
 	    MIPS_INT_MASK | MIPS_SR_INT_IE; /* SR */
 	/*
 	 * Initialize debuggers, and break into them, if appropriate.
 	 */
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	/*
 	 * XXX Loader doesn't give us symbols the way we like.  Need
 	 * XXX dbsym(1) support for ELF.
 	 */
 	ksyms_init(0, 0, 0);
 #endif
 	if (boothowto & RB_KDB) {
 #if defined(DDB)
 		Debugger();
 #endif
+	}
+}
 void
 consinit(void)
+{
 	/*
 	 * Everything related to console initialization is done

 @@ -1,14 +1,14 @@
-/* $NetBSD: machdep.c,v 1.311 2008/11/25 15:51:34 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.312 2008/11/30 18:21:32 martin Exp $ */
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center and by Chris G. Demetriou.
+ *
  * 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
 @@ -57,27 +57,27 @@
  * rights to redistribute these changes.
  */
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_multiprocessor.h"
 #include "opt_dec_3000_300.h"
 #include "opt_dec_3000_500.h"
 #include "opt_compat_osf1.h"
 #include "opt_execfmt.h"
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.311 2008/11/25 15:51:34 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.312 2008/11/30 18:21:32 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
 #include <sys/cpu.h>
 #include <sys/proc.h>
 #include <sys/ras.h>
 #include <sys/sa.h>
 #include <sys/savar.h>
 #include <sys/sched.h>
 #include <sys/reboot.h>
 #include <sys/device.h>
 @@ -757,27 +757,27 @@ nobootinfo:
 	 */
 	for (i = 0; i < hwrpb->rpb_pcs_cnt; i++) {
 		struct pcs *pcsp;
 		pcsp = LOCATE_PCS(hwrpb, i);
 		if ((pcsp->pcs_flags & PCS_PP) != 0)
 			ncpus++;
+	}
 	/*
 	 * Initialize debuggers, and break into them if appropriate.
 	 */
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-	ksyms_init((int)((u_int64_t)ksym_end - (u_int64_t)ksym_start),
+	ksyms_addsyms_elf((int)((u_int64_t)ksym_end - (u_int64_t)ksym_start),
 	    ksym_start, ksym_end);
 #endif
 	if (boothowto & RB_KDB) {
 #if defined(KGDB)
 		kgdb_debug_init = 1;
 		kgdb_connect(1);
 #elif defined(DDB)
 		Debugger();
 #endif
+	}
 #ifdef DIAGNOSTIC

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.112 2008/11/19 18:35:58 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.113 2008/11/30 18:21:32 martin Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008
  *     The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * 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
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -102,27 +102,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)machdep.c	7.4 (Berkeley) 6/3/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.112 2008/11/19 18:35:58 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.113 2008/11/30 18:21:32 martin Exp $");
 /* #define XENDEBUG_LOW  */
 #include "opt_user_ldt.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_cpureset_delay.h"
 #include "opt_mtrr.h"
 #include "opt_realmem.h"
 #include "opt_xen.h"
 #ifndef XEN
 #include "opt_physmem.h"
 #endif
 @@ -1210,35 +1210,35 @@ init_x86_64_ksyms(void)
 	struct btinfo_symtab *symtab;
 	vaddr_t tssym, tesym;
 #endif
 #ifdef DDB
 	db_machine_init();
 #endif
 #ifndef XEN
 	symtab = lookup_bootinfo(BTINFO_SYMTAB);
 	if (symtab) {
 		tssym = (vaddr_t)symtab->ssym + KERNBASE;
 		tesym = (vaddr_t)symtab->esym + KERNBASE;
-		ksyms_init(symtab->nsym, (void *)tssym, (void *)tesym);
+		ksyms_addsyms_elf(symtab->nsym, (void *)tssym, (void *)tesym);
 	} else
-		ksyms_init(*(long *)(void *)&end,
+		ksyms_addsyms_elf(*(long *)(void *)&end,
 		    ((long *)(void *)&end) + 1, esym);
 #else  /* XEN */
 	esym = xen_start_info.mod_start ?
 	    (void *)xen_start_info.mod_start :
 	    (void *)xen_start_info.mfn_list;
-	ksyms_init(*(int *)(void *)&end,
+	ksyms_addsyms_elf(*(int *)(void *)&end,
 	    ((int *)(void *)&end) + 1, esym);
 #endif /* XEN */
 #endif
+}
 void
 init_x86_64(paddr_t first_avail)
+{
 	extern void consinit(void);
 	struct region_descriptor region;
 	struct mem_segment_descriptor *ldt_segp;
 	int x;
 #ifndef XEN

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.211 2008/11/25 15:51:34 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.212 2008/11/30 18:21:32 martin Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1990 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.
+ *
  * 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
 @@ -75,27 +75,27 @@
  * from: Utah $Hdr: machdep.c 1.63 91/04/24$
+ *
  *	@(#)machdep.c	7.16 (Berkeley) 6/3/91
  */
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
 #include "opt_fpu_emulate.h"
 #include "opt_lev6_defer.h"
 #include "opt_m060sp.h"
 #include "opt_panicbutton.h"
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.211 2008/11/25 15:51:34 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.212 2008/11/30 18:21:32 martin Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/signalvar.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 @@ -224,27 +224,27 @@ consinit()
 	} else
 #endif
 		custom_chips_init();
 	/*
 	 * Initialize the console before we print anything out.
 	 */
 	cninit();
 #if NKSYMS || defined(DDB) || defined(MODULAR)
+	{
 		extern int end[];
 		extern int *esym;
-		ksyms_init((int)esym - (int)&end - sizeof(Elf32_Ehdr),
+		ksyms_addsyms_elf((int)esym - (int)&end - sizeof(Elf32_Ehdr),
 		    (void *)&end, esym);
+	}
 #endif
 #ifdef DDB
         if (boothowto & RB_KDB)
                 Debugger();
 #endif
+}
 /*
  * cpu_startup: allocate memory for variable-sized tables,
  * initialize CPU, and do autoconfiguration.
  */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.114 2008/11/12 12:35:56 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.115 2008/11/30 18:21:32 martin 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.114 2008/11/12 12:35:56 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.115 2008/11/30 18:21:32 martin Exp $");
 #include "fs_mfs.h"
 #include "opt_ddb.h"
 #include "opt_ddbparam.h"
 #include "opt_md.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>
 #include <sys/reboot.h>
 @@ -406,31 +406,27 @@ mach_init(int argc, char *argv[], u_int
 #ifdef MFS
 	/*
 	 * Check to see if a mini-root was loaded into memory. It resides
 	 * at the start of the next page just after the end of BSS.
 	 */
 	if (boothowto & RB_MINIROOT)
 		kernend += round_page(mfs_initminiroot(kernend));
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	/* init symbols if present */
 	if (esym)
-		ksyms_init(esym - ssym, ssym, esym);
+		ksyms_addsyms_elf(esym - ssym, ssym, esym);
 #ifdef SYMTAB_SPACE
 	else
 		ksyms_init(0, NULL, NULL);
 #endif
 #endif
 	maxmem = physmem;
 	/* XXX: revisit here */
 	/*
 	 * Load the rest of the pages into the VM system.
 	 */
 	kernstartpfn = atop(trunc_page(
 	    MIPS_KSEG0_TO_PHYS((kernel_text) - UPAGES * PAGE_SIZE)));
 	kernendpfn = atop(round_page(MIPS_KSEG0_TO_PHYS(kernend)));
 #if 0

 @@ -1,14 +1,14 @@
-/*	$NetBSD: at91bus.c,v 1.3 2008/11/12 12:35:57 ad Exp $	*/
+/*	$NetBSD: at91bus.c,v 1.4 2008/11/30 18:21:32 martin 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.
 @@ -24,27 +24,27 @@
  * ``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.3 2008/11/12 12:35:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.4 2008/11/30 18:21:32 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
 #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>
 @@ -554,31 +554,26 @@ at91bus_setup(BootConfig *mem)
 #ifdef BOOTHOWTO
 	boothowto = BOOTHOWTO;
 #endif
 	boothowto = AB_VERBOSE | AB_DEBUG; // @@@@
 #ifdef IPKDB
 	/* Initialise ipkdb */
 	ipkdb_init();
 	if (boothowto & RB_KDB)
 		ipkdb_connect(0);
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	/* Firmware doesn't load symbols. */
 	ksyms_init(0, NULL, NULL);
 #endif
 #ifdef DDB
 	db_machine_init();
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 #if 0
 	printf("test data abort...\n");
 	*((volatile uint32_t*)(0x1234567F)) = 0xdeadbeef;
 #endif
 #ifdef VERBOSE_INIT_ARM
   	printf("%s: returning new stack pointer 0x%lX\n", __FUNCTION__, (kernelstack.pv_va + USPACE_SVC_STACK_TOP));
 #endif

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ofwgencfg_machdep.c,v 1.14 2008/11/12 12:35:57 ad Exp $	*/
+/*	$NetBSD: ofwgencfg_machdep.c,v 1.15 2008/11/30 18:21:32 martin Exp $	*/
 /*
  * Copyright 1997
  * Digital Equipment Corporation. All rights reserved.
+ *
  * This software is furnished under license and may be used and
  * copied only in accordance with the following terms and conditions.
  * Subject to these conditions, you may download, copy, install,
  * use, modify and distribute this software in source and/or binary
  * form. No title or ownership is transferred hereby.
+ *
  * 1) Any source code used, modified or distributed must reproduce
  *    and retain this copyright notice and list of conditions as
 @@ -28,27 +28,27 @@
  *    liable for any damages whatsoever, and in particular, DIGITAL
  *    shall not be liable for special, indirect, consequential, or
  *    incidental damages or damages for lost profits, loss of
  *    revenue or loss of use, whether such damages arise in contract,
  *    negligence, tort, under statute, in equity, at law or otherwise,
  *    even if advised of the possibility of such damage.
  */
 /*
  *  Kernel setup for the OFW Generic Configuration
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ofwgencfg_machdep.c,v 1.14 2008/11/12 12:35:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofwgencfg_machdep.c,v 1.15 2008/11/30 18:21:32 martin Exp $");
 #include "opt_ddb.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/reboot.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/exec.h>
 #include <sys/ksyms.h>
 #include <uvm/uvm_extern.h>
 @@ -192,30 +192,26 @@ initarm(void *cookie)
 	    ARM_VEC_ALL & ~(ARM_VEC_RESET|ARM_VEC_IRQ|ARM_VEC_FIQ));
 	data_abort_handler_address = (u_int)data_abort_handler;
 	prefetch_abort_handler_address = (u_int)prefetch_abort_handler;
 	undefined_handler_address =
 	    (u_int)undefinedinstruction_bounce;	/* why is this needed? -JJK */
 	/* Initialise the undefined instruction handlers. */
 	undefined_init();
 	/* Set-up the IRQ system. */
 	irq_init();
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	ksyms_init(0, NULL, NULL);	/* XXX */
 #endif
 #ifdef DDB
 	db_machine_init();
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 	/* Return the new stackbase. */
 	return(kernelstack.pv_va + USPACE_SVC_STACK_TOP);
+}
 /*
  *  Set various globals based on contents of boot_args

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.153 2008/11/25 15:51:34 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.154 2008/11/30 18:21:32 martin Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1990 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.
+ *
  * 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
 @@ -67,27 +67,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	7.16 (Berkeley) 6/3/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.153 2008/11/25 15:51:34 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.154 2008/11/30 18:21:32 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
 #include "opt_mbtype.h"
 #include "opt_panicbutton.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>
 #include <sys/reboot.h>
 @@ -194,29 +194,29 @@ consinit(void)
 	config_console();
 	/*
 	 * Now pick the best console candidate.
 	 */
 	cninit();
 #if NKSYMS || defined(DDB) || defined(MODULAR)
+	{
 		extern int end;
 		extern int *esym;
 #ifndef __ELF__
-		ksyms_init(*(int *)&end, ((int *)&end) + 1, esym);
+		ksyms_addsyms_elf(*(int *)&end, ((int *)&end) + 1, esym);
 #else
-		ksyms_init((int)esym - (int)&end - sizeof(Elf32_Ehdr),
+		ksyms_addsyms_elf((int)esym - (int)&end - sizeof(Elf32_Ehdr),
 			(void *)&end, esym);
 #endif
+	}
 #endif
 #if defined (DDB)
         if(boothowto & RB_KDB)
                 Debugger();
 #endif
+}
 /*
  * cpu_startup: allocate memory for variable-sized tables,
  * initialize CPU, and do autoconfiguration.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cats_machdep.c,v 1.62 2008/11/12 12:35:57 ad Exp $	*/
+/*	$NetBSD: cats_machdep.c,v 1.63 2008/11/30 18:21:32 martin Exp $	*/
 /*
  * Copyright (c) 1997,1998 Mark Brinicombe.
  * Copyright (c) 1997,1998 Causality Limited.
  * 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
 @@ -30,27 +30,27 @@
  * 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.
+ *
  * Machine dependant functions for kernel setup for EBSA285 core architecture
  * using cyclone firmware
+ *
  * Created      : 24/11/97
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.62 2008/11/12 12:35:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.63 2008/11/30 18:21:32 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
 #include "isadma.h"
 #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>
 @@ -873,37 +873,32 @@ initarm(void *arm_bootargs)
 #endif /* NISADMA > 0 */
+	}
 	/* Boot strap pmap telling it where the kernel page table is */
 	printf("pmap ");
 	pmap_bootstrap(KERNEL_VM_BASE, KERNEL_VM_BASE + KERNEL_VM_SIZE);
 	/* Setup the IRQ system */
 	printf("irq ");
 	footbridge_intr_init();
 	printf("done.\n");
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-#ifdef __ELF__
+#ifndef __ELF__		/* XXX */
 	/* ok this is really rather sick, in ELF what happens is that the
 	 * ELF symbol table is added after the text section.
 	 */
 	ksyms_init(0, NULL, NULL);	/* XXX */
 #else
+	{
 		extern int end;
 		extern int *esym;
-		ksyms_init(*(int *)&end, ((int *)&end) + 1, esym);
+		ksyms_addsyms_elf(*(int *)&end, ((int *)&end) + 1, esym);
+	}
 #endif /* __ELF__ */
 #endif
 #ifdef DDB
 	db_machine_init();
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 	/* We return the new stack pointer address */
 	return(kernelstack.pv_va + USPACE_SVC_STACK_TOP);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.44 2008/11/12 12:35:57 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.45 2008/11/30 18:21:32 martin Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1990, 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.
+ *
  * 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
 @@ -67,27 +67,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.74 92/12/20$
+ *
  *	@(#)machdep.c	8.10 (Berkeley) 4/20/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.44 2008/11/12 12:35:57 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.45 2008/11/30 18:21:32 martin Exp $");
 #include "opt_bufcache.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_compat_netbsd.h"
 #include "opt_sysv.h"
 #include "opt_panicbutton.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/callout.h>
 #include <sys/conf.h>
 @@ -262,29 +262,26 @@ consinit()
 	zs_cnattach((void*)virtual_avail);
 	virtual_avail += PAGE_SIZE;
 #ifdef KGDB
         kgdb_dev = 1;
         kgdb_attach((void*)zscngetc, (void*)zscnputc, (void *)0);
 	if (boothowto & RB_KDB) {
 		kgdb_connect(1);
 		zscons.cn_putc = zs_kgdb_cnputc;
 		zscons.cn_getc = zs_kgdb_cngetc;
+	}
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	ksyms_init(0, 0, 0);
 #endif
 #ifdef DDB
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 	sic_enable_int(39, 2, 1, 7, 0); /* NMI */
+}
 /*
  * cpu_startup: allocate memory for variable-sized tables,
  * initialize CPU, and do autoconfiguration.
  */
 void
 cpu_startup()

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.100 2008/11/12 12:35:58 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.101 2008/11/30 18:21:32 martin Exp $	*/
 /*-
  * Copyright (c) 2006 Izumi Tsutsui.  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.
+ *
 @@ -40,27 +40,27 @@
  * 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 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.100 2008/11/12 12:35:58 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.101 2008/11/30 18:21:32 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_execfmt.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/reboot.h>
 #include <sys/user.h>
 #include <sys/mount.h>
 #include <sys/kcore.h>
 @@ -277,29 +277,27 @@ mach_init(unsigned int memsize, u_int bi
 	mem_clusters[0].start = 0;
 	mem_clusters[0].size = ctob(physmem) - 512;
 	mem_cluster_cnt = 1;
 	memcpy(bootstring, (char *)(memsize - 512), 512);
 	memset((char *)(memsize - 512), 0, 512);
 	bootstring[511] = '\0';
 	decode_bootstring();
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	/* init symbols if present */
 	if ((bi_syms != NULL) && (esym != NULL))
-		ksyms_init(esym - ssym, ssym, esym);
+		ksyms_addsyms_elf(esym - ssym, ssym, esym);
 	else
 		ksyms_init(0, NULL, NULL);
 #endif
 #ifdef DDB
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 #ifdef KGDB
 	if (boothowto & RB_KDB)
 		kgdb_connect(0);
 #endif
 	/*
 	 * Load the rest of the available pages into the VM system.
 	 */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.38 2008/11/12 12:35:58 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.39 2008/11/30 18:21:32 martin Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * 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
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -55,27 +55,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)machdep.c	7.4 (Berkeley) 6/3/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.38 2008/11/12 12:35:58 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.39 2008/11/30 18:21:32 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_memsize.h"
 #include "scif.h"
 #include "opt_kloader.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/user.h>
 #include <sys/mount.h>
 #include <sys/reboot.h>
 @@ -129,29 +129,26 @@ dreamcast_startup(void)
 	kernend = atop(round_page(SH3_P1SEG_TO_PHYS(end)));
 	uvm_page_physload(
 		kernend, atop(IOM_RAM_BEGIN + IOM_RAM_SIZE),
 		kernend, atop(IOM_RAM_BEGIN + IOM_RAM_SIZE),
 		VM_FREELIST_DEFAULT);
 	/* Initialize proc0 u-area */
 	sh_proc0_init();
 	/* Initialize pmap and start to address translation */
 	pmap_bootstrap();
 	/* Debugger. */
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	ksyms_init(0, NULL, NULL);
 #endif
 #if defined(KGDB) && (NSCIF > 0)
 	if (scif_kgdb_init() == 0) {
 		kgdb_debug_init = 1;
 		kgdb_connect(1);
+	}
 #endif /* KGDB && NSCIF > 0 */
 	/* Jump to main */
 	__asm volatile(
 		"jmp	@%0;"
 		"mov	%1, sp"
 		:: "r"(main),"r"(lwp0.l_md.md_pcb->pcb_sf.sf_r7_bank));
 	/* NOTREACHED */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: brh_machdep.c,v 1.30 2008/11/12 12:35:58 ad Exp $	*/
+/*	$NetBSD: brh_machdep.c,v 1.31 2008/11/30 18:21:32 martin Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe 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
 @@ -63,27 +63,27 @@
  * 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.
+ *
  * Machine dependant functions for kernel setup for the ADI Engineering
  * BRH i80200 evaluation platform.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.30 2008/11/12 12:35:58 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.31 2008/11/30 18:21:32 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
 #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>
 @@ -793,31 +793,26 @@ initarm(void *arg)
 	printf("pmap ");
 #endif
 	pmap_bootstrap(KERNEL_VM_BASE, KERNEL_VM_BASE + KERNEL_VM_SIZE);
 	/* Setup the IRQ system */
 #ifdef VERBOSE_INIT_ARM
 	printf("irq ");
 #endif
 	becc_intr_init();
 #ifdef VERBOSE_INIT_ARM
 	printf("done.\n");
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	/* Firmware doesn't load symbols. */
 	ksyms_init(0, NULL, NULL);
 #endif
 #ifdef DDB
 	db_machine_init();
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 	/* We return the new stack pointer address */
 	return(kernelstack.pv_va + USPACE_SVC_STACK_TOP);
+}
 void
 consinit(void)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: armadillo9_machdep.c,v 1.13 2008/11/12 12:35:58 ad Exp $	*/
+/*	$NetBSD: armadillo9_machdep.c,v 1.14 2008/11/30 18:21:32 martin Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Based on code written by Jason R. Thorpe and Steve C. Woodford 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.
 @@ -100,27 +100,27 @@
 a 0000 - 800f ffff	EP9315 Internal Register (AHB)
 0000 - 807f ffff	reserved
 0000 - 8094 ffff	EP9315 Internal Register (APB)
 0000 - 8fff ffff	reserved
 0000 - bfff ffff	reserved
 	c000 0000 - c1ff ffff	SDRAM (32MByte)
 	c200 0000 - c3ff ffff	reserved
 	c400 0000 - c5ff ffff	SDRAM (32MByte)
 	c600 0000 - cfff ffff	reserved
 	d000 0000 - ffff ffff	reserved
 */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.13 2008/11/12 12:35:58 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.14 2008/11/30 18:21:32 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
 #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>
 @@ -871,31 +871,26 @@ initarm(void *arg)
 #endif
 	isa_armadillo9_init(ARMADILLO9_IO16_VBASE + ARMADILLO9_ISAIO,
 		ARMADILLO9_IO16_VBASE + ARMADILLO9_ISAMEM);
 #endif
 #ifdef VERBOSE_INIT_ARM
 	printf("done.\n");
 #endif
 #ifdef BOOTHOWTO
 	boothowto = BOOTHOWTO;
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	/* Firmware doesn't load symbols. */
 	ksyms_init(0, NULL, NULL);
 #endif
 #ifdef DDB
 	db_machine_init();
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 	/* We have our own device_register() */
 	evbarm_device_register = armadillo9_device_register;
 	/* We return the new stack pointer address */
 	return(kernelstack.pv_va + USPACE_SVC_STACK_TOP);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hdlg_machdep.c,v 1.8 2008/11/12 12:35:59 ad Exp $	*/
+/*	$NetBSD: hdlg_machdep.c,v 1.9 2008/11/30 18:21:33 martin Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe and Steve C. Woodford 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
 @@ -63,27 +63,27 @@
  * 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.
+ *
  * Machine dependant functions for kernel setup for GigaLANDISK
  * using RedBoot firmware.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.8 2008/11/12 12:35:59 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.9 2008/11/30 18:21:33 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
 #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>
 @@ -639,31 +639,26 @@ initarm(void *arg)
 #ifdef VERBOSE_INIT_ARM
 	printf("irq ");
 #endif
 	i80321_intr_init();
 #ifdef VERBOSE_INIT_ARM
 	printf("done.\n");
 #endif
 #ifdef BOOTHOWTO
 	boothowto = BOOTHOWTO;
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	/* Firmware doesn't load symbols. */
 	ksyms_init(0, NULL, NULL);
 #endif
 #ifdef DDB
 	db_machine_init();
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 	/* We return the new stack pointer address */
 	return (kernelstack.pv_va + USPACE_SVC_STACK_TOP);
+}
 /*
  * void cpu_reboot(int howto, char *bootstr)
+ *

 @@ -1,14 +1,14 @@
-/*	$NetBSD: integrator_machdep.c,v 1.60 2008/11/12 12:35:59 ad Exp $	*/
+/*	$NetBSD: integrator_machdep.c,v 1.61 2008/11/30 18:21:33 martin Exp $	*/
 /*
  * Copyright (c) 2001,2002 ARM Ltd
  * 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.
 @@ -58,27 +58,27 @@
  * (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.
+ *
  * Machine dependant functions for kernel setup for integrator board
+ *
  * Created      : 24/11/97
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: integrator_machdep.c,v 1.60 2008/11/12 12:35:59 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: integrator_machdep.c,v 1.61 2008/11/30 18:21:33 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
 #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>
 @@ -769,31 +769,26 @@ initarm(void *arg)
 #endif
 	pmap_bootstrap(KERNEL_VM_BASE, KERNEL_VM_BASE + KERNEL_VM_SIZE);
 	/* Setup the IRQ system */
 #ifdef VERBOSE_INIT_ARM
 	printf("irq ");
 #endif
 	ifpga_intr_init();
 #ifdef VERBOSE_INIT_ARM
 	printf("done.\n");
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	/* Firmware doesn't load symbols. */
 	ksyms_init(0, NULL, NULL);
 #endif
 #ifdef DDB
 	db_machine_init();
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 	/* We return the new stack pointer address */
 	return(kernelstack.pv_va + USPACE_SVC_STACK_TOP);
+}
 void
 consinit(void)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: iq80310_machdep.c,v 1.72 2008/11/12 12:35:59 ad Exp $	*/
+/*	$NetBSD: iq80310_machdep.c,v 1.73 2008/11/30 18:21:33 martin Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe 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
 @@ -63,27 +63,27 @@
  * 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.
+ *
  * Machine dependant functions for kernel setup for Intel IQ80310 evaluation
  * boards using RedBoot firmware.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.72 2008/11/12 12:35:59 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.73 2008/11/30 18:21:33 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
 #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>
 @@ -755,31 +755,26 @@ initarm(void *arg)
 #endif
 	pmap_bootstrap(KERNEL_VM_BASE, KERNEL_VM_BASE + KERNEL_VM_SIZE);
 	/* Setup the IRQ system */
 #ifdef VERBOSE_INIT_ARM
 	printf("irq ");
 #endif
 	iq80310_intr_init();
 #ifdef VERBOSE_INIT_ARM
 	printf("done.\n");
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	/* Firmware doesn't load symbols. */
 	ksyms_init(0, NULL, NULL);
 #endif
 #ifdef DDB
 	db_machine_init();
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 	/* We return the new stack pointer address */
 	return(kernelstack.pv_va + USPACE_SVC_STACK_TOP);
+}
 void
 consinit(void)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: iq80321_machdep.c,v 1.41 2008/11/12 12:35:59 ad Exp $	*/
+/*	$NetBSD: iq80321_machdep.c,v 1.42 2008/11/30 18:21:33 martin Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe and Steve C. Woodford 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
 @@ -63,27 +63,27 @@
  * 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.
+ *
  * Machine dependant functions for kernel setup for Intel IQ80321 evaluation
  * boards using RedBoot firmware.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.41 2008/11/12 12:35:59 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.42 2008/11/30 18:21:33 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
 #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>
 @@ -774,31 +774,26 @@ initarm(void *arg)
 #ifdef VERBOSE_INIT_ARM
 	printf("irq ");
 #endif
 	i80321_intr_init();
 #ifdef VERBOSE_INIT_ARM
 	printf("done.\n");
 #endif
 #ifdef BOOTHOWTO
 	boothowto = BOOTHOWTO;
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	/* Firmware doesn't load symbols. */
 	ksyms_init(0, NULL, NULL);
 #endif
 #ifdef DDB
 	db_machine_init();
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 	/* We return the new stack pointer address */
 	return(kernelstack.pv_va + USPACE_SVC_STACK_TOP);
+}
 void
 consinit(void)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ixdp425_machdep.c,v 1.19 2008/11/12 12:35:59 ad Exp $ */
+/*	$NetBSD: ixdp425_machdep.c,v 1.20 2008/11/30 18:21:33 martin Exp $ */
 /*
  * Copyright (c) 2003
  *	Ichiro FUKUHARA <ichiro@ichiro.org>.
  * 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.
 @@ -60,27 +60,27 @@
  * (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.
  */
 /* Machine dependant functions for kernel setup for Intel IXP425 evaluation
  * boards using RedBoot firmware.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.19 2008/11/12 12:35:59 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.20 2008/11/30 18:21:33 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
 #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>
 @@ -755,31 +755,26 @@ initarm(void *arg)
 	/* Setup the IRQ system */
 #ifdef VERBOSE_INIT_ARM
 	printf("irq ");
 #endif
 	ixp425_intr_init();
 #ifdef VERBOSE_INIT_ARM
 	printf("\nAll initialize done!\nNow Starting NetBSD, Hear we go!\n");
 #endif
 #ifdef BOOTHOWTO
 	boothowto = BOOTHOWTO;
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	/* Firmware doesn't load symbols. */
 	ksyms_init(0, NULL, NULL);
 #endif
 #ifdef DDB
 	db_machine_init();
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 	/* We return the new stack pointer address */
 	return(kernelstack.pv_va + USPACE_SVC_STACK_TOP);
+}
 /*
  * consinit
  */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ixm1200_machdep.c,v 1.36 2008/11/12 12:35:59 ad Exp $ */
+/*	$NetBSD: ixm1200_machdep.c,v 1.37 2008/11/30 18:21:33 martin Exp $ */
 /*
  * Copyright (c) 2002, 2003
  *	Ichiro FUKUHARA <ichiro@ichiro.org>.
  * 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
 @@ -57,27 +57,27 @@
  * 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 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: ixm1200_machdep.c,v 1.36 2008/11/12 12:35:59 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.37 2008/11/30 18:21:33 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
 #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>
 @@ -732,27 +732,27 @@ initarm(void *arg)
 	consinit();
 #ifdef VERBOSE_INIT_ARM
 	printf("consinit \n");
 #endif
 	ixdp_ixp12x0_cc_setup();
 #ifdef VERBOSE_INIT_ARM
 	printf("bootstrap done.\n");
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-	ksyms_init(symbolsize, ((int *)&end), ((char *)&end) + symbolsize);
+	ksyms_addsyms_elf(symbolsize, ((int *)&end), ((char *)&end) + symbolsize);
 #endif
 #ifdef DDB
 	db_machine_init();
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 	/* We return the new stack pointer address */
 	return(kernelstack.pv_va + USPACE_SVC_STACK_TOP);
+}
 void

 @@ -1,14 +1,14 @@
-/*	$NetBSD: npwr_fc_machdep.c,v 1.8 2008/11/12 12:35:59 ad Exp $	*/
+/*	$NetBSD: npwr_fc_machdep.c,v 1.9 2008/11/30 18:21:33 martin Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe and Steve C. Woodford 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
 @@ -63,27 +63,27 @@
  * 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.
+ *
  * Machine dependant functions for kernel setup for Intel IQ80321 evaluation
  * boards using RedBoot firmware.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.8 2008/11/12 12:35:59 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.9 2008/11/30 18:21:33 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
 #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>
 @@ -756,31 +756,26 @@ initarm(void *arg)
 #ifdef VERBOSE_INIT_ARM
 	printf("irq ");
 #endif
 	i80321_intr_init();
 #ifdef VERBOSE_INIT_ARM
 	printf("done.\n");
 #endif
 #ifdef BOOTHOWTO
 	boothowto = BOOTHOWTO;
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	/* Firmware doesn't load symbols. */
 	ksyms_init(0, NULL, NULL);
 #endif
 #ifdef DDB
 	db_machine_init();
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 	/* We return the new stack pointer address */
 	return(kernelstack.pv_va + USPACE_SVC_STACK_TOP);
+}
 void
 consinit(void)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: nslu2_machdep.c,v 1.9 2008/11/12 12:35:59 ad Exp $	*/
+/*	$NetBSD: nslu2_machdep.c,v 1.10 2008/11/30 18:21:33 martin Exp $	*/
 /*-
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Steve C. Woodford.
+ *
  * 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.
 @@ -90,27 +90,27 @@
  * 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.
  */
 /*
  * Machine dependant functions for kernel setup for Linksys NSLU2
  * using RedBoot firmware.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.9 2008/11/12 12:35:59 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.10 2008/11/30 18:21:33 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
 #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>
 @@ -823,31 +823,26 @@ initarm(void *arg)
 	/* Setup the IRQ system */
 #ifdef VERBOSE_INIT_ARM
 	printf("irq ");
 #endif
 	ixp425_intr_init();
 #ifdef VERBOSE_INIT_ARM
 	printf("\nAll initialize done!\nNow Starting NetBSD, Hear we go!\n");
 #endif
 #ifdef BOOTHOWTO
 	boothowto = BOOTHOWTO;
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	/* Firmware doesn't load symbols. */
 	ksyms_init(0, NULL, NULL);
 #endif
 #ifdef DDB
 	db_machine_init();
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 	/* We return the new stack pointer address */
 	return(kernelstack.pv_va + USPACE_SVC_STACK_TOP);
+}
 /*
  * consinit
  */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: smdk2410_machdep.c,v 1.21 2008/11/18 18:20:10 cliff Exp $ */
+/*	$NetBSD: smdk2410_machdep.c,v 1.22 2008/11/30 18:21:33 martin Exp $ */
 /*
  * Copyright (c) 2002, 2003 Fujitsu Component Limited
  * Copyright (c) 2002, 2003, 2005 Genetec Corporation
  * 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
 @@ -95,27 +95,27 @@
  * SUCH DAMAGE.
+ *
  * Machine dependant functions for kernel setup for integrator board
+ *
  * Created      : 24/11/97
  */
 /*
  * Machine dependant functions for kernel setup for Samsung SMDK2410
  * derived from integrator_machdep.c
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.21 2008/11/18 18:20:10 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.22 2008/11/30 18:21:33 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
 #include "opt_md.h"
 #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>
 @@ -908,31 +908,26 @@ initarm(void *arg)
 			boothowto ^= RB_KDB;
 #ifdef VERBOSE_INIT_ARM
 		printf( "sw: %x boothowto: %x\n", gpio, boothowto );
 #endif
+	}
 #ifdef KGDB
 	if (boothowto & RB_KDB) {
 		kgdb_debug_init = 1;
 		kgdb_connect(1);
+	}
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	/* Firmware doesn't load symbols. */
 	ksyms_init(0, NULL, NULL);
 #endif
 #ifdef DDB
 	db_machine_init();
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 	/* We return the new stack pointer address */
 	return (kernelstack.pv_va + USPACE_SVC_STACK_TOP);
+}
 void
 consinit(void)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: smdk2800_machdep.c,v 1.29 2008/11/18 18:20:10 cliff Exp $ */
+/*	$NetBSD: smdk2800_machdep.c,v 1.30 2008/11/30 18:21:33 martin Exp $ */
 /*
  * Copyright (c) 2002, 2003, 2005 Fujitsu Component Limited
  * Copyright (c) 2002, 2003, 2005 Genetec Corporation
  * 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
 @@ -96,27 +96,27 @@
  * SUCH DAMAGE.
+ *
  * Machine dependant functions for kernel setup for integrator board
+ *
  * Created      : 24/11/97
  */
 /*
  * Machine dependant functions for kernel setup for Samsung SMDK2800
  * derived from integrator_machdep.c
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.29 2008/11/18 18:20:10 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.30 2008/11/30 18:21:33 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
 #include "opt_md.h"
 #include "pci.h"
 #include <sys/param.h>
 #include <sys/device.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/exec.h>
 #include <sys/proc.h>
 @@ -825,31 +825,26 @@ initarm(void *arg)
 			boothowto ^= RB_KDB;
 #ifdef VERBOSE_INIT_ARM
 		printf( "sw: %x boothowto: %x\n", gpio, boothowto );
 #endif
+	}
 #ifdef KGDB
 	if (boothowto & RB_KDB) {
 		kgdb_debug_init = 1;
 		kgdb_connect(1);
+	}
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	/* Firmware doesn't load symbols. */
 	ksyms_init(0, NULL, NULL);
 #endif
 #ifdef DDB
 	db_machine_init();
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 	/* We return the new stack pointer address */
 	return (kernelstack.pv_va + USPACE_SVC_STACK_TOP);
+}
 void
 consinit(void)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tsarm_machdep.c,v 1.9 2008/11/12 12:35:59 ad Exp $ */
+/*	$NetBSD: tsarm_machdep.c,v 1.10 2008/11/30 18:21:33 martin Exp $ */
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Based on code written by Jason R. Thorpe and Steve C. Woodford 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.
 @@ -63,27 +63,27 @@
  * 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.
+ *
  * Machine dependant functions for kernel setup for Iyonix.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tsarm_machdep.c,v 1.9 2008/11/12 12:35:59 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tsarm_machdep.c,v 1.10 2008/11/30 18:21:33 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
 #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>
 @@ -791,31 +791,26 @@ initarm(void *arg)
 #endif
 	isa_tsarm_init(TS7XXX_IO16_VBASE + TS7XXX_ISAIO,
 		TS7XXX_IO16_VBASE + TS7XXX_ISAMEM);
 #endif
 #ifdef VERBOSE_INIT_ARM
 	printf("done.\n");
 #endif
 #ifdef BOOTHOWTO
 	boothowto = BOOTHOWTO;
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	/* Firmware doesn't load symbols. */
 	ksyms_init(0, NULL, NULL);
 #endif
 #ifdef DDB
 	db_machine_init();
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 	/* We return the new stack pointer address */
 	return(kernelstack.pv_va + USPACE_SVC_STACK_TOP);
+}
 void
 consinit(void)
+{

 @@ -1,14 +1,14 @@
-/* $NetBSD: machdep.c,v 1.8 2008/11/12 12:35:59 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.9 2008/11/30 18:21:33 martin Exp $ */
 /*-
  * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko.
  * 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
 @@ -97,27 +97,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
  * 	from: Utah Hdr: machdep.c 1.63 91/04/24
  */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.8 2008/11/12 12:35:59 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.9 2008/11/30 18:21:33 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_memsize.h"
 #include "opt_ethaddr.h"
 #include "opt_pci.h"
 #include "pci.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 @@ -437,29 +437,26 @@ mach_init(int argc, char **argv, void *a
 	/*
 	 * Init mapping for u page(s) for proc0.
 	 */
 	v = uvm_pageboot_alloc(USPACE);
 	lwp0.l_addr = proc0paddr = (struct user *)v;
 	lwp0.l_md.md_regs = (struct frame *)(v + USPACE) - 1;
 	proc0paddr->u_pcb.pcb_context[11] =
 	    MIPS_INT_MASK | MIPS_SR_INT_IE; /* SR */
 	/*
 	 * Initialize debuggers, and break into them, if appropriate.
 	 */
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	ksyms_init(0, 0, 0);
 #endif
 #ifdef DDB
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 	copy_args(argc, argv);
+}
 void
 consinit(void)
+{
 	/*

 @@ -1,14 +1,14 @@
-/* $NetBSD: machdep.c,v 1.39 2008/11/12 12:35:59 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.40 2008/11/30 18:21:33 martin Exp $ */
 /*-
  * Copyright (c) 2006 Itronix Inc.
  * All rights reserved.
+ *
  * Portions written by Garrett D'Amore for Itronix 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
 @@ -97,27 +97,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
  * 	from: Utah Hdr: machdep.c 1.63 91/04/24
  */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.39 2008/11/12 12:35:59 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.40 2008/11/30 18:21:33 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_memsize.h"
 #include "opt_ethaddr.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/user.h>
 @@ -363,29 +363,26 @@ mach_init(int argc, char **argv, yamon_e
 	/*
 	 * Init mapping for u page(s) for proc0.
 	 */
 	v = (void *) uvm_pageboot_alloc(USPACE);
 	lwp0.l_addr = proc0paddr = (struct user *)v;
 	lwp0.l_md.md_regs = (struct frame *)((char *)v + USPACE) - 1;
 	proc0paddr->u_pcb.pcb_context[11] =
 	    MIPS_INT_MASK | MIPS_SR_INT_IE; /* SR */
 	/*
 	 * Initialize debuggers, and break into them, if appropriate.
 	 */
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	ksyms_init(0, 0, 0);
 #endif
 #ifdef DDB
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
+}
 void
 consinit(void)
+{
 	/*
 	 * Everything related to console initialization is done
 	 * in mach_init().

 @@ -1,14 +1,14 @@
-/* $NetBSD: machdep.c,v 1.15 2008/11/12 12:35:59 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.16 2008/11/30 18:21:33 martin Exp $ */
 /*
  * Copyright (c) 2006 Urbana-Champaign Independent Media Center.
  * Copyright (c) 2006 Garrett D'Amore.
  * All rights reserved.
+ *
  * Portions of this code were written by Garrett D'Amore for the
  * Champaign-Urbana Community Wireless Network Project.
+ *
  * 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
 @@ -137,27 +137,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
  * 	from: Utah Hdr: machdep.c 1.63 91/04/24
  */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.15 2008/11/12 12:35:59 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.16 2008/11/30 18:21:33 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/user.h>
 #include <sys/mount.h>
 #include <sys/kcore.h>
 #include <sys/boot_flag.h>
 @@ -329,30 +329,26 @@ mach_init(void)
 	/*
 	 * Turn off watchpoint that may have been enabled by the
 	 * PROM.  VxWorks bootloader seems to leave one set.
 	 */
 	__asm volatile (
 		"mtc0	$0, $" ___STRING(MIPS_COP_0_WATCH_LO) " \n\t"
 		"nop\n\t"
 		"nop\n\t");
 	/*
 	 * Initialize debuggers, and break into them, if appropriate.
 	 */
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	ksyms_init(0, 0, 0);
 #endif
 #ifdef DDB
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
+}
 void
 consinit(void)
+{
 	/*
 	 * Everything related to console initialization is done
 	 * in mach_init().

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.30 2008/11/12 12:35:59 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.31 2008/11/30 18:21:33 martin Exp $	*/
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Written by Jason R. Thorpe 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
 @@ -102,27 +102,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
  *	from: Utah Hdr: machdep.c 1.63 91/04/24
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.30 2008/11/12 12:35:59 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.31 2008/11/30 18:21:33 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_execfmt.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/user.h>
 #include <sys/mount.h>
 #include <sys/kcore.h>
 #include <sys/boot_flag.h>
 @@ -319,30 +319,26 @@ mach_init(int argc, char **argv, yamon_e
 	/*
 	 * Allocate space for proc0's USPACE.
 	 */
 	v = (void *)uvm_pageboot_alloc(USPACE);
 	lwp0.l_addr = proc0paddr = (struct user *)v;
 	lwp0.l_md.md_regs = (struct frame *)((char *)v + USPACE) - 1;
 	proc0paddr->u_pcb.pcb_context[11] =
 	    MIPS_INT_MASK | MIPS_SR_INT_IE; /* SR */
 	/*
 	 * Initialize debuggers, and break into them, if appropriate.
 	 */
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	ksyms_init(0, 0, 0);
 #endif
 #if defined(DDB)
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
+}
 void
 consinit(void)
+{
 	/*
 	 * Everything related to console initialization is done
 	 * in mach_init().

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.22 2008/11/12 12:36:00 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.23 2008/11/30 18:21:33 martin Exp $	*/
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
  * Copyright (C) 1995, 1996 TooLs GmbH.
  * 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
 @@ -22,27 +22,27 @@
  * 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.22 2008/11/12 12:36:00 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.23 2008/11/30 18:21:33 martin Exp $");
 #include "opt_marvell.h"
 #include "opt_ev64260.h"
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include "opt_inet.h"
 #include "opt_ccitt.h"
 #include "opt_iso.h"
 #include "opt_ns.h"
 #include "opt_ipkdb.h"
 #include <sys/param.h>
 #include <sys/conf.h>
 @@ -224,27 +224,27 @@ initppc(startkernel, endkernel, args, bt
         /*
 	 * Set the page size.
 	 */
 	uvm_setpagesize();
 	/*
 	 * Initialize pmap module.
 	 */
 	pmap_bootstrap(startkernel, endkernel);
 #if NKSYMS || defined(DDB) || defined(MODULAR)
+	{
 		extern void *startsym, *endsym;
-		ksyms_init((int)((u_int)endsym - (u_int)startsym),
+		ksyms_addsyms_elf((int)((u_int)endsym - (u_int)startsym),
 		    startsym, endsym);
+	}
 #endif
 #ifdef IPKDB
 	/*
 	 * Now trap to IPKDB
 	 */
 	ipkdb_init();
 	if (boothowto & RB_KDB)
 		ipkdb_connect(0);
 #endif
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.25 2008/11/12 12:36:00 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.26 2008/11/30 18:21:33 martin 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,27 +20,27 @@
  * ``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.25 2008/11/12 12:36:00 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.26 2008/11/30 18:21:33 martin Exp $");
 #include "opt_explora.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/user.h>
 #include <sys/reboot.h>
 @@ -253,31 +253,26 @@ bootstrap(u_int startkernel, u_int endke
 	__asm volatile (
 	    "	mfmsr %0	\n"
 	    "	ori %0,%0,%1	\n"
 	    "	mtmsr %0	\n"
 	    "	sync		\n"
 	    : : "r" (0), "K" (PSL_IR|PSL_DR|PSL_ME) );
 	uvm_setpagesize();
 	/*
 	 * Initialize pmap module.
 	 */
 	pmap_bootstrap(startkernel, endkernel);
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	ksyms_init(0, NULL, NULL);
 #endif
 	fake_mapiodev = 0;
+}
 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 omsr, msr;
 #ifdef	DIAGNOSTIC
 	if (offset > 0x1ffffff)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: obs200_machdep.c,v 1.7 2008/11/12 12:36:00 ad Exp $	*/
+/*	$NetBSD: obs200_machdep.c,v 1.8 2008/11/30 18:21:33 martin 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,27 +58,27 @@
  * 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.7 2008/11/12 12:36:00 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs200_machdep.c,v 1.8 2008/11/30 18:21:33 martin Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include "opt_ipkdb.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>
 @@ -152,27 +152,27 @@ initppc(u_int startkernel, u_int endkern
 	/*
 	 * Initialize pmap module.
 	 */
 	pmap_bootstrap(startkernel, endkernel);
 #ifdef DEBUG
 	bios_board_print();
 	printf("  PLL Mode Register = 0x%08x\n", pllmode);
 	printf("  Chip Pin Strapping Register = 0x%08x\n", psr);
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-	ksyms_init((int)((u_int)endsym - (u_int)startsym), startsym, endsym);
+	ksyms_addsyms_elf((int)((u_int)endsym - (u_int)startsym), startsym, endsym);
 #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

 @@ -1,14 +1,14 @@
-/*	$NetBSD: obs266_machdep.c,v 1.8 2008/11/12 12:36:00 ad Exp $	*/
+/*	$NetBSD: obs266_machdep.c,v 1.9 2008/11/30 18:21:33 martin 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,27 +58,27 @@
  * 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.8 2008/11/12 12:36:00 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obs266_machdep.c,v 1.9 2008/11/30 18:21:33 martin Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include "opt_ipkdb.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>
 @@ -146,27 +146,27 @@ initppc(u_int startkernel, u_int endkern
 	 */
 	uvm_setpagesize();
 	/*
 	 * Initialize pmap module.
 	 */
 	pmap_bootstrap(startkernel, endkernel);
 #ifdef DEBUG
 	openbios_board_print();
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-	ksyms_init((int)((u_int)endsym - (u_int)startsym), startsym, endsym);
+	ksyms_addsyms_elf((int)((u_int)endsym - (u_int)startsym), startsym, endsym);
 #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

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.5 2008/11/12 12:36:00 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.6 2008/11/30 18:21:33 martin Exp $	*/
 /*
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Lennart Augustsson (lennart@augustsson.net) at Sandburst Corp.
+ *
  * 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.
 @@ -51,27 +51,27 @@
  * 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.5 2008/11/12 12:36:00 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.6 2008/11/30 18:21:33 martin Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include "opt_ddbparam.h"
 #include "opt_inet.h"
 #include "opt_ccitt.h"
 #include "opt_iso.h"
 #include "opt_ns.h"
 #include "opt_ipkdb.h"
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 @@ -234,33 +234,26 @@ initppc(u_int startkernel, u_int endkern
 	printf("console set up\n");
         /*
 	 * Set the page size.
 	 */
 	uvm_setpagesize();
 	/*
 	 * Initialize pmap module.
 	 */
 	pmap_bootstrap(startkernel, endkernel);
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 #ifdef SYMTAB_SPACE
 	ksyms_init(0, NULL, NULL);
 #else
 	#error "No SYMTAB_SPACE"
 #endif
 #endif
 #ifdef IPKDB
 	/*
 	 * Now trap to IPKDB
 	 */
 	ipkdb_init();
 	if (boothowto & RB_KDB)
 		ipkdb_connect(0);
 #endif
 #ifdef KGDB
 	kgdb_port_init();
 	if (boothowto & RB_KDB) {
 		kgdb_debug_init = 1;
 		kgdb_connect(1);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.8 2008/11/12 12:36:00 ad Exp $ */
+/*	$NetBSD: machdep.c,v 1.9 2008/11/30 18:21:33 martin 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,27 +24,27 @@
  * 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.8 2008/11/12 12:36:00 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.9 2008/11/30 18:21:33 martin Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include "opt_ipkdb.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>
 @@ -237,27 +237,27 @@ initppc(u_int startkernel, u_int endkern
 	    "	ori %0,%0,%1 	\n"
 	    "	mtmsr %0 	\n"
 	    "   sync 		\n"
 	    "	isync		\n"
 	    : : "r"(0), "K"(PSL_IR | PSL_DR | PSL_ME));
 	/* now that we enabled MMU, we can map console */
 	consinit();
 	uvm_setpagesize();
 	pmap_bootstrap(startkernel, endkernel);
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-	ksyms_init((int)((u_int)endsym - (u_int)startsym), startsym, endsym);
+	ksyms_addsyms_elf((int)((u_int)endsym - (u_int)startsym), startsym, endsym);
 #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

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.38 2008/11/12 12:36:00 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.39 2008/11/30 18:21:34 martin 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,27 +57,27 @@
  * 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.38 2008/11/12 12:36:00 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.39 2008/11/30 18:21:34 martin Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include "opt_ipkdb.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>
 @@ -312,27 +312,27 @@ initppc(u_int startkernel, u_int endkern
 	    board_data.mac_address_local[0], board_data.mac_address_local[1],
 	    board_data.mac_address_local[2], board_data.mac_address_local[3],
 	    board_data.mac_address_local[4], board_data.mac_address_local[5]);
 	printf("  mac_address_pci = %02x:%02x:%02x:%02x:%02x:%02x\n",
 	    board_data.mac_address_pci[0], board_data.mac_address_pci[1],
 	    board_data.mac_address_pci[2], board_data.mac_address_pci[3],
 	    board_data.mac_address_pci[4], board_data.mac_address_pci[5]);
 	printf("  processor_speed = %u\n", board_data.processor_speed);
 	printf("  plb_speed = %u\n", board_data.plb_speed);
 	printf("  pci_speed = %u\n", board_data.pci_speed);
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-	ksyms_init((int)((u_int)endsym - (u_int)startsym), startsym, endsym);
+	ksyms_addsyms_elf((int)((u_int)endsym - (u_int)startsym), startsym, endsym);
 #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

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.62 2008/11/12 12:36:00 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.63 2008/11/30 18:21:34 martin Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * 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
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -55,27 +55,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)machdep.c	7.4 (Berkeley) 6/3/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.62 2008/11/12 12:36:00 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.63 2008/11/30 18:21:34 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_memsize.h"
 #include "opt_initbsc.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/user.h>
 #include <sys/mount.h>
 #include <sys/reboot.h>
 #include <sys/sysctl.h>
 @@ -260,31 +260,27 @@ initSH3(void *pc)	/* XXX return address
 	kernend = atop(round_page(SH3_P1SEG_TO_PHYS(end)));
 	physmem = atop(IOM_RAM_SIZE);
 	uvm_page_physload(
 		kernend, atop(IOM_RAM_BEGIN + IOM_RAM_SIZE),
 		kernend, atop(IOM_RAM_BEGIN + IOM_RAM_SIZE),
 		VM_FREELIST_DEFAULT);
 	/* Initialize proc0 u-area */
 	sh_proc0_init();
 	/* Initialize pmap and start to address translation */
 	pmap_bootstrap();
-#if NKSYMS || defined(DDB) || defined(MODULAR)
+#	/*
 	ksyms_init(0, NULL, NULL);
 #endif
 	/*
 	 * XXX We can't return here, because we change stack pointer.
 	 *     So jump to return address directly.
 	 */
 	__asm volatile (
 		"jmp	@%0;"
 		"mov	%1, r15"
 		:: "r"(pc),"r"(lwp0.l_md.md_pcb->pcb_sf.sf_r7_bank));
+}
 /*
  * consinit:
  * initialize the system console.
  * XXX - shouldn't deal with this initted thing, but then,

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.15 2008/11/11 06:46:42 dyoung Exp $	*/
+/*	$NetBSD: machdep.c,v 1.16 2008/11/30 18:21:34 martin Exp $	*/
 /*-
  * Copyright (c) 2001, 2004, 2005 The NetBSD Foundation, Inc.
  * 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,27 +17,27 @@
  * ``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.15 2008/11/11 06:46:42 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.16 2008/11/30 18:21:34 martin Exp $");
 #include "opt_ddb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/user.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/mount.h>
 #include <sys/kcore.h>
 #include <sys/boot_flag.h>
 @@ -187,27 +187,27 @@ option(int argc, char *argv[], struct bo
 	char *p;
 	int i;
 	printf("argc=%d argv=%p syminfo=%p\n", argc, argv, bi);
 	printf("version=%d size=%d nsym=%d ssym=%p esym=%p\n",
 	    bi->bi_version, bi->bi_size, bi->bi_nsym, bi->bi_ssym, bi->bi_esym);
 	for (i = 0; i < argc; i++)
 		printf("[%d] %s\n", i, argv[i]);
 #ifdef DDB
 	/* Load symbol table */
 	if (bi->bi_nsym)
-		ksyms_init(bi->bi_esym - bi->bi_ssym,
+		ksyms_addsyms_elf(bi->bi_esym - bi->bi_ssym,
 		    (void *)bi->bi_ssym, (void *)bi->bi_esym);
 #endif
 	/* Parse option */
 	boot_device_set = false;
 	for (i = 2; i < argc; i++) {
 		p = argv[i];
 		/* prompt for root device */
 		if (p[0] == '-' && p[1] == 'a')
 			boot_device_set = true;
 		/* root device option. ex) -b=net:netbsd, -b=sd0k:netbsd */
 		if (p[0] == '-' && p[1] == 'b') {
 			boot_device_set = true;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.202 2008/11/12 12:36:00 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.203 2008/11/30 18:21:34 martin Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1990, 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.
+ *
  * 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
 @@ -67,27 +67,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.74 92/12/20$
+ *
  *	@(#)machdep.c	8.10 (Berkeley) 4/20/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.202 2008/11/12 12:36:00 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.203 2008/11/30 18:21:34 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
 #include "opt_panicbutton.h"
 #include "hil.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/exec.h>
 #include <sys/file.h>
 @@ -284,27 +284,27 @@ consinit(void)
 	hp300_cninit();
 	/*
 	 * Issue a warning if the boot loader didn't provide bootinfo.
 	 */
 	if (bootinfo_va == 0)
 		printf("WARNING: boot loader did not provide bootinfo\n");
 #if NKSYMS || defined(DDB) || defined(MODULAR)
+	{
 		extern int end;
 		extern int *esym;
-		ksyms_init((int)esym - (int)&end - sizeof(Elf32_Ehdr),
+		ksyms_addsyms_elf((int)esym - (int)&end - sizeof(Elf32_Ehdr),
 		    (void *)&end, esym);
+	}
 #endif
 #ifdef DDB
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
+}
 /*
  * cpu_startup: allocate memory for variable-sized tables,
  * initialize CPU
  */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.53 2008/11/25 15:51:34 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.54 2008/11/30 18:21:34 martin Exp $	*/
 /*-
  * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Matthew Fredette.
+ *
  * 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.
 @@ -53,27 +53,27 @@
  * 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 OR HIS RELATIVES 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 MIND, 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.53 2008/11/25 15:51:34 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.54 2008/11/30 18:21:34 martin Exp $");
 #include "opt_cputype.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_useleds.h"
 #include "opt_power_switch.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>
 @@ -808,32 +808,32 @@ do {									\
 	 */
 	hp700_kgdb_attached = false;
 #if NCOM > 0
 	if (!strcmp(KGDB_DEVNAME, "com")) {
 		int com_gsc_kgdb_attach(void);
 		if (com_gsc_kgdb_attach() == 0)
 			hp700_kgdb_attached = true;
+	}
 #endif /* NCOM > 0 */
 #endif /* KGDB */
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	if ((bi_sym = lookup_bootinfo(BTINFO_SYMTAB)) != NULL)
-                ksyms_init(bi_sym->nsym, (int *)bi_sym->ssym,
+                ksyms_addsyms_elf(bi_sym->nsym, (int *)bi_sym->ssym,
                     (int *)bi_sym->esym);
         else {
 		extern int end;
-		ksyms_init(esym - (int)&end, &end, (int*)esym);
+		ksyms_addsyms_elf(esym - (int)&end, &end, (int*)esym);
+	}
 #endif
 	/* We will shortly go virtual. */
 	pagezero_mapped = 0;
+}
 void
 cpu_startup(void)
+{
 	vaddr_t minaddr, maxaddr;
 	char pbuf[3][9];
 #ifdef PMAPDEBUG

 @@ -1,14 +1,14 @@
-/*	$NetBSD: hpc_machdep.c,v 1.88 2008/11/12 12:36:01 ad Exp $	*/
+/*	$NetBSD: hpc_machdep.c,v 1.89 2008/11/30 18:21:34 martin Exp $	*/
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * All rights reserved.
+ *
  * This code is derived from software written for Brini by Mark Brinicombe
+ *
  * 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.
 @@ -30,27 +30,27 @@
  * (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.
  */
 /*
  * Machine dependent functions for kernel setup.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.88 2008/11/12 12:36:01 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.89 2008/11/30 18:21:34 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
 #include "fs_nfs.h"
 #include "ksyms.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/reboot.h>
 #include <sys/proc.h>
 #include <sys/msgbuf.h>
 #include <sys/exec.h>
 @@ -697,27 +697,27 @@ initarm(int argc, char **argv, struct bo
+	}
 	/* Boot strap pmap telling it where the kernel page table is */
 	pmap_bootstrap(KERNEL_VM_BASE, KERNEL_VM_BASE + KERNEL_VM_SIZE);
 #ifdef BOOT_DUMP
 	dumppages((char *)kernel_l1pt.pv_va, 16);
 #endif
 #ifdef DDB
 	db_machine_init();
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-	ksyms_init(symbolsize, ((int *)&end), ((char *)&end) + symbolsize);
+	ksyms_addsyms_elf(symbolsize, ((int *)&end), ((char *)&end) + symbolsize);
 #endif
 	printf("kernsize=0x%x", kerneldatasize);
 	printf(" (including 0x%x symbols)\n", symbolsize);
 #ifdef DDB
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif /* DDB */
 	if (bootinfo->magic == BOOTINFO_MAGIC) {
 		platid.dw.dw0 = bootinfo->platid_cpu;
 		platid.dw.dw1 = bootinfo->platid_machine;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.98 2008/11/12 12:36:01 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.99 2008/11/30 18:21:34 martin 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.98 2008/11/12 12:36:01 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.99 2008/11/30 18:21:34 martin Exp $");
 #include "opt_vr41xx.h"
 #include "opt_tx39xx.h"
 #include "opt_boot_standalone.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"
 #include "opt_kloader_kernel_path.h"
 @@ -440,27 +440,27 @@ mach_init(int argc, char *argv[], struct
 	if (boothowto & RB_MINIROOT) {
 		size_t fssz;
 		fssz = round_page(mfs_initminiroot(kernend));
 #ifdef MEMORY_DISK_DYNAMIC
 		md_root_setconf(kernend, fssz);
 #endif /* MEMORY_DISK_DYNAMIC */
 		kernend = (char *)kernend + fssz;
+	}
 #endif /* MFS */
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	/* init symbols if present */
 	if (esym)
-		ksyms_init(symbolsz, &end, esym);
+		ksyms_addsyms_elf(symbolsz, &end, esym);
 #endif /* DDB */
 	/*
 	 * Alloc u pages for lwp0 stealing KSEG0 memory.
 	 */
 	lwp0.l_addr = proc0paddr = (struct user *)kernend;
 	lwp0.l_md.md_regs =
 	    (struct frame *)((char *)kernend + UPAGES * PAGE_SIZE) - 1;
 	memset(kernend, 0, UPAGES * PAGE_SIZE);
 	proc0paddr->u_pcb.pcb_context[11] =
 	    MIPS_INT_MASK | MIPS_SR_INT_IE; /* SR */
 	kernend = (char *)kernend + UPAGES * PAGE_SIZE;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.64 2008/11/17 02:05:13 uwe Exp $	*/
+/*	$NetBSD: machdep.c,v 1.65 2008/11/30 18:21:34 martin Exp $	*/
 /*-
  * Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc.
  * 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,27 +17,27 @@
  * ``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.64 2008/11/17 02:05:13 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.65 2008/11/30 18:21:34 martin Exp $");
 #include "opt_md.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "fs_mfs.h"
 #include "fs_nfs.h"
 #include "biconsdev.h"
 #include "debug_hpc.h"
 #include "hd64465if.h"
 #include "opt_kloader.h"
 #ifdef KLOADER
 #if !defined(KLOADER_KERNEL_PATH)
 @@ -285,27 +285,27 @@ machine_startup(int argc, char *argv[],
 	/* Find memory cluster. and load to UVM */
 	physmem = mem_cluster_init(SH3_P1SEG_TO_PHYS(kernend));
 	_DPRINTF("total memory = %dMbyte\n", (int)(sh3_ptob(physmem) >> 20));
 	mem_cluster_load();
 	/* Initialize proc0 u-area */
 	sh_proc0_init();
 	/* Initialize pmap and start to address translation */
 	pmap_bootstrap();
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	if (symbolsize) {
-		ksyms_init(symbolsize, &end, end + symbolsize);
+		ksyms_addsyms_elf(symbolsize, &end, end + symbolsize);
 		_DPRINTF("symbol size = %d byte\n", symbolsize);
+	}
 #endif
 #ifdef DDB
 	/* Debugger. */
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif /* DDB */
 #ifdef KGDB
 	if (boothowto & RB_KDB) {
 		if (kgdb_dev == NODEV) {
 			printf("no kgdb console.\n");
 		} else {

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.652 2008/11/20 10:53:09 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.653 2008/11/30 18:21:34 martin Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum, by Jason R. Thorpe of the Numerical Aerospace
  * Simulation Facility, NASA Ames Research Center and by Julio M. Merino Vidal.
+ *
  * 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
 @@ -55,27 +55,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)machdep.c	7.4 (Berkeley) 6/3/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.652 2008/11/20 10:53:09 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.653 2008/11/30 18:21:34 martin Exp $");
 #include "opt_beep.h"
 #include "opt_compat_ibcs2.h"
 #include "opt_compat_mach.h"	/* need to get the right segment def */
 #include "opt_compat_netbsd.h"
 #include "opt_compat_svr4.h"
 #include "opt_cpureset_delay.h"
 #include "opt_ddb.h"
 #include "opt_ipkdb.h"
 #include "opt_kgdb.h"
 #include "opt_mtrr.h"
 #include "opt_multiprocessor.h"
 #include "opt_physmem.h"
 @@ -1252,38 +1252,38 @@ init386_pte0(void)
 static void
 init386_ksyms(void)
+{
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	extern int end;
 	struct btinfo_symtab *symtab;
 #ifdef DDB
 	db_machine_init();
 #endif
 #if defined(MULTIBOOT)
-	if (multiboot_ksyms_init())
+	if (multiboot_ksyms_addsyms_elf())
 		return;
 #endif
 	if ((symtab = lookup_bootinfo(BTINFO_SYMTAB)) == NULL) {
-		ksyms_init(*(int *)&end, ((int *)&end) + 1, esym);
+		ksyms_addsyms_elf(*(int *)&end, ((int *)&end) + 1, esym);
 		return;
+	}
 	symtab->ssym += KERNBASE;
 	symtab->esym += KERNBASE;
-	ksyms_init(symtab->nsym, (int *)symtab->ssym, (int *)symtab->esym);
+	ksyms_addsyms_elf(symtab->nsym, (int *)symtab->ssym, (int *)symtab->esym);
 #endif
+}
 void
 init386(paddr_t first_avail)
+{
 	extern void consinit(void);
 	int x;
 #ifndef XEN
 	union descriptor *tgdt;
 	extern struct extent *iomem_ex;
 	struct region_descriptor region;
 	struct btinfo_memmap *bim;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: multiboot.c,v 1.17 2008/10/11 11:06:19 joerg Exp $	*/
+/*	$NetBSD: multiboot.c,v 1.18 2008/11/30 18:21:34 martin Exp $	*/
 /*-
  * Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Julio M. Merino Vidal.
+ *
  * 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,27 +20,27 @@
  * ``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: multiboot.c,v 1.17 2008/10/11 11:06:19 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: multiboot.c,v 1.18 2008/11/30 18:21:34 martin Exp $");
 #include "opt_multiboot.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/cdefs_elf.h>
 #include <sys/boot_flag.h>
 #include <sys/exec.h>
 #include <sys/exec_elf.h>
 #include <sys/optstr.h>
 #include <sys/ksyms.h>
 #include <machine/bootinfo.h>
 @@ -694,20 +694,20 @@ multiboot_ksyms_init(void)
 		Elf32_Ehdr ehdr;
 		KASSERT(esym != 0);
 		memcpy(ehdr.e_ident, ELFMAG, SELFMAG);
 		ehdr.e_ident[EI_CLASS] = ELFCLASS32;
 		ehdr.e_ident[EI_DATA] = ELFDATA2LSB;
 		ehdr.e_ident[EI_VERSION] = EV_CURRENT;
 		ehdr.e_type = ET_EXEC;
 		ehdr.e_machine = EM_386;
 		ehdr.e_version = 1;
 		ehdr.e_ehsize = sizeof(ehdr);
-		ksyms_init_explicit((void *)&ehdr,
+		ksyms_addsyms_explicit((void *)&ehdr,
 		    ms->s_symstart, ms->s_symsize,
 		    ms->s_strstart, ms->s_strsize);
+	}
 	return mi->mi_flags & MULTIBOOT_INFO_HAS_ELF_SYMS;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.11 2008/11/12 12:36:02 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.12 2008/11/30 18:21:34 martin Exp $	*/
 /*-
  * Copyright (c) 2003,2004 Marcel Moolenaar
  * Copyright (c) 2000,2001 Doug Rabson
  * 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
 @@ -740,27 +740,27 @@ ia64_init()
 	ia64_set_tpr(0);
 	/*
 	 * Save our current context so that we have a known (maybe even
 	 * sane) context as the initial context for new threads that are
 	 * forked from us.
 	 */
 	if (savectx(&lwp0.l_addr->u_pcb)) panic("savectx failed");
 	/*
 	 * Initialize debuggers, and break into them if appropriate.
 	 */
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-	ksyms_init((int)((u_int64_t)ksym_end - (u_int64_t)ksym_start),
+	ksyms_addsyms_elf((int)((u_int64_t)ksym_end - (u_int64_t)ksym_start),
 	    ksym_start, ksym_end);
 #endif
 #if defined(DDB)
 	Debugger();
 #endif
 	extern void main(void);
 	main();
 	panic("Wheeee!!! main() returned!!! \n");
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: iyonix_machdep.c,v 1.10 2008/11/12 12:36:02 ad Exp $	*/
+/*	$NetBSD: iyonix_machdep.c,v 1.11 2008/11/30 18:21:34 martin Exp $	*/
 /*
  * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc.
  * All rights reserved.
+ *
  * Based on code written by Jason R. Thorpe and Steve C. Woodford 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.
 @@ -63,27 +63,27 @@
  * 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.
+ *
  * Machine dependant functions for kernel setup for Iyonix.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.10 2008/11/12 12:36:02 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.11 2008/11/30 18:21:34 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_pmap_debug.h"
 #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>
 @@ -802,31 +802,26 @@ initarm(void *arg)
 #ifdef VERBOSE_INIT_ARM
 	printf("irq ");
 #endif
 	i80321_intr_init();
 #ifdef VERBOSE_INIT_ARM
 	printf("done.\n");
 #endif
 #ifdef BOOTHOWTO
 	boothowto = BOOTHOWTO;
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	/* Firmware doesn't load symbols. */
 	ksyms_init(0, NULL, NULL);
 #endif
 #ifdef DDB
 	db_machine_init();
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 	iyonix_pic_init();
 	/* We return the new stack pointer address */
 	return(kernelstack.pv_va + USPACE_SVC_STACK_TOP);
+}
 void

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.9 2008/11/17 01:55:00 uwe Exp $	*/
+/*	$NetBSD: machdep.c,v 1.10 2008/11/30 18:21:34 martin Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * 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
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -55,27 +55,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)machdep.c	7.4 (Berkeley) 6/3/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.9 2008/11/17 01:55:00 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.10 2008/11/30 18:21:34 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_kloader.h"
 #include "opt_kloader_kernel_path.h"
 #include "opt_memsize.h"
 #include "fs_mfs.h"
 #include "ksyms.h"
 #include "scif.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 @@ -220,27 +220,27 @@ landisk_startup(int howto, void *bi)
 		physmem, atop(IOM_RAM_BEGIN + IOM_RAM_SIZE),
 		kernend, atop(IOM_RAM_BEGIN + IOM_RAM_SIZE),
 		VM_FREELIST_DEFAULT);
 	/* Initialize proc0 u-area */
 	sh_proc0_init();
 	/* Initialize pmap and start to address translation */
 	pmap_bootstrap();
 	/* Debugger. */
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	if (symbolsize != 0) {
-		ksyms_init(symbolsize, &end, end + symbolsize);
+		ksyms_addsyms_elf(symbolsize, &end, end + symbolsize);
+	}
 #endif
 #if defined(DDB)
 	if (boothowto & RB_KDB) {
 		Debugger();
+	}
 #endif
 #if defined(KGDB) && (NSCIF > 0)
 	if (scif_kgdb_init() == 0) {
 		if (boothowto & RB_KDB) {
 			kgdb_debug_init = 1;
 			kgdb_connect(1);
+		}

 @@ -1,14 +1,14 @@
-/* $NetBSD: machdep.c,v 1.57 2008/11/12 12:36:02 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.58 2008/11/30 18:21:34 martin Exp $ */
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tohru Nishimura.
+ *
  * 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.
 @@ -21,27 +21,27 @@
  * 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>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.57 2008/11/12 12:36:02 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.58 2008/11/30 18:21:34 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_compat_sunos.h"
 #include "opt_panicbutton.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/conf.h>
 @@ -209,27 +209,27 @@ consinit()
+{
 	if (sysconsole == 0)
 		syscnattach(0);
 	else {
 		omfb_cnattach();
 		ws_cnattach();
+	}
 #if NKSYMS || defined(DDB) || defined(MODULAR)
+	{
 		extern char end[];
 		extern int *esym;
-		ksyms_init(*(int *)&end, ((int *)&end) + 1, esym);
+		ksyms_addsyms_elf(*(int *)&end, ((int *)&end) + 1, esym);
+	}
 #endif
 #ifdef DDB
 	if (boothowto & RB_KDB)
 		cpu_Debugger();
 #endif
+}
 /*
  * cpu_startup: allocate memory for variable-sized tables.
  */
 void
 cpu_startup()

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.324 2008/11/12 12:36:03 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.325 2008/11/30 18:21:34 martin Exp $	*/
 /*
  * Copyright (c) 1982, 1990 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.
+ *
  * 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
 @@ -97,27 +97,27 @@
  * 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	7.16 (Berkeley) 6/3/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.324 2008/11/12 12:36:03 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.325 2008/11/30 18:21:34 martin Exp $");
 #include "opt_adb.h"
 #include "opt_ddb.h"
 #include "opt_ddbparam.h"
 #include "opt_kgdb.h"
 #include "opt_compat_netbsd.h"
 #include "akbd.h"
 #include "macfb.h"
 #include "zsc.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 @@ -372,27 +372,27 @@ consinit(void)
+		}
 #endif
 		mac68k_calibrate_delay();
 #if NZSC > 0 && defined(KGDB)
 		zs_kgdb_init();
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 		/*
 		 * Initialize kernel debugger, if compiled in.
 		 */
-		ksyms_init(symsize, ssym, esym);
+		ksyms_addsyms_elf(symsize, ssym, esym);
 #endif
 		if (boothowto & RB_KDB) {
 #ifdef KGDB
 			/* XXX - Ask on console for kgdb_dev? */
 			/* Note: this will just return if kgdb_dev==NODEV */
 			kgdb_connect(1);
 #else	/* KGDB */
 #ifdef DDB
 			/* Enter DDB.  We don't have a monitor PROM. */
 			Debugger();
 #endif /* DDB */
 #endif	/* KGDB */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.60 2008/11/12 12:36:04 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.61 2008/11/30 18:21:35 martin 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.60 2008/11/12 12:36:04 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.61 2008/11/30 18:21:35 martin Exp $");
 /* from: Utah Hdr: machdep.c 1.63 91/04/24 */
 #include "opt_ddb.h"
 #include "opt_kgdb.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>
 #include <sys/reboot.h>
 @@ -322,27 +322,27 @@ mach_init(argc, argv, envp, bim, bip)
 			howto = 0;
 			BOOT_FLAG(*cp, howto);
 			if (! howto)
 				printf("bootflag '%c' not recognised\n", *cp);
 			else
 				boothowto |= howto;
+		}
+	}
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	/* init symbols if present */
 	if (esym)
-		ksyms_init(esym - ssym, ssym, esym);
+		ksyms_addsyms_elf(esym - ssym, ssym, esym);
 #endif
 #ifdef DDB
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 #ifdef KGDB
 	zs_kgdb_init();			/* XXX */
 	if (boothowto & RB_KDB)
 		kgdb_connect(0);
 #endif
 #ifdef MFS
 	/*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.45 2008/11/12 12:36:04 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.46 2008/11/30 18:21:35 martin Exp $	*/
 /*-
  * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * 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
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -55,27 +55,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)machdep.c	7.4 (Berkeley) 6/3/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.45 2008/11/12 12:36:04 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.46 2008/11/30 18:21:35 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_memsize.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/user.h>
 #include <sys/mount.h>
 #include <sys/reboot.h>
 #include <sys/sysctl.h>
 #include <sys/msgbuf.h>
 #include <uvm/uvm_extern.h>
 @@ -249,27 +249,27 @@ initSH3(void *pc)	/* XXX return address
 	physmem = atop(IOM_RAM_SIZE);
 	uvm_page_physload(
 		kernend, atop(IOM_RAM_BEGIN + IOM_RAM_SIZE),
 		kernend, atop(IOM_RAM_BEGIN + IOM_RAM_SIZE),
 		VM_FREELIST_DEFAULT);
 	/* Initialize proc0 u-area */
 	sh_proc0_init();
 	/* Initialize pmap and start to address translation */
 	pmap_bootstrap();
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-	ksyms_init(1, end, end + 0x40000);			/* XXX */
+	ksyms_addsyms_elf(1, end, end + 0x40000);			/* XXX */
 #endif
 	/*
 	 * XXX We can't return here, because we change stack pointer.
 	 *     So jump to return address directly.
 	 */
 	__asm volatile (
 		"jmp	@%0;"
 		"mov	%1, r15"
 		:: "r"(pc),"r"(lwp0.l_md.md_pcb->pcb_sf.sf_r7_bank));
+}
 /*
  * consinit:

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.132 2008/11/25 15:51:34 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.133 2008/11/30 18:21:35 martin Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1990, 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.
+ *
  * 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
 @@ -67,27 +67,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.74 92/12/20$
+ *
  *	@(#)machdep.c	8.10 (Berkeley) 4/20/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.132 2008/11/25 15:51:34 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.133 2008/11/30 18:21:35 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_m060sp.h"
 #include "opt_panicbutton.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>
 #include <sys/reboot.h>
 #include <sys/conf.h>
 @@ -433,27 +433,27 @@ void
 consinit(void)
+{
 	/*
 	 * Initialize the console before we print anything out.
 	 */
 	cninit();
 #if NKSYMS || defined(DDB) || defined(MODULAR)
+	{
 		extern char end[];
 		extern int *esym;
-		ksyms_init((int)esym - (int)&end - sizeof(Elf32_Ehdr),
+		ksyms_addsyms_elf((int)esym - (int)&end - sizeof(Elf32_Ehdr),
 		    (void *)&end, esym);
+	}
 #endif
 #ifdef DDB
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
+}
 /*
  * cpu_startup: allocate memory for variable-sized tables,
  * initialize CPU, and do autoconfiguration.
  */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: netwinder_machdep.c,v 1.68 2008/11/12 12:36:04 ad Exp $	*/
+/*	$NetBSD: netwinder_machdep.c,v 1.69 2008/11/30 18:21:35 martin Exp $	*/
 /*
  * Copyright (c) 1997,1998 Mark Brinicombe.
  * Copyright (c) 1997,1998 Causality Limited.
  * 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
 @@ -30,27 +30,27 @@
  * 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.
+ *
  * Machine dependant functions for kernel setup for EBSA285 core architecture
  * using Netwinder firmware
+ *
  * Created      : 24/11/97
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netwinder_machdep.c,v 1.68 2008/11/12 12:36:04 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netwinder_machdep.c,v 1.69 2008/11/30 18:21:35 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_pmap_debug.h"
 #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>
 @@ -845,31 +845,26 @@ initarm(void *arg)
 	/* Setup the IRQ system */
 	printf("irq ");
 	footbridge_intr_init();
 	printf("done.\n");
 	/*
 	 * Warn the user if the bootinfo was bogus.  We already
 	 * faked up some safe values.
 	 */
 	if (nwbootinfo.bi_pagesize == 0xdeadbeef)
 		printf("WARNING: NeTTrom boot info corrupt\n");
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	/* Firmware doesn't load symbols. */
 	ksyms_init(0, NULL, NULL);
 #endif
 #ifdef DDB
 	db_machine_init();
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 	/* Turn the led green */
 	ISA_PUTBYTE(0x338, 0x06);
 	/* We return the new stack pointer address */
 	return(kernelstack.pv_va + USPACE_SVC_STACK_TOP);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.75 2008/11/25 15:51:34 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.76 2008/11/30 18:21:35 martin Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1990, 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.
+ *
  * 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
 @@ -67,27 +67,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.74 92/12/20$
+ *
  *	@(#)machdep.c	8.10 (Berkeley) 4/20/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.75 2008/11/25 15:51:34 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.76 2008/11/30 18:21:35 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/mount.h>
 @@ -1075,21 +1075,21 @@ consinit(void)
 	int dipsw = *dip_switch;
 	dipsw &= ~SW_CONSOLE;
 	switch (dipsw & SW_CONSOLE) {
 	    default: /* XXX no fb support yet */
 	    case 0:
 		tty00_is_console = 1;
 		cn_tab = &consdev_zs;
 		(*cn_tab->cn_init)(cn_tab);
 		break;
+	}
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-	ksyms_init((int)esym - (int)&end - sizeof(Elf32_Ehdr),
+	ksyms_addsyms_elf((int)esym - (int)&end - sizeof(Elf32_Ehdr),
 		    (void *)&end, esym);
 #endif
 #ifdef DDB
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.100 2008/11/12 12:36:04 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.101 2008/11/30 18:21:35 martin 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.100 2008/11/12 12:36:04 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.101 2008/11/30 18:21:35 martin Exp $");
 /* from: Utah Hdr: machdep.c 1.63 91/04/24 */
 #include "fs_mfs.h"
 #include "opt_ddb.h"
 #include "opt_execfmt.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>
 @@ -331,27 +331,27 @@ mach_init(int x_boothowto, int x_bootdev
 	 * Initialize locore-function vector.
 	 * Clear out the I and D caches.
 	 */
 	mips_vector_init();
 	/*
 	 * We know the CPU type now.  Initialize our DMA tags (might
 	 * need this early).
 	 */
 	newsmips_bus_dma_init();
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	if (nsym)
-		ksyms_init(esym - ssym, ssym, esym);
+		ksyms_addsyms_elf(esym - ssym, ssym, esym);
 #endif
 #ifdef KADB
 	boothowto |= RB_KDB;
 #endif
 #ifdef MFS
 	/*
 	 * Check to see if a mini-root was loaded into memory. It resides
 	 * at the start of the next page just after the end of BSS.
 	 */
 	if (boothowto & RB_MINIROOT)
 		kernend += round_page(mfs_initminiroot(kernend));

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.88 2008/11/25 15:51:34 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.89 2008/11/30 18:21:35 martin Exp $	*/
 /*
  * Copyright (c) 1998 Darrin B. Jewell
  * Copyright (c) 1982, 1986, 1990, 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.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -69,27 +69,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.74 92/12/20$
+ *
  *	@(#)machdep.c	8.10 (Berkeley) 4/20/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.88 2008/11/25 15:51:34 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.89 2008/11/30 18:21:35 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.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>
 #include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 @@ -278,27 +278,27 @@ consinit(void)
 	/*
 	 * Generic console: sys/dev/cons.c
 	 *	Initializes either ite or ser as console.
 	 *	Can be called from locore.s and init_main.c.
 	 */
 	if (!init) {
 		cninit();
 #if defined(KGDB) && (NZSC > 0)
 		zs_kgdb_init();
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 		/* Initialize kernel symbol table, if compiled in. */
-		ksyms_init(nsym, ssym, esym);
+		ksyms_addsyms_elf(nsym, ssym, esym);
 #endif
 		if (boothowto & RB_KDB) {
 #if defined(KGDB)
 			kgdb_connect(1);
 #elif defined(DDB)
 			Debugger();
 #endif
+		}
 		init = 1;
 	} else {
 		next68k_calibrate_delay();
+	}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.225 2008/11/12 12:36:05 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.226 2008/11/30 18:21:35 martin 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:
 @@ -67,27 +67,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
  * 	from: Utah Hdr: machdep.c 1.63 91/04/24
  */
 #include <sys/cdefs.h>			/* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.225 2008/11/12 12:36:05 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.226 2008/11/30 18:21:35 martin Exp $");
 #include "fs_mfs.h"
 #include "opt_ddb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/user.h>
 #include <sys/mount.h>
 #include <sys/kcore.h>
 #include <sys/boot_flag.h>
 @@ -323,27 +323,27 @@ mach_init(argc, argv, code, cv, bim, bip
 #ifdef MFS
 	/*
 	 * Check to see if a mini-root was loaded into memory. It resides
 	 * at the start of the next page just after the end of BSS.
 	 */
 	if (boothowto & RB_MINIROOT)
 		kernend += round_page(mfs_initminiroot(kernend));
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	/* init symbols if present */
 	if (esym)
-		ksyms_init((char *)esym - (char *)ssym, ssym, esym);
+		ksyms_addsyms_elf((char *)esym - (char *)ssym, ssym, esym);
 #endif
 #ifdef DDB
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 	/*
 	 * Alloc u pages for proc0 stealing KSEG0 memory.
 	 */
 	lwp0.l_addr = proc0paddr = (struct user *)kernend;
 	lwp0.l_md.md_regs = (struct frame *)(kernend + USPACE) - 1;
 	memset(lwp0.l_addr, 0, USPACE);
 	proc0paddr->u_pcb.pcb_context[11] =

 @@ -1,14 +1,14 @@
-/* $NetBSD: ofwoea_machdep.c,v 1.15 2008/11/12 12:36:05 ad Exp $ */
+/* $NetBSD: ofwoea_machdep.c,v 1.16 2008/11/30 18:21:35 martin Exp $ */
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tim Rightnour
+ *
  * 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,27 +20,27 @@
  * ``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: ofwoea_machdep.c,v 1.15 2008/11/12 12:36:05 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.16 2008/11/30 18:21:35 martin Exp $");
 #include "opt_ppcarch.h"
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_ipkdb.h"
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/boot_flag.h>
 #include <sys/extent.h>
 #include <sys/kernel.h>
 #include <sys/ksyms.h>
 @@ -229,27 +229,27 @@ ofwoea_initppc(u_int startkernel, u_int
 	if (oeacpufeat & OEACPU_64_BRIDGE)
 		pmap_setup_segment0_map(0, 0xf4000000, 0xf4000000, 0x1000, 0x0);
 #endif /* PMAC_G5 */
 #endif /* PPC_OEA64 || PPC_OEA64_BRIDGE */
 	/* Now enable translation (and machine checks/recoverable interrupts) */
 	__asm __volatile ("sync; mfmsr %0; ori %0,%0,%1; mtmsr %0; isync"
 	    : "=r"(scratch)
 	    : "K"(PSL_IR|PSL_DR|PSL_ME|PSL_RI));
 	restore_ofmap(ofmap, ofmaplen);
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-	ksyms_init((int)((u_int)endsym - (u_int)startsym), startsym, endsym);
+	ksyms_addsyms_elf((int)((u_int)endsym - (u_int)startsym), startsym, endsym);
 #endif
 	/* CPU clock stuff */
 	set_timebase();
+}
 void
 set_timebase(void)
+{
 	int qhandle, phandle, msr, scratch;
 	char type[32];
 	if (timebase_freq != 0) {

 @@ -1,14 +1,14 @@
-/* $NetBSD: prep_machdep.c,v 1.4 2008/11/12 12:36:05 ad Exp $ */
+/* $NetBSD: prep_machdep.c,v 1.5 2008/11/30 18:21:35 martin Exp $ */
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tim Rightnour
+ *
  * 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.
 @@ -27,27 +27,27 @@
  * 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.
  */
 /*
  * This is a set of general routines that most PReP-similar machines have
  * in common.  Machines that use these routines do not have to be fully
  * PReP compliant, the only requirement is that they use a PReP memory map.
  * IE, io at 0x80000000 and mem at 0xc0000000.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: prep_machdep.c,v 1.4 2008/11/12 12:36:05 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: prep_machdep.c,v 1.5 2008/11/30 18:21:35 martin Exp $");
 #include <sys/param.h>
 #include <sys/extent.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/reboot.h>
 #include <sys/ksyms.h>
 #include <uvm/uvm_extern.h>
 #include <machine/powerpc.h>
 #include <machine/bus.h>
 #include <machine/pmap.h>
 #include <powerpc/oea/bat.h>
 @@ -156,27 +156,27 @@ prep_initppc(u_long startkernel, u_long
 	/* Initialize bus_space. */
 	prep_bus_space_init();
 	/* Initialize the console asap. */
 	consinit();
 	/* Set the page size */
 	uvm_setpagesize();
 	/* Initialize pmap module */
 	pmap_bootstrap(startkernel, endkernel);
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-	ksyms_init((int)((u_long)endsym - (u_long)startsym), startsym, endsym);
+	ksyms_addsyms_elf((int)((u_long)endsym - (u_long)startsym), startsym, endsym);
 #endif
 #ifdef DDB
 	boothowto = args;
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
+}
 void
 mem_regions(struct mem_region **mem, struct mem_region **avail)
+{

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.4 2008/11/12 12:36:05 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.5 2008/11/30 18:21:35 martin Exp $	*/
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Tim Rightnour
+ *
  * 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,27 +20,27 @@
  * ``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.4 2008/11/12 12:36:05 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.5 2008/11/30 18:21:35 martin Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/exec.h>
 #include <sys/extent.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 @@ -371,27 +371,27 @@ initppc(u_long startkernel, u_long endke
 	printf("sysinfo scr_addr %p -> %x\n", sysinfo->scr_addr,
 	    *sysinfo->scr_addr);
 #endif
 	/* Initialize bus_space. */
 	rs6000_bus_space_init();
 	setled(0x40600000);
 	/* Initialize the console */
 	consinit();
 	setled(0x41000000);
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-	ksyms_init((int)((u_long)endsym - (u_long)startsym), startsym, endsym);
+	ksyms_addsyms_elf((int)((u_long)endsym - (u_long)startsym), startsym, endsym);
 #endif
 #ifdef DDB
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
+}
 void
 mem_regions(struct mem_region **mem, struct mem_region **avail)
+{
 	*mem = physmemr;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.44 2008/11/12 12:36:05 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.45 2008/11/30 18:21:35 martin Exp $	*/
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
  * Copyright (C) 1995, 1996 TooLs GmbH.
  * 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
 @@ -22,27 +22,27 @@
  * 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.44 2008/11/12 12:36:05 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.45 2008/11/30 18:21:35 martin Exp $");
 #include "opt_compat_netbsd.h"
 #include "opt_ddb.h"
 #include "opt_ipkdb.h"
 #include <sys/param.h>
 #include <sys/buf.h>
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/exec.h>
 #include <sys/extent.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 @@ -169,45 +169,45 @@ initppc(u_int startkernel, u_int endkern
 	 */
 	oea_batinit(
 x80000000, BAT_BL_256M,	/* SANDPOINT_BUS_SPACE_MEM */
 xfc000000, BAT_BL_64M,	/* _EUMB|_IO */
 );
 	/* Install vectors and interrupt handler */
 	oea_init(NULL);
 #if 1 /* bumpy ride in pre-dawn time, for people knows what he/she is doing */
 	cn_tab = &kcomcons;
 	(*cn_tab->cn_init)(&kcomcons);
-	ksyms_init((int)((u_int)endsym - (u_int)startsym), startsym, endsym);
+	ksyms_addsyms_elf((int)((u_int)endsym - (u_int)startsym), startsym, endsym);
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 	/* Initialize bus_space */
 	sandpoint_bus_space_init();
 	/* Initialize the console */
 	consinit();
 	/* Set the page size */
 	uvm_setpagesize();
 	/* Initialize pmap module */
 	pmap_bootstrap(startkernel, endkernel);
 #if 0 /* NKSYMS || defined(DDB) || defined(MODULAR) */
-	ksyms_init((int)((u_int)endsym - (u_int)startsym), startsym, endsym);
+	ksyms_addsyms_elf((int)((u_int)endsym - (u_int)startsym), startsym, endsym);
 #endif
 #ifdef IPKDB
 	/*
 	 * Now trap to IPKDB
 	 */
 	ipkdb_init();
 	if (boothowto & RB_KDB)
 		ipkdb_connect(0);
 #endif
+}
 void
 mem_regions(struct mem_region **mem, struct mem_region **avail)

 @@ -1,14 +1,14 @@
-/* $NetBSD: machdep.c,v 1.40 2008/11/12 12:36:05 ad Exp $ */
+/* $NetBSD: machdep.c,v 1.41 2008/11/30 18:21:35 martin Exp $ */
 /*
  * Copyright 2000, 2001
  * Broadcom Corporation. All rights reserved.
+ *
  * This software is furnished under license and may be used and copied only
  * in accordance with the following terms and conditions.  Subject to these
  * conditions, you may download, copy, install, use, modify and distribute
  * modified or unmodified copies of this software in source and/or binary
  * form. No title or ownership is transferred hereby.
+ *
  * 1) Any source code used, modified or distributed must reproduce and
  *    retain this copyright notice and list of conditions as they appear in
 @@ -48,27 +48,27 @@
  * 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 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.40 2008/11/12 12:36:05 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.41 2008/11/30 18:21:35 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_execfmt.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/malloc.h>
 @@ -321,27 +321,27 @@ mach_init(long fwhandle, long magic, lon
 	 */
 	p0 = (void *)pmap_steal_memory(USPACE, NULL, NULL);
 	lwp0.l_addr = proc0paddr = (struct user *)p0;
 	lwp0.l_md.md_regs = (struct frame *)((char *)p0 + USPACE) - 1;
 	proc0paddr->u_pcb.pcb_context[11] =
 	    MIPS_INT_MASK | MIPS_SR_INT_IE; /* SR */
 	pmap_bootstrap();
 	/*
 	 * Initialize debuggers, and break into them, if appropriate.
 	 */
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-	ksyms_init(((uintptr_t)ksym_end - (uintptr_t)ksym_start),
+	ksyms_addsyms_elf(((uintptr_t)ksym_end - (uintptr_t)ksym_start),
 	    ksym_start, ksym_end);
 #endif
 	if (boothowto & RB_KDB) {
 #if defined(DDB)
 		Debugger();
 #endif
+	}
+}
 /*
  * Allocate memory for variable-sized tables,
  */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.123 2008/11/12 12:36:06 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.124 2008/11/30 18:21:35 martin 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.123 2008/11/12 12:36:06 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.124 2008/11/30 18:21:35 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_execfmt.h"
 #include "opt_cputype.h"
 #include "opt_mips_cache.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 @@ -475,31 +475,27 @@ mach_init(int argc, char *argv[], u_int
+		}
+	}
 #ifdef DEBUG
 	boothowto |= AB_DEBUG;
 #endif
 	aprint_debug("argc = %d\n", argc);
 	for (i = 0; i < argc; i++)
 		aprint_debug("argv[%d] = %s\n", i, argv[i]);
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	/* init symbols if present */
 	if (esym)
-		ksyms_init(nsym, ssym, esym);
+		ksyms_addsyms_elf(nsym, ssym, esym);
 #ifdef SYMTAB_SPACE
 	else
 		ksyms_init(0, NULL, NULL);
 #endif /* SYMTAB_SPACE */
 #endif /* NKSYMS || defined(DDB) || defined(MODULAR) */
 #if defined(KGDB) || defined(DDB)
 	/* Set up DDB hook to turn off watchdog on entry */
 	db_trap_callback = ddb_trap_hook;
 #ifdef DDB
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 #ifdef KGDB
 	kgdb_port_init();

 @@ -1,14 +1,14 @@
-/*	$NetBSD: shark_machdep.c,v 1.31 2008/11/12 12:36:06 ad Exp $	*/
+/*	$NetBSD: shark_machdep.c,v 1.32 2008/11/30 18:21:36 martin Exp $	*/
 /*
  * Copyright 1997
  * Digital Equipment Corporation. All rights reserved.
+ *
  * This software is furnished under license and may be used and
  * copied only in accordance with the following terms and conditions.
  * Subject to these conditions, you may download, copy, install,
  * use, modify and distribute this software in source and/or binary
  * form. No title or ownership is transferred hereby.
+ *
  * 1) Any source code used, modified or distributed must reproduce
  *    and retain this copyright notice and list of conditions as
 @@ -28,27 +28,27 @@
  *    liable for any damages whatsoever, and in particular, DIGITAL
  *    shall not be liable for special, indirect, consequential, or
  *    incidental damages or damages for lost profits, loss of
  *    revenue or loss of use, whether such damages arise in contract,
  *    negligence, tort, under statute, in equity, at law or otherwise,
  *    even if advised of the possibility of such damage.
  */
 /*
  *  Kernel setup for the SHARK Configuration
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: shark_machdep.c,v 1.31 2008/11/12 12:36:06 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shark_machdep.c,v 1.32 2008/11/30 18:21:36 martin Exp $");
 #include "opt_ddb.h"
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/reboot.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/buf.h>
 #include <sys/exec.h>
 #include <sys/ksyms.h>
 @@ -290,35 +290,33 @@ initarm(void *arg)
 	shark_fiqhandler.fh_regs = &shark_fiqregs;
 	shark_fiqregs.fr_r8   = isa_io_virtaddr;
 	shark_fiqregs.fr_r9   = 0; /* no routine right now */
 	shark_fiqregs.fr_r10  = 0; /* no arg right now */
 	shark_fiqregs.fr_r11  = 0; /* scratch */
 	shark_fiqregs.fr_r12  = 0; /* scratch */
 	shark_fiqregs.fr_r13  = 0; /* must set a stack when r9 is set! */
 	if (fiq_claim(&shark_fiqhandler))
 		panic("Cannot claim FIQ vector.");
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-#ifdef __ELF__
+#ifndef __ELF__		/* XXX */
 	ksyms_init(0, NULL, NULL);	/* XXX */
 #else
+	{
 		struct exec *kernexec = (struct exec *)KERNEL_TEXT_BASE;
 		extern int end;
 		extern char *esym;
-		ksyms_init(kernexec->a_syms, &end, esym);
+		ksyms_addsyms_elf(kernexec->a_syms, &end, esym);
+	}
 #endif /* __ELF__ */
 #endif /* NKSYMS || defined(DDB) || defined(MODULAR) */
 #ifdef DDB
 	db_machine_init();
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 	/* Return the new stackbase. */
 	return(kernelstack.pv_va + USPACE_SVC_STACK_TOP);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: autoconf.c,v 1.230 2008/11/12 12:36:06 ad Exp $ */
+/*	$NetBSD: autoconf.c,v 1.231 2008/11/30 18:21:36 martin Exp $ */
 /*
  * Copyright (c) 1996
  *    The President and Fellows of Harvard College. All rights reserved.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
 @@ -38,27 +38,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)autoconf.c	8.4 (Berkeley) 10/1/93
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.230 2008/11/12 12:36:06 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.231 2008/11/30 18:21:36 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_multiprocessor.h"
 #include "opt_sparc_arch.h"
 #include "scsibus.h"
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/endian.h>
 #include <sys/proc.h>
 @@ -311,27 +311,27 @@ bootstrap(void)
 	 * bytes available for the buffer at this location (see the
 	 * comment in locore.s at the top of the .text segment).
 	 */
 	initmsgbuf((void *)KERNBASE, 8192);
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	if ((bi_sym = lookup_bootinfo(BTINFO_SYMTAB)) != NULL) {
 		if (bi_sym->ssym < KERNBASE) {
 			/* Assume low-loading boot loader */
 			bi_sym->ssym += KERNBASE;
 			bi_sym->esym += KERNBASE;
+		}
-		ksyms_init(bi_sym->nsym, (int *)bi_sym->ssym,
+		ksyms_addsyms_elf(bi_sym->nsym, (int *)bi_sym->ssym,
 		    (int *)bi_sym->esym);
+	}
 #endif
 #if defined(SUN4M)
 	/*
 	 * sun4m bootstrap is complex and is totally different for "normal" 4m
 	 * and for microSPARC-IIep - so it's split into separate functions.
 	 */
 	if (CPU_ISSUN4M) {
 #if !defined(MSIIEP)
 		bootstrap4m();
 #else

 @@ -1,14 +1,14 @@
-/*	$NetBSD: autoconf.c,v 1.157 2008/11/12 12:36:06 ad Exp $ */
+/*	$NetBSD: autoconf.c,v 1.158 2008/11/30 18:21:36 martin Exp $ */
 /*
  * Copyright (c) 1996
  *    The President and Fellows of Harvard College. All rights reserved.
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This software was developed by the Computer Systems Engineering group
  * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
  * contributed to Berkeley.
+ *
  * All advertising materials mentioning features or use of this software
  * must display the following acknowledgement:
 @@ -38,27 +38,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)autoconf.c	8.4 (Berkeley) 10/1/93
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.157 2008/11/12 12:36:06 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.158 2008/11/30 18:21:36 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_multiprocessor.h"
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/systm.h>
 #include <sys/buf.h>
 #include <sys/disklabel.h>
 #include <sys/device.h>
 #include <sys/disk.h>
 #include <sys/conf.h>
 @@ -303,27 +303,27 @@ die_old_boot_loader:
 		printf("No bootinfo information.\n");
 		goto die_old_boot_loader;
+	}
 	bootinfo = (void*)(u_long)((uint64_t*)bi)[1];
 	LOOKUP_BOOTINFO(bi_kend, BTINFO_KERNEND);
 	if (bi_kend->addr == (vaddr_t)0) {
 		panic("Kernel end address is not found in bootinfo.\n");
+	}
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	LOOKUP_BOOTINFO(bi_sym, BTINFO_SYMTAB);
-	ksyms_init(bi_sym->nsym, (int *)(u_long)bi_sym->ssym,
+	ksyms_addsyms_elf(bi_sym->nsym, (int *)(u_long)bi_sym->ssym,
 			(int *)(u_long)bi_sym->esym);
 #ifdef DDB
 #ifdef __arch64__
 	/* This can only be installed on an 64-bit system cause otherwise our stack is screwed */
 	OF_set_symbol_lookup(OF_sym2val, OF_val2sym);
 #else
 	OF_set_symbol_lookup(OF_sym2val32, OF_val2sym32);
 #endif
 #endif
 #endif
 	LOOKUP_BOOTINFO(bi_count, BTINFO_DTLB_SLOTS);
 	kernel_tlb_slots = bi_count->count;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.56 2008/11/25 15:51:34 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.57 2008/11/30 18:21:36 martin Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1990, 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.
+ *
  * 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
 @@ -143,27 +143,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)machdep.c	8.6 (Berkeley) 1/14/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.56 2008/11/25 15:51:34 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.57 2008/11/30 18:21:36 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_fpu_emulate.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 @@ -291,27 +291,27 @@ cpu_startup(void)
 	 * for its vector table and other stuff.)
 	 * Its mapping was prepared in pmap_bootstrap().
 	 * Also, offset some to avoid PROM scribbles.
 	 */
 	v = (void *) (PAGE_SIZE * 4);
 	msgbufaddr = (void *)((char *)v + MSGBUFOFF);
 	initmsgbuf(msgbufaddr, MSGBUFSIZE);
 #if NKSYMS || defined(DDB) || defined(MODULAR)
+	{
 		extern int nsym;
 		extern char *ssym, *esym;
-		ksyms_init(nsym, ssym, esym);
+		ksyms_addsyms_elf(nsym, ssym, esym);
+	}
 #endif /* DDB */
 	/*
 	 * Good {morning,afternoon,evening,night}.
 	 */
 	printf("%s%s", copyright, version);
 	identifycpu();
 	fputype = FPU_NONE;
 #ifdef  FPU_EMULATE
 	printf("fpu: emulator\n");
 #else
 	printf("fpu: no math support\n");

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.188 2008/11/25 15:51:35 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.189 2008/11/30 18:21:36 martin Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1990, 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.
+ *
  * 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
 @@ -68,27 +68,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.
+ *
  *	from: Utah Hdr: machdep.c 1.74 92/12/20
  *	from: @(#)machdep.c	8.10 (Berkeley) 4/20/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.188 2008/11/25 15:51:35 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.189 2008/11/30 18:21:36 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/device.h>
 @@ -174,27 +174,27 @@ consinit(void)
+{
 	/*
 	 * Switch from the PROM console (output only)
 	 * to our own console driver.
 	 */
 	cninit();
 #if NKSYMS || defined(DDB) || defined(MODULAR)
+	{
 		extern int nsym;
 		extern char *ssym, *esym;
-		ksyms_init(nsym, ssym, esym);
+		ksyms_addsyms_elf(nsym, ssym, esym);
+	}
 #endif /* DDB */
 	/*
 	 * Now that the console can do input as well as
 	 * output, consider stopping for a debugger.
 	 */
 	if (boothowto & RB_KDB) {
 #ifdef KGDB
 		/* XXX - Ask on console for kgdb_dev? */
 		/* Note: this will just return if kgdb_dev==NODEV */
 		kgdb_connect(1);
 #else	/* KGDB */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.114 2008/11/25 15:51:35 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.115 2008/11/30 18:21:36 martin Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1990, 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.
+ *
  * 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
 @@ -65,27 +65,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.
+ *
  *	from: Utah Hdr: machdep.c 1.74 92/12/20
  *	from: @(#)machdep.c	8.10 (Berkeley) 4/20/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.114 2008/11/25 15:51:35 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.115 2008/11/30 18:21:36 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
 #include <sys/reboot.h>
 #include <sys/conf.h>
 #include <sys/file.h>
 #include <sys/device.h>
 @@ -175,27 +175,27 @@ consinit(void)
+{
 	/*
 	 * Switch from the PROM console (output only)
 	 * to our own console driver.
 	 */
 	cninit();
 #if NKSYMS || defined(DDB) || defined(MODULAR)
+	{
 		extern int nsym;
 		extern char *ssym, *esym;
-		ksyms_init(nsym, ssym, esym);
+		ksyms_addsyms_elf(nsym, ssym, esym);
+	}
 #endif	/* DDB */
 	/*
 	 * Now that the console can do input as well as
 	 * output, consider stopping for a debugger.
 	 */
 	if (boothowto & RB_KDB) {
 #ifdef KGDB
 		/* XXX - Ask on console for kgdb_dev? */
 		/* Note: this will just return if kgdb_dev==NODEV */
 		kgdb_connect(1);
 #else	/* KGDB */

 @@ -1,14 +1,14 @@
-/* $NetBSD: machdep.c,v 1.170 2008/11/19 20:26:40 hans Exp $	 */
+/* $NetBSD: machdep.c,v 1.171 2008/11/30 18:21:36 martin Exp $	 */
 /*
  * Copyright (c) 1982, 1986, 1990 The Regents of the University of California.
  * All rights reserved.
+ *
  * Changed for the VAX port (and for readability) /IC
+ *
  * This code is derived from software contributed to Berkeley by the Systems
  * Programming Group of the University of Utah Computer Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -73,27 +73,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	7.16 (Berkeley) 6/3/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.170 2008/11/19 20:26:40 hans Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.171 2008/11/30 18:21:36 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_compat_netbsd.h"
 #include "opt_compat_ultrix.h"
 #include "opt_multiprocessor.h"
 #include "opt_lockdebug.h"
 #include "opt_compat_ibcs2.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/extent.h>
 #include <sys/proc.h>
 #include <sys/user.h>
 @@ -314,27 +314,27 @@ consinit(void)
 	 * for the console routines.
 	 */
 	KASSERT(iospace != 0);
 	iomap_ex = extent_create("iomap", iospace + VAX_NBPG,
 	    iospace + ((IOSPSZ * VAX_NBPG) - 1), M_DEVBUF,
 	    (void *) iomap_ex_storage, sizeof(iomap_ex_storage),
 	    EX_NOCOALESCE|EX_NOWAIT);
 #ifdef DEBUG
 	iospace_inited = 1;
 #endif
 	cninit();
 #if NKSYMS || defined(DDB) || defined(MODULAR)
 	if (symtab_start != NULL && symtab_nsyms != 0 && symtab_end != NULL) {
-		ksyms_init(symtab_nsyms, symtab_start, symtab_end);
+		ksyms_addsyms_elf(symtab_nsyms, symtab_start, symtab_end);
+	}
 #endif
 #ifdef DEBUG
 	if (sizeof(struct user) > REDZONEADDR)
 		panic("struct user inside red zone");
 #endif
+}
 int	waittime = -1;
 static	volatile int showto; /* Must be volatile to survive MM on -> MM off */
 void
 cpu_reboot(int howto, char *b)

 @@ -1,14 +1,14 @@
-/*	$NetBSD: machdep.c,v 1.153 2008/11/25 15:51:35 ad Exp $	*/
+/*	$NetBSD: machdep.c,v 1.154 2008/11/30 18:21:36 martin Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1990, 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.
+ *
  * 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
 @@ -67,27 +67,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.74 92/12/20$
+ *
  *	@(#)machdep.c	8.10 (Berkeley) 4/20/94
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.153 2008/11/25 15:51:35 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.154 2008/11/30 18:21:36 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
 #include "opt_compat_netbsd.h"
 #include "opt_m680x0.h"
 #include "opt_fpu_emulate.h"
 #include "opt_m060sp.h"
 #include "opt_panicbutton.h"
 #include "opt_extmem.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 @@ -218,27 +218,27 @@ consinit(void)
 	 * bring graphics layer up.
 	 */
 	config_console();
 	/*
 	 * Initialize the console before we print anything out.
 	 */
 	cninit();
 #ifdef KGDB
 	zs_kgdb_init();			/* XXX */
 #endif
 #if NKSYMS || defined(DDB) || defined(MODULAR)
-	ksyms_init((int)esym - (int)&end - sizeof(Elf32_Ehdr),
+	ksyms_addsyms_elf((int)esym - (int)&end - sizeof(Elf32_Ehdr),
 		 (void *)&end, esym);
 #endif
 #ifdef DDB
 	if (boothowto & RB_KDB)
 		Debugger();
 #endif
 	/*
 	 * Tell the VM system about available physical memory.
 	 */
 	uvm_page_physload(atop(avail_start), atop(avail_end),
 			atop(avail_start), atop(avail_end),
 			VM_FREELIST_DEFAULT);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: db_sym.c,v 1.57 2008/10/24 13:55:42 christos Exp $	*/
+/*	$NetBSD: db_sym.c,v 1.58 2008/11/30 18:21:36 martin Exp $	*/
 /*
  * Mach Operating System
  * Copyright (c) 1991,1990 Carnegie Mellon University
  * All Rights Reserved.
+ *
  * Permission to use, copy, modify and distribute this software and its
  * documentation is hereby granted, provided that both the copyright
  * notice and this permission notice appear in all copies of the
  * software, derivative works or modified versions, and any portions
  * thereof, and that both notices appear in supporting documentation.
+ *
  * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
 @@ -17,27 +17,27 @@
+ *
  * Carnegie Mellon requests users of this software to return to
+ *
  *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
  *  School of Computer Science
  *  Carnegie Mellon University
  *  Pittsburgh PA 15213-3890
+ *
  * any improvements or extensions that they make and grant Carnegie the
  * rights to redistribute these changes.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_sym.c,v 1.57 2008/10/24 13:55:42 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_sym.c,v 1.58 2008/11/30 18:21:36 martin Exp $");
 #include "opt_ddbparam.h"
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 #include <sys/ksyms.h>
 #include <machine/db_machdep.h>
 #include <ddb/db_lex.h>
 #include <ddb/db_sym.h>
 #include <ddb/db_output.h>
 @@ -62,27 +62,27 @@ extern db_symformat_t db_symformat_aout;
  * table.  Note that if initializing the master symbol table fails,
  * no other symbol tables can be loaded.
  */
 void
 ddb_init(int symsize, void *vss, void *vse)
+{
 #ifdef DB_AOUT_SYMBOLS
 	db_symformat = &db_symformat_aout;
 	if ((*db_symformat->sym_init)(symsize, vss, vse, TBLNAME) == true) {
 		using_aout_symtab = true;
 		return;
+	}
 #endif
-	ksyms_init(symsize, vss, vse);	/* Will complain if necessary */
+	ksyms_addsyms_elf(symsize, vss, vse);	/* Will complain if necessary */
+}
 bool
 db_eqname(const char *src, const char *dst, int c)
+{
 	if (!strcmp(src, dst))
 		return (true);
 	if (src[0] == c)
 		return (!strcmp(src+1,dst));
 	return (false);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: init_main.c,v 1.375 2008/11/18 11:36:58 pooka Exp $	*/
+/*	$NetBSD: init_main.c,v 1.376 2008/11/30 18:21:36 martin Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * 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.
 @@ -87,27 +87,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS 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.
+ *
  *	@(#)init_main.c	8.16 (Berkeley) 5/14/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.375 2008/11/18 11:36:58 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: init_main.c,v 1.376 2008/11/30 18:21:36 martin Exp $");
 #include "opt_ddb.h"
 #include "opt_ipsec.h"
 #include "opt_ntp.h"
 #include "opt_pipe.h"
 #include "opt_syscall_debug.h"
 #include "opt_sysv.h"
 #include "opt_fileassoc.h"
 #include "opt_ktrace.h"
 #include "opt_pax.h"
 #include "opt_wapbl.h"
 #include "rnd.h"
 @@ -325,26 +325,28 @@ main(void)
 #endif
 	/*
 	 * Attempt to find console and initialize
 	 * in case of early panic or other messages.
 	 */
 	consinit();
 	kernel_lock_init();
 	once_init();
 	uvm_init();
 	ksyms_init();
 	percpu_init();
 	/* Initialize lock caches. */
 	mutex_obj_init();
 	/* Initialize the extent manager. */
 	extent_init();
 	/* Do machine-dependent initialization. */
 	cpu_startup();
 	/* Initialize callouts, part 1. */
 	callout_startup();

 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_ksyms.c,v 1.46 2008/11/16 16:15:58 ad Exp $	*/
+/*	$NetBSD: kern_ksyms.c,v 1.47 2008/11/30 18:21:36 martin Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software developed for The NetBSD Foundation
  * by Andrew Doran.
+ *
  * 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.
 @@ -61,27 +61,27 @@
+ *
  * For each loaded module the symbol table info is kept track of by a
  * struct, placed in a circular list. The first entry is the kernel
  * symbol table.
  */
 /*
  * TODO:
+ *
  *	Add support for mmap, poll.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c,v 1.46 2008/11/16 16:15:58 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c,v 1.47 2008/11/30 18:21:36 martin Exp $");
 #ifdef _KERNEL
 #include "opt_ddb.h"
 #include "opt_ddbparam.h"	/* for SYMTAB_SPACE */
 #endif
 #define _KSYMS_PRIVATE
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/exec.h>
 #include <sys/systm.h>
 #include <sys/conf.h>
 @@ -194,26 +194,33 @@ findsym(const char *name, struct ksyms_s
+	}
 	return NULL;
+}
 /*
  * The "attach" is in reality done in ksyms_init().
  */
 void
 ksymsattach(int arg)
+{
+}
 void
 ksyms_init()
+{
 	mutex_init(&ksyms_lock, MUTEX_DEFAULT, IPL_NONE);
+}
 /*
  * Add a symbol table.
  * This is intended for use when the symbol table and its corresponding
  * string table are easily available.  If they are embedded in an ELF
  * image, use addsymtab_elf() instead.
+ *
  * name - Symbol's table name.
  * symstart, symsize - Address and size of the symbol table.
  * strstart, strsize - Address and size of the string table.
  * tab - Symbol table to be updated with this information.
  * newstart - Address to which the symbol table has to be copied during
  *            shrinking.  If NULL, it is not moved.
  */
 @@ -320,35 +327,34 @@ addsymtab(const char *name, void *symsta
 		panic("addsymtab");
 	/* ksymsread() is unlocked, so membar. */
 	membar_producer();
 	TAILQ_INSERT_TAIL(&ksyms_symtabs, tab, sd_queue);
 	ksyms_sizes_calc();
 	ksyms_initted = true;
+}
 /*
  * Setup the kernel symbol table stuff.
  */
 void
-ksyms_init(int symsize, void *start, void *end)
+ksyms_addsyms_elf(int symsize, void *start, void *end)
+{
 	int i, j;
 	Elf_Shdr *shdr;
 	char *symstart = NULL, *strstart = NULL;
 	size_t strsize = 0;
 	Elf_Ehdr *ehdr;
 	mutex_init(&ksyms_lock, MUTEX_DEFAULT, IPL_NONE);
 #ifdef SYMTAB_SPACE
 	if (symsize <= 0 &&
 	    strncmp(db_symtab, SYMTAB_FILLER, sizeof(SYMTAB_FILLER))) {
 		symsize = db_symtabsize;
 		start = db_symtab;
 		end = db_symtab + db_symtabsize;
+	}
 #endif
 	if (symsize <= 0) {
 		printf("[ Kernel symbol table missing! ]\n");
 		return;
+	}
 @@ -401,32 +407,30 @@ ksyms_init(int symsize, void *start, voi
 	    (long)kernel_symtab.sd_symsize/sizeof(Elf_Sym));
 #endif
+}
 /*
  * Setup the kernel symbol table stuff.
  * Use this when the address of the symbol and string tables are known;
  * otherwise use ksyms_init with an ELF image.
  * We need to pass a minimal ELF header which will later be completed by
  * ksyms_hdr_init and handed off to userland through /dev/ksyms.  We use
  * a void *rather than a pointer to avoid exposing the Elf_Ehdr type.
  */
 void
-ksyms_init_explicit(void *ehdr, void *symstart, size_t symsize,
+ksyms_addsyms_explicit(void *ehdr, void *symstart, size_t symsize,
 		    void *strstart, size_t strsize)
+{
 	mutex_init(&ksyms_lock, MUTEX_DEFAULT, IPL_NONE);
 	if (!ksyms_verify(symstart, strstart))
 		return;
 	ksyms_hdr_init(ehdr);
 	addsymtab("netbsd", symstart, symsize, strstart, strsize,
 	    &kernel_symtab, symstart);
+}
 /*
  * Get the value associated with a symbol.
  * "mod" is the module name, or null if any module.
  * "sym" is the symbol name.
  * "val" is a pointer to the corresponding value, if call succeeded.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ksyms.h,v 1.20 2008/11/16 15:28:15 ad Exp $	*/
+/*	$NetBSD: ksyms.h,v 1.21 2008/11/30 18:21:36 martin Exp $	*/
 /*
  * Copyright (c) 2001, 2003 Anders Magnusson (ragge@ludd.luth.se).
  * 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.
 @@ -95,21 +95,22 @@ struct ksyms_gsymbol {
 #define	KSYMS_EXACT	0002	/* Only exact match allowed */
 #define KSYMS_EXTERN	0000	/* Only external symbols (pseudo) */
 #define KSYMS_PROC	0100	/* Procedures only */
 #define KSYMS_ANY	0200	/* Also local symbols (DDB use only) */
 /*
  * Prototypes
  */
 int ksyms_getname(const char **, const char **, vaddr_t, int);
 int ksyms_getval(const char *, const char *, unsigned long *, int);
 int ksyms_getval_unlocked(const char *, const char *, unsigned long *, int);
 int ksyms_addsymtab(const char *, void *, vsize_t, char *, vsize_t);
 int ksyms_delsymtab(const char *);
-void ksyms_init(int, void *, void *);
+void ksyms_init(void);
-void ksyms_init_explicit(void *, void *, size_t, void *, size_t);
+void ksyms_addsyms_elf(int, void *, void *);
 void ksyms_addsyms_explicit(void *, void *, size_t, void *, size_t);
 int ksyms_sift(char *, char *, int);
 void ksyms_modload(const char *, void *, vsize_t, char *, vsize_t);
 void ksyms_modunload(const char *);
 #endif /* _KERNEL */
 #endif /* _SYS_KSYMS_H_ */