diff options
| author | ad <ad@NetBSD.org> | 2008-11-12 12:35:50 +0000 |
|---|---|---|
| committer | ad <ad@NetBSD.org> | 2008-11-12 12:35:50 +0000 |
| commit | 0efea177e37295fed654875d875160c47500d6bd (patch) | |
| tree | 9d0589344a5d07b9a511a2e81ebbd701744d03b5 /sys/arch | |
| parent | 0f81d3e0a26c2833cd085c472a4a77c325486b75 (diff) | |
Remove LKMs and switch to the module framework, pass 1.
Proposed on tech-kern@.
Diffstat (limited to 'sys/arch')
298 files changed, 658 insertions, 882 deletions
diff --git a/sys/arch/acorn26/acorn26/cons_machdep.c b/sys/arch/acorn26/acorn26/cons_machdep.c index 7610d5c6443..717631e4d91 100644 --- a/sys/arch/acorn26/acorn26/cons_machdep.c +++ b/sys/arch/acorn26/acorn26/cons_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: cons_machdep.c,v 1.7 2007/03/05 15:42:23 he Exp $ */ +/* $NetBSD: cons_machdep.c,v 1.8 2008/11/12 12:35:54 ad Exp $ */ /*- * Copyright (c) 1998 Ben Harris * All rights reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cons_machdep.c,v 1.7 2007/03/05 15:42:23 he Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cons_machdep.c,v 1.8 2008/11/12 12:35:54 ad Exp $"); #include <sys/param.h> #include <sys/syslog.h> @@ -66,7 +66,7 @@ consinit() #ifdef DDB db_machine_init(); #endif /* DDB */ -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init(bootconfig.esym - bootconfig.ssym, (char*)MEMC_PHYS_BASE + bootconfig.ssym, (char*)MEMC_PHYS_BASE + bootconfig.esym); diff --git a/sys/arch/acorn26/acorn26/start.c b/sys/arch/acorn26/acorn26/start.c index e6d9166cbb0..eadba946786 100644 --- a/sys/arch/acorn26/acorn26/start.c +++ b/sys/arch/acorn26/acorn26/start.c @@ -1,4 +1,4 @@ -/* $NetBSD: start.c,v 1.8 2007/03/05 17:52:26 he Exp $ */ +/* $NetBSD: start.c,v 1.9 2008/11/12 12:35:54 ad Exp $ */ /*- * Copyright (c) 1998, 2000 Ben Harris * All rights reserved. @@ -31,7 +31,7 @@ #include <sys/param.h> -__KERNEL_RCSID(0, "$NetBSD: start.c,v 1.8 2007/03/05 17:52:26 he Exp $"); +__KERNEL_RCSID(0, "$NetBSD: start.c,v 1.9 2008/11/12 12:35:54 ad Exp $"); #include <sys/msgbuf.h> #include <sys/user.h> @@ -144,7 +144,7 @@ start(initbootconfig) panic("Bootloader mislaid the data segment"); #endif -#if !NKSYMS && !defined(DDB) && !defined(LKM) +#if !NKSYMS && !defined(DDB) && !defined(MODULAR) /* Throw away the symbol table to gain space. */ if (bootconfig.freebase == bootconfig.esym) { bootconfig.freebase = bootconfig.ssym; diff --git a/sys/arch/acorn26/conf/FOURMEG b/sys/arch/acorn26/conf/FOURMEG index 8fa2b261e36..bfdff6f0ed6 100644 --- a/sys/arch/acorn26/conf/FOURMEG +++ b/sys/arch/acorn26/conf/FOURMEG @@ -1,4 +1,4 @@ -# $NetBSD: FOURMEG,v 1.29 2006/10/02 03:28:29 chs Exp $ +# $NetBSD: FOURMEG,v 1.30 2008/11/12 12:35:54 ad Exp $ # FOURMEG arm26 configuration -- something small @@ -96,7 +96,6 @@ options SYSVSHM # System V-like shared memory # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) #options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors options BUFPAGES=1 diff --git a/sys/arch/acorn26/conf/GENERIC b/sys/arch/acorn26/conf/GENERIC index 198e286b3d6..9eb29d7288a 100644 --- a/sys/arch/acorn26/conf/GENERIC +++ b/sys/arch/acorn26/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.55 2008/08/10 15:31:20 tls Exp $ +# $NetBSD: GENERIC,v 1.56 2008/11/12 12:35:55 ad Exp $ # # GENERIC machine description file # @@ -126,7 +126,6 @@ options P1003_1B_SEMAPHORE # p1003.1b semaphore support # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) #options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors options NTP # Kernel PLL for ntpd(8). diff --git a/sys/arch/acorn26/conf/INSTALL b/sys/arch/acorn26/conf/INSTALL index 3aad05fb3d5..8b6f5a79b40 100644 --- a/sys/arch/acorn26/conf/INSTALL +++ b/sys/arch/acorn26/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.22 2008/07/31 07:40:59 simonb Exp $ +# $NetBSD: INSTALL,v 1.23 2008/11/12 12:35:55 ad Exp $ # INSTALL configuration, used to generate installation media @@ -94,7 +94,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. # Miscellaneous kernel options #options KTRACE # system call tracing, a la ktrace(1) #options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors options BUFPAGES=2 diff --git a/sys/arch/acorn26/conf/majors.acorn26 b/sys/arch/acorn26/conf/majors.acorn26 index 63991cd6e6e..51fef85dbec 100644 --- a/sys/arch/acorn26/conf/majors.acorn26 +++ b/sys/arch/acorn26/conf/majors.acorn26 @@ -1,4 +1,4 @@ -# $NetBSD: majors.acorn26,v 1.19 2007/12/31 15:31:44 ad Exp $ +# $NetBSD: majors.acorn26,v 1.20 2008/11/12 12:35:55 ad Exp $ # # Device majors for acorn26 # @@ -33,7 +33,6 @@ device-major raid char 26 block 7 raid device-major clockctl char 27 clockctl device-major cgd char 29 block 8 cgd device-major ksyms char 30 ksyms -device-major lkm char 31 lkm device-major wsfont char 32 wsfont device-major nsmb char 98 nsmb diff --git a/sys/arch/acorn32/acorn32/rpc_machdep.c b/sys/arch/acorn32/acorn32/rpc_machdep.c index caea781fe88..2270e171b4c 100644 --- a/sys/arch/acorn32/acorn32/rpc_machdep.c +++ b/sys/arch/acorn32/acorn32/rpc_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: rpc_machdep.c,v 1.72 2008/11/11 06:46:40 dyoung Exp $ */ +/* $NetBSD: rpc_machdep.c,v 1.73 2008/11/12 12:35:55 ad Exp $ */ /* * Copyright (c) 2000-2002 Reinoud Zandijk. @@ -54,7 +54,7 @@ #include <sys/param.h> -__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.72 2008/11/11 06:46:40 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.73 2008/11/12 12:35:55 ad Exp $"); #include <sys/systm.h> #include <sys/kernel.h> @@ -1043,7 +1043,7 @@ initarm(void *cookie) rpc_sa110_cc_setup(); #endif /* CPU_SA110 */ -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init(bootconfig.ksym_end - bootconfig.ksym_start, (void *) bootconfig.ksym_start, (void *) bootconfig.ksym_end); #endif diff --git a/sys/arch/acorn32/conf/EB7500ATX b/sys/arch/acorn32/conf/EB7500ATX index 4aabdd1a250..c86474ccd02 100644 --- a/sys/arch/acorn32/conf/EB7500ATX +++ b/sys/arch/acorn32/conf/EB7500ATX @@ -1,4 +1,4 @@ -# $NetBSD: EB7500ATX,v 1.33 2008/07/31 07:40:59 simonb Exp $ +# $NetBSD: EB7500ATX,v 1.34 2008/11/12 12:35:55 ad Exp $ # # EB7500ATX --- NetBSD/acorn32 complete configuration # @@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "EB7500ATX-$Revision: 1.33 $" +#ident "EB7500ATX-$Revision: 1.34 $" # estimated number of users maxusers 32 @@ -140,7 +140,6 @@ options MEMORY_DISK_HOOKS # boottime setup of ramdisk # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -options LKM # loadable kernel modules options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors options USERCONF # userconf(4) support diff --git a/sys/arch/acorn32/conf/GENERIC b/sys/arch/acorn32/conf/GENERIC index f4ab8012f40..9d3b140618d 100644 --- a/sys/arch/acorn32/conf/GENERIC +++ b/sys/arch/acorn32/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.88 2008/08/10 15:31:20 tls Exp $ +# $NetBSD: GENERIC,v 1.89 2008/11/12 12:35:55 ad Exp $ # # GENERIC --- NetBSD/acorn32 complete configuration # @@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.88 $" +#ident "GENERIC-$Revision: 1.89 $" # estimated number of users maxusers 32 @@ -144,7 +144,6 @@ options MEMORY_DISK_HOOKS # boottime setup of ramdisk # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -options LKM # loadable kernel modules options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors options USERCONF # userconf(4) support diff --git a/sys/arch/acorn32/conf/INSTALL b/sys/arch/acorn32/conf/INSTALL index 9758a86e1a8..34a8c3d2aed 100644 --- a/sys/arch/acorn32/conf/INSTALL +++ b/sys/arch/acorn32/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.49 2008/07/31 07:40:59 simonb Exp $ +# $NetBSD: INSTALL,v 1.50 2008/11/12 12:35:55 ad Exp $ # # INSTALL -- NetBSD/acorn32 install configuration # @@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "INSTALL-$Revision: 1.49 $" +#ident "INSTALL-$Revision: 1.50 $" # estimated number of users maxusers 32 @@ -131,7 +131,6 @@ options MEMORY_DISK_IS_ROOT # use memory disk as root # Miscellaneous kernel options #options KTRACE # system call tracing, a la ktrace(1) #options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors options USERCONF # userconf(4) support diff --git a/sys/arch/acorn32/conf/LOWMEM_WSCONS b/sys/arch/acorn32/conf/LOWMEM_WSCONS index 49ec9bb0872..452a92b1315 100644 --- a/sys/arch/acorn32/conf/LOWMEM_WSCONS +++ b/sys/arch/acorn32/conf/LOWMEM_WSCONS @@ -1,4 +1,4 @@ -# $NetBSD: LOWMEM_WSCONS,v 1.49 2008/05/30 20:10:01 tsutsui Exp $ +# $NetBSD: LOWMEM_WSCONS,v 1.50 2008/11/12 12:35:55 ad Exp $ # # LOWMEM_WSCONS -- RiscPC config with wscons for SMALL machines # @@ -111,7 +111,6 @@ options MEMORY_DISK_HOOKS # boottime setup of ramdisk # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -options LKM # loadable kernel modules options KMEMSTATS # kernel memory statistics options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/acorn32/conf/NC b/sys/arch/acorn32/conf/NC index c5bb7f4d168..39dd3660cfe 100644 --- a/sys/arch/acorn32/conf/NC +++ b/sys/arch/acorn32/conf/NC @@ -1,4 +1,4 @@ -# $NetBSD: NC,v 1.47 2008/05/30 20:10:01 tsutsui Exp $ +# $NetBSD: NC,v 1.48 2008/11/12 12:35:55 ad Exp $ # # NC - with wscons # @@ -105,7 +105,6 @@ options MEMORY_DISK_HOOKS # boottime setup of ramdisk # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules options KMEMSTATS # kernel memory statistics options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/acorn32/conf/majors.acorn32 b/sys/arch/acorn32/conf/majors.acorn32 index 583e87d658f..9c7e3defabd 100644 --- a/sys/arch/acorn32/conf/majors.acorn32 +++ b/sys/arch/acorn32/conf/majors.acorn32 @@ -1,4 +1,4 @@ -# $NetBSD: majors.acorn32,v 1.23 2007/12/31 15:31:45 ad Exp $ +# $NetBSD: majors.acorn32,v 1.24 2008/11/12 12:35:55 ad Exp $ # # Device majors for acorn32 # @@ -33,7 +33,6 @@ device-major ss char 29 ss device-major bpf char 32 bpfilter device-major tun char 33 tun device-major filedesc char 34 -device-major lkm char 35 lkm device-major audio char 36 audio device-major ipl char 46 ipfilter diff --git a/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c b/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c index 677bc44fd26..350cd30e7ee 100644 --- a/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c +++ b/sys/arch/acorn32/eb7500atx/eb7500atx_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: eb7500atx_machdep.c,v 1.10 2008/11/11 06:46:40 dyoung Exp $ */ +/* $NetBSD: eb7500atx_machdep.c,v 1.11 2008/11/12 12:35:55 ad Exp $ */ /* * Copyright (c) 2000-2002 Reinoud Zandijk. @@ -54,7 +54,7 @@ #include <sys/param.h> -__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.10 2008/11/11 06:46:40 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.11 2008/11/12 12:35:55 ad Exp $"); #include <sys/systm.h> #include <sys/kernel.h> @@ -956,7 +956,7 @@ initarm(void *cookie) bootconfig.vram[0].address, bootconfig.vram[0].pages * bootconfig.pagesize); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init(bootconfig.ksym_end - bootconfig.ksym_start, (void *) bootconfig.ksym_start, (void *) bootconfig.ksym_end); #endif diff --git a/sys/arch/algor/algor/machdep.c b/sys/arch/algor/algor/machdep.c index 56b47daedf0..e72eba4b2f0 100644 --- a/sys/arch/algor/algor/machdep.c +++ b/sys/arch/algor/algor/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.39 2008/11/11 06:46:40 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.40 2008/11/12 12:35:55 ad Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -106,7 +106,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.39 2008/11/11 06:46:40 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.40 2008/11/12 12:35:55 ad Exp $"); #include "opt_algor_p4032.h" #include "opt_algor_p5064.h" @@ -574,7 +574,7 @@ mach_init(int argc, char *argv[], char *envp[]) /* * Initialize debuggers, and break into them, if appropriate. */ -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* * XXX Loader doesn't give us symbols the way we like. Need * XXX dbsym(1) support for ELF. diff --git a/sys/arch/algor/conf/P4032 b/sys/arch/algor/conf/P4032 index ea338544c86..ed92d8c4f34 100644 --- a/sys/arch/algor/conf/P4032 +++ b/sys/arch/algor/conf/P4032 @@ -1,4 +1,4 @@ -# $NetBSD: P4032,v 1.48 2008/09/27 20:45:07 he Exp $ +# $NetBSD: P4032,v 1.49 2008/11/12 12:35:55 ad Exp $ # # Algorithmics P-4032 kernel. # @@ -7,7 +7,7 @@ include "arch/algor/conf/std.algor" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "P4032-$Revision: 1.48 $" +#ident "P4032-$Revision: 1.49 $" maxusers 32 @@ -87,7 +87,6 @@ options SYSVSHM #options SHMMAXPGS=1024 # 1024 pages is the default # Loadable Kernel Modules -options LKM # Disable kernel security. #options INSECURE diff --git a/sys/arch/algor/conf/P5064 b/sys/arch/algor/conf/P5064 index c5f85acd2a0..21ec8eaa2a4 100644 --- a/sys/arch/algor/conf/P5064 +++ b/sys/arch/algor/conf/P5064 @@ -1,4 +1,4 @@ -# $NetBSD: P5064,v 1.54 2008/07/31 07:40:59 simonb Exp $ +# $NetBSD: P5064,v 1.55 2008/11/12 12:35:55 ad Exp $ # # Algorithmics P-5064 kernel. # @@ -7,7 +7,7 @@ include "arch/algor/conf/std.algor" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "P5064-$Revision: 1.54 $" +#ident "P5064-$Revision: 1.55 $" maxusers 32 @@ -82,7 +82,6 @@ options SYSVSHM #options SHMMAXPGS=1024 # 1024 pages is the default # Loadable Kernel Modules -options LKM # Disable kernel security. #options INSECURE diff --git a/sys/arch/algor/conf/P6032 b/sys/arch/algor/conf/P6032 index 679d20a630c..8d3e1d60b4e 100644 --- a/sys/arch/algor/conf/P6032 +++ b/sys/arch/algor/conf/P6032 @@ -1,4 +1,4 @@ -# $NetBSD: P6032,v 1.47 2008/07/31 07:40:59 simonb Exp $ +# $NetBSD: P6032,v 1.48 2008/11/12 12:35:55 ad Exp $ # # Algorithmics P-6032 kernel. # @@ -7,7 +7,7 @@ include "arch/algor/conf/std.algor" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "P6032-$Revision: 1.47 $" +#ident "P6032-$Revision: 1.48 $" maxusers 32 @@ -82,7 +82,6 @@ options SYSVSHM #options SHMMAXPGS=1024 # 1024 pages is the default # Loadable Kernel Modules -options LKM # Disable kernel security. #options INSECURE diff --git a/sys/arch/algor/conf/majors.algor b/sys/arch/algor/conf/majors.algor index e6d796863ec..232248deb72 100644 --- a/sys/arch/algor/conf/majors.algor +++ b/sys/arch/algor/conf/majors.algor @@ -1,4 +1,4 @@ -# $NetBSD: majors.algor,v 1.18 2007/12/31 15:31:45 ad Exp $ +# $NetBSD: majors.algor,v 1.19 2008/11/12 12:35:55 ad Exp $ # # Device majors for algor # @@ -19,7 +19,6 @@ device-major st char 12 block 2 st device-major cd char 13 block 3 cd device-major ch char 14 ch -device-major lkm char 16 lkm device-major audio char 24 audio device-major wsdisplay char 25 wsdisplay diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c index 04b7b3937e4..64827b4ec28 100644 --- a/sys/arch/alpha/alpha/machdep.c +++ b/sys/arch/alpha/alpha/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.308 2008/11/11 06:46:40 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.309 2008/11/12 12:35:55 ad Exp $ */ /*- * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc. @@ -68,7 +68,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.308 2008/11/11 06:46:40 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.309 2008/11/12 12:35:55 ad Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -182,7 +182,7 @@ u_int8_t dec_3000_scsiid[2], dec_3000_scsifast[2]; struct platform platform; -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* start and end of kernel symbol table */ void *ksym_start, *ksym_end; #endif @@ -421,7 +421,7 @@ nobootinfo: * stack). */ kernstart = trunc_page((vaddr_t)kernel_text) - 2 * PAGE_SIZE; -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksym_start = (void *)bootinfo.ssym; ksym_end = (void *)bootinfo.esym; kernend = (vaddr_t)round_page((vaddr_t)ksym_end); @@ -767,7 +767,7 @@ nobootinfo: /* * Initialize debuggers, and break into them if appropriate. */ -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init((int)((u_int64_t)ksym_end - (u_int64_t)ksym_start), ksym_start, ksym_end); #endif diff --git a/sys/arch/alpha/conf/BASIL b/sys/arch/alpha/conf/BASIL index cceb5a4b5ee..f298c67b010 100644 --- a/sys/arch/alpha/conf/BASIL +++ b/sys/arch/alpha/conf/BASIL @@ -1,4 +1,4 @@ -# $NetBSD: BASIL,v 1.49 2008/05/30 20:10:01 tsutsui Exp $ +# $NetBSD: BASIL,v 1.50 2008/11/12 12:35:55 ad Exp $ # # basil.shagadelic.org -- thorpej's API UP1000 @@ -6,7 +6,7 @@ include "arch/alpha/conf/std.alpha" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "BASIL-$Revision: 1.49 $" +#ident "BASIL-$Revision: 1.50 $" maxusers 64 @@ -100,7 +100,6 @@ options SYSVSHM #options SHMMAXPGS=1024 # 1024 pages is the default # Loadable Kernel Modules -options LKM # Disable kernel security. #options INSECURE diff --git a/sys/arch/alpha/conf/FRAU-FARBISSINA b/sys/arch/alpha/conf/FRAU-FARBISSINA index e6f0d2dffb0..c963f63e1bb 100644 --- a/sys/arch/alpha/conf/FRAU-FARBISSINA +++ b/sys/arch/alpha/conf/FRAU-FARBISSINA @@ -1,4 +1,4 @@ -# $NetBSD: FRAU-FARBISSINA,v 1.53 2008/05/30 20:10:01 tsutsui Exp $ +# $NetBSD: FRAU-FARBISSINA,v 1.54 2008/11/12 12:35:55 ad Exp $ # # frau-farbissina.shagadelic.org -- thorpej's AlphaServer 1200 MP hacking # box @@ -7,7 +7,7 @@ include "arch/alpha/conf/std.alpha" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "FRAU-FARBISSINA-$Revision: 1.53 $" +#ident "FRAU-FARBISSINA-$Revision: 1.54 $" maxusers 64 @@ -97,7 +97,6 @@ options SYSVSHM #options SHMMAXPGS=1024 # 1024 pages is the default # Loadable Kernel Modules -options LKM # Disable kernel security. #options INSECURE diff --git a/sys/arch/alpha/conf/GENERIC b/sys/arch/alpha/conf/GENERIC index c519ff3a27d..90d67a51d87 100644 --- a/sys/arch/alpha/conf/GENERIC +++ b/sys/arch/alpha/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.325 2008/08/10 15:31:20 tls Exp $ +# $NetBSD: GENERIC,v 1.326 2008/11/12 12:35:56 ad Exp $ # # This machine description file is used to generate the default NetBSD # kernel. @@ -19,7 +19,7 @@ include "arch/alpha/conf/std.alpha" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident "GENERIC-$Revision: 1.325 $" +ident "GENERIC-$Revision: 1.326 $" maxusers 32 @@ -170,7 +170,6 @@ options SYSVSHM options P1003_1B_SEMAPHORE # Loadable Kernel Modules -options LKM # Disable kernel security. #options INSECURE diff --git a/sys/arch/alpha/conf/majors.alpha b/sys/arch/alpha/conf/majors.alpha index c0c80b7990c..0bdfb8b8645 100644 --- a/sys/arch/alpha/conf/majors.alpha +++ b/sys/arch/alpha/conf/majors.alpha @@ -1,4 +1,4 @@ -# $NetBSD: majors.alpha,v 1.22 2007/12/31 15:31:45 ad Exp $ +# $NetBSD: majors.alpha,v 1.23 2008/11/12 12:35:56 ad Exp $ # # Device majors for alpha # @@ -19,7 +19,6 @@ device-major st char 12 block 2 st device-major cd char 13 block 3 cd device-major ch char 14 ch device-major zstty char 15 zstty -device-major lkm char 16 lkm device-major prom char 23 device-major audio char 24 audio diff --git a/sys/arch/amd64/amd64/kobj_machdep.c b/sys/arch/amd64/amd64/kobj_machdep.c index f8d222687b3..8d3e8a2bdfb 100644 --- a/sys/arch/amd64/amd64/kobj_machdep.c +++ b/sys/arch/amd64/amd64/kobj_machdep.c @@ -1,9 +1,12 @@ -/* $NetBSD: kobj_machdep.c,v 1.3 2008/04/28 20:23:12 martin Exp $ */ +/* $NetBSD: kobj_machdep.c,v 1.4 2008/11/12 12:35:56 ad 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: @@ -52,7 +55,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.3 2008/04/28 20:23:12 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.4 2008/11/12 12:35:56 ad Exp $"); #define ELFSIZE ARCH_ELFSIZE @@ -110,8 +113,7 @@ kobj_reloc(kobj_t ko, uintptr_t relocbase, const void *data, val = addr + addend; if (addr == 0) return -1; - if (*where != val) - *where = val; + *where = val; break; case R_X86_64_PC32: /* S + A - P */ @@ -120,8 +122,7 @@ kobj_reloc(kobj_t ko, uintptr_t relocbase, const void *data, val32 = (Elf32_Addr)(addr + addend - (Elf64_Addr)where); if (addr == 0) return -1; - if (*where32 != val32) - *where32 = val32; + *where32 = val32; break; case R_X86_64_32S: /* S + A sign extend */ @@ -130,32 +131,21 @@ kobj_reloc(kobj_t ko, uintptr_t relocbase, const void *data, where32 = (Elf32_Addr *)where; if (addr == 0) return -1; - if (*where32 != val32) - *where32 = val32; + *where32 = val32; break; - case R_X86_64_COPY: /* none */ - /* - * There shouldn't be copy relocations in kernel - * objects. - */ - printf("kobj_reloc: unexpected R_COPY relocation\n"); - return -1; - case R_X86_64_GLOB_DAT: /* S */ case R_X86_64_JUMP_SLOT:/* XXX need addend + offset */ addr = kobj_sym_lookup(ko, symidx); if (addr == 0) return -1; - if (*where != addr) - *where = addr; + *where = addr; break; case R_X86_64_RELATIVE: /* B + A */ addr = relocbase + addend; val = addr; - if (*where != val) - *where = val; + *where = val; break; default: diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c index 97c468c0215..18003770eaf 100644 --- a/sys/arch/amd64/amd64/machdep.c +++ b/sys/arch/amd64/amd64/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.107 2008/11/12 01:33:44 cegger Exp $ */ +/* $NetBSD: machdep.c,v 1.108 2008/11/12 12:35:56 ad Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008 @@ -112,7 +112,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.107 2008/11/12 01:33:44 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.108 2008/11/12 12:35:56 ad Exp $"); /* #define XENDEBUG_LOW */ @@ -260,9 +260,9 @@ paddr_t idt_paddr; vaddr_t lo32_vaddr; paddr_t lo32_paddr; -vaddr_t lkm_start, lkm_end; -static struct vm_map lkm_map_store; -extern struct vm_map *lkm_map; +vaddr_t module_start, module_end; +static struct vm_map module_map_store; +extern struct vm_map *module_map; vaddr_t kern_end; struct vm_map *mb_map = NULL; @@ -359,9 +359,9 @@ cpu_startup(void) mb_map = uvm_km_suballoc(kernel_map, &minaddr, &maxaddr, nmbclusters * mclbytes, VM_MAP_INTRSAFE, false, NULL); - uvm_map_setup(&lkm_map_store, lkm_start, lkm_end, 0); - lkm_map_store.pmap = pmap_kernel(); - lkm_map = &lkm_map_store; + uvm_map_setup(&module_map_store, module_start, module_end, 0); + module_map_store.pmap = pmap_kernel(); + module_map = &module_map_store; format_bytes(pbuf, sizeof(pbuf), ptoa(uvmexp.free)); printf("avail memory = %s\n", pbuf); @@ -1329,7 +1329,7 @@ init_x86_64_msgbuf(void) static void init_x86_64_ksyms(void) { -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) extern int end; extern int *esym; #ifndef XEN @@ -1587,8 +1587,8 @@ init_x86_64(paddr_t first_avail) first_avail = round_page(first_avail); kern_end = KERNBASE + first_avail; - lkm_start = kern_end; - lkm_end = KERNBASE + NKL2_KIMG_ENTRIES * NBPD_L2; + module_start = kern_end; + module_end = KERNBASE + NKL2_KIMG_ENTRIES * NBPD_L2; /* * Now, load the memory clusters (which have already been diff --git a/sys/arch/amd64/amd64/mem.c b/sys/arch/amd64/amd64/mem.c index 33e7a897710..9554965c124 100644 --- a/sys/arch/amd64/amd64/mem.c +++ b/sys/arch/amd64/amd64/mem.c @@ -1,4 +1,4 @@ -/* $NetBSD: mem.c,v 1.15 2008/09/25 10:40:48 ad Exp $ */ +/* $NetBSD: mem.c,v 1.16 2008/11/12 12:35:56 ad Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -102,7 +102,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.15 2008/09/25 10:40:48 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mem.c,v 1.16 2008/11/12 12:35:56 ad Exp $"); #include "opt_compat_netbsd.h" @@ -129,8 +129,8 @@ void *zeropage; static kmutex_t mm_lock; extern int start, end, __data_start; extern vaddr_t kern_end; -extern vaddr_t lkm_start, lkm_end; -extern struct vm_map *lkm_map; +extern vaddr_t module_start, module_end; +extern struct vm_map *module_map; dev_type_open(mmopen); dev_type_read(mmrw); @@ -209,8 +209,8 @@ mmrw(dev_t dev, struct uio *uio, int flags) if (v < (vaddr_t)&__data_start && uio->uio_rw == UIO_WRITE) return EFAULT; - } else if (v >= lkm_start && v < lkm_end) { - if (!uvm_map_checkprot(lkm_map, v, v + c, + } else if (v >= module_start && v < module_end) { + if (!uvm_map_checkprot(module_map, v, v + c, uio->uio_rw == UIO_READ ? VM_PROT_READ: VM_PROT_WRITE)) return EFAULT; diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC index 3163d918f12..e75bcc59f4c 100644 --- a/sys/arch/amd64/conf/GENERIC +++ b/sys/arch/amd64/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.231 2008/10/19 11:34:31 joerg Exp $ +# $NetBSD: GENERIC,v 1.232 2008/11/12 12:35:56 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.231 $" +#ident "GENERIC-$Revision: 1.232 $" maxusers 64 # estimated number of users @@ -66,7 +66,6 @@ options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options MODULAR # new style module framework options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/amd64/conf/XEN3_DOM0 b/sys/arch/amd64/conf/XEN3_DOM0 index e91493f6e42..e12aeb52229 100644 --- a/sys/arch/amd64/conf/XEN3_DOM0 +++ b/sys/arch/amd64/conf/XEN3_DOM0 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.33 2008/10/21 10:13:23 cegger Exp $ +# $NetBSD: XEN3_DOM0,v 1.34 2008/11/12 12:35:56 ad Exp $ include "arch/amd64/conf/std.xen" @@ -35,7 +35,6 @@ options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options USERCONF # userconf(4) support options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel diff --git a/sys/arch/amd64/conf/XEN3_DOMU b/sys/arch/amd64/conf/XEN3_DOMU index c7da6f3938b..c47a9af0407 100644 --- a/sys/arch/amd64/conf/XEN3_DOMU +++ b/sys/arch/amd64/conf/XEN3_DOMU @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.13 2008/08/10 08:53:29 cegger Exp $ +# $NetBSD: XEN3_DOMU,v 1.14 2008/11/12 12:35:56 ad Exp $ include "arch/amd64/conf/std.xen" @@ -34,7 +34,6 @@ options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options USERCONF # userconf(4) support options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel diff --git a/sys/arch/amd64/conf/majors.amd64 b/sys/arch/amd64/conf/majors.amd64 index f8f3a9a2241..b7f765645f5 100644 --- a/sys/arch/amd64/conf/majors.amd64 +++ b/sys/arch/amd64/conf/majors.amd64 @@ -1,4 +1,4 @@ -# $NetBSD: majors.amd64,v 1.20 2008/07/15 06:50:02 cegger Exp $ +# $NetBSD: majors.amd64,v 1.21 2008/11/12 12:35:56 ad Exp $ # # Device majors for amd64 # @@ -30,7 +30,6 @@ device-major bpf char 23 bpfilter device-major md char 24 block 17 md device-major spkr char 27 spkr -device-major lkm char 28 lkm device-major cy char 38 cy device-major mcd char 39 block 7 mcd diff --git a/sys/arch/amiga/amiga/machdep.c b/sys/arch/amiga/amiga/machdep.c index 50eb5e3ceca..4daa2e33076 100644 --- a/sys/arch/amiga/amiga/machdep.c +++ b/sys/arch/amiga/amiga/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.209 2008/07/02 17:28:54 ad Exp $ */ +/* $NetBSD: machdep.c,v 1.210 2008/11/12 12:35:56 ad Exp $ */ /* * Copyright (c) 1982, 1986, 1990 The Regents of the University of California. @@ -85,7 +85,7 @@ #include "opt_panicbutton.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.209 2008/07/02 17:28:54 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.210 2008/11/12 12:35:56 ad Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -229,7 +229,7 @@ consinit() */ cninit(); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) { extern int end[]; extern int *esym; @@ -1466,7 +1466,7 @@ cpu_exec_aout_makecmds(l, epp) return(error); } -#ifdef LKM +#ifdef MODULAR int _spllkm6(void); int _spllkm7(void); diff --git a/sys/arch/amiga/conf/DRACO b/sys/arch/amiga/conf/DRACO index 74ddb5fbc7c..9b93eda9d96 100644 --- a/sys/arch/amiga/conf/DRACO +++ b/sys/arch/amiga/conf/DRACO @@ -1,4 +1,4 @@ -# $NetBSD: DRACO,v 1.127 2008/09/24 17:27:49 tsutsui Exp $ +# $NetBSD: DRACO,v 1.128 2008/11/12 12:35:56 ad Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. @@ -28,7 +28,7 @@ include "arch/amiga/conf/std.amiga" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.127 $" +#ident "GENERIC-$Revision: 1.128 $" maxusers 8 @@ -162,7 +162,6 @@ options P1003_1B_SEMAPHORE # p1003.1b semaphore support # options KTRACE # system call tracing support -options LKM # Loadable kernel modules #options INSECURE # disable kernel security levels options SCSIVERBOSE # human readable SCSI error messages options USERCONF # userconf(4) support diff --git a/sys/arch/amiga/conf/GENERIC b/sys/arch/amiga/conf/GENERIC index db1c9497975..714e4c85d2d 100644 --- a/sys/arch/amiga/conf/GENERIC +++ b/sys/arch/amiga/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.256 2008/09/24 17:27:49 tsutsui Exp $ +# $NetBSD: GENERIC,v 1.257 2008/11/12 12:35:56 ad Exp $ # # This file was automatically created. # Changes will be lost when make is run in this directory. @@ -28,7 +28,7 @@ include "arch/amiga/conf/std.amiga" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.256 $" +#ident "GENERIC-$Revision: 1.257 $" maxusers 8 @@ -174,7 +174,6 @@ options P1003_1B_SEMAPHORE # p1003.1b semaphore support # options KTRACE # system call tracing support -options LKM # Loadable kernel modules #options INSECURE # disable kernel security levels options SCSIVERBOSE # human readable SCSI error messages options USERCONF # userconf(4) support diff --git a/sys/arch/amiga/conf/GENERIC.in b/sys/arch/amiga/conf/GENERIC.in index 501e8afe765..bc011c23888 100644 --- a/sys/arch/amiga/conf/GENERIC.in +++ b/sys/arch/amiga/conf/GENERIC.in @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC.in,v 1.69 2008/09/24 17:26:37 tsutsui Exp $ +# $NetBSD: GENERIC.in,v 1.70 2008/11/12 12:35:56 ad Exp $ # # GENERIC machine description file # @@ -56,7 +56,7 @@ include "arch/amiga/conf/std.amiga" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.69 $" +#ident "GENERIC-$Revision: 1.70 $" m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl makeoptions COPTS="-Os" @@ -224,7 +224,6 @@ options P1003_1B_SEMAPHORE # p1003.1b semaphore support m4_ifdef(`INSTALL_CONFIGURATION', `', `m4_dnl options KTRACE # system call tracing support -options LKM # Loadable kernel modules ')m4_dnl #options INSECURE # disable kernel security levels options SCSIVERBOSE # human readable SCSI error messages diff --git a/sys/arch/amiga/conf/majors.amiga b/sys/arch/amiga/conf/majors.amiga index a5b1e9a289c..643ceeb4406 100644 --- a/sys/arch/amiga/conf/majors.amiga +++ b/sys/arch/amiga/conf/majors.amiga @@ -1,4 +1,4 @@ -# $NetBSD: majors.amiga,v 1.20 2007/12/31 15:31:48 ad Exp $ +# $NetBSD: majors.amiga,v 1.21 2008/11/12 12:35:56 ad Exp $ # # Device majors for amiga # @@ -27,7 +27,6 @@ device-major st char 20 block 5 st device-major filedesc char 21 device-major bpf char 22 bpfilter device-major tun char 23 tun -device-major lkm char 24 lkm device-major msc char 31 msc device-major com char 32 com diff --git a/sys/arch/amigappc/conf/NULL b/sys/arch/amigappc/conf/NULL index 4b9c6407ea5..232426531f8 100644 --- a/sys/arch/amigappc/conf/NULL +++ b/sys/arch/amigappc/conf/NULL @@ -1,4 +1,4 @@ -# $NetBSD: NULL,v 1.24 2006/08/26 20:26:44 christos Exp $ +# $NetBSD: NULL,v 1.25 2008/11/12 12:35:56 ad Exp $ # # This file was automatically created. Changes will be # lost when running make in this directory. @@ -103,7 +103,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. #Support for various kernel options #options KTRACE # system call tracing support -#options LKM # Loadable kernel modules #options INSECURE # disable kernel security levels #options SCSIVERBOSE # human readable SCSI error messages #options NTP # NTP phase/frequency locked loop diff --git a/sys/arch/arc/arc/machdep.c b/sys/arch/arc/arc/machdep.c index bedffa5e49c..d9a8ff269e0 100644 --- a/sys/arch/arc/arc/machdep.c +++ b/sys/arch/arc/arc/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.113 2008/11/11 06:46:40 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.114 2008/11/12 12:35:56 ad Exp $ */ /* $OpenBSD: machdep.c,v 1.36 1999/05/22 21:22:19 weingart Exp $ */ /* @@ -78,7 +78,7 @@ /* from: Utah Hdr: machdep.c 1.63 91/04/24 */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.113 2008/11/11 06:46:40 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.114 2008/11/12 12:35:56 ad Exp $"); #include "fs_mfs.h" #include "opt_ddb.h" @@ -233,7 +233,7 @@ mach_init(int argc, char *argv[], u_int bim, void *bip) paddr_t kernstartpfn, kernendpfn, first, last; char *kernend; vaddr_t v; -#if NKSYMS > 0 || defined(DDB) || defined(LKM) +#if NKSYMS > 0 || defined(DDB) || defined(MODULAR) char *ssym = NULL; char *esym = NULL; struct btinfo_symtab *bi_syms; @@ -255,7 +255,7 @@ mach_init(int argc, char *argv[], u_int bim, void *bip) bootinfo_msg = "no bootinfo found. (old bootblocks?)\n"; /* clear the BSS segment in kernel code */ -#if NKSYM > 0 || defined(DDB) || defined(LKM) +#if NKSYM > 0 || defined(DDB) || defined(MODULAR) bi_syms = lookup_bootinfo(BTINFO_SYMTAB); /* check whether there is valid bootinfo symtab info */ @@ -413,7 +413,7 @@ mach_init(int argc, char *argv[], u_int bim, void *bip) kernend += round_page(mfs_initminiroot(kernend)); #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* init symbols if present */ if (esym) ksyms_init(esym - ssym, ssym, esym); diff --git a/sys/arch/arc/conf/ARCTIC b/sys/arch/arc/conf/ARCTIC index d4193367e9f..d5a682fb1bd 100644 --- a/sys/arch/arc/conf/ARCTIC +++ b/sys/arch/arc/conf/ARCTIC @@ -1,4 +1,4 @@ -# $NetBSD: ARCTIC,v 1.48 2007/10/17 19:53:27 garbled Exp $ +# $NetBSD: ARCTIC,v 1.49 2008/11/12 12:35:56 ad Exp $ # $OpenBSD: ARCTIC,v 1.12 1999/08/29 12:14:03 niklas Exp $ # # configuration file for DeskStation @@ -30,7 +30,6 @@ options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing #options SHMMAXPGS=1024 # 1024 pages is the default -options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/arc/conf/GENERIC b/sys/arch/arc/conf/GENERIC index 9f939110bcd..cde29118918 100644 --- a/sys/arch/arc/conf/GENERIC +++ b/sys/arch/arc/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.157 2008/09/15 04:42:58 tsutsui Exp $ +# $NetBSD: GENERIC,v 1.158 2008/11/12 12:35:56 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/arc/conf/std.arc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.157 $" +#ident "GENERIC-$Revision: 1.158 $" maxusers 32 # estimated number of users @@ -54,7 +54,6 @@ options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/arc/conf/M403 b/sys/arch/arc/conf/M403 index f0eaebb9433..67074c3bb74 100644 --- a/sys/arch/arc/conf/M403 +++ b/sys/arch/arc/conf/M403 @@ -1,4 +1,4 @@ -# $NetBSD: M403,v 1.45 2007/10/17 19:53:27 garbled Exp $ +# $NetBSD: M403,v 1.46 2008/11/12 12:35:57 ad Exp $ # # configuration file for MIPS Magnum 4000 system # @@ -24,7 +24,6 @@ options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing #options SHMMAXPGS=1024 # 1024 pages is the default -options LKM # loadable kernel modules #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) #options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel diff --git a/sys/arch/arc/conf/MIMORI b/sys/arch/arc/conf/MIMORI index fd5edc8644d..1985400ac17 100644 --- a/sys/arch/arc/conf/MIMORI +++ b/sys/arch/arc/conf/MIMORI @@ -1,4 +1,4 @@ -# $NetBSD: MIMORI,v 1.49 2007/10/17 19:53:28 garbled Exp $ +# $NetBSD: MIMORI,v 1.50 2008/11/12 12:35:57 ad Exp $ # NetBSD: GENERIC,v 1.31 2000/06/09 05:33:02 soda Exp # # MIMORI -- My NEC RISCstation 2250 (ur) @@ -25,7 +25,6 @@ options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing #options SHMMAXPGS=1024 # 1024 pages is the default -options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/arc/conf/PICA b/sys/arch/arc/conf/PICA index 6d5cb4081ea..78580233d46 100644 --- a/sys/arch/arc/conf/PICA +++ b/sys/arch/arc/conf/PICA @@ -1,4 +1,4 @@ -# $NetBSD: PICA,v 1.61 2007/10/17 19:53:28 garbled Exp $ +# $NetBSD: PICA,v 1.62 2008/11/12 12:35:57 ad Exp $ # # configuration file for ACER PICA system # @@ -24,7 +24,6 @@ options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing #options SHMMAXPGS=1024 # 1024 pages is the default -options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/arc/conf/RPC44 b/sys/arch/arc/conf/RPC44 index cdede6759eb..33940a7504a 100644 --- a/sys/arch/arc/conf/RPC44 +++ b/sys/arch/arc/conf/RPC44 @@ -1,4 +1,4 @@ -# $NetBSD: RPC44,v 1.31 2007/12/31 15:31:49 ad Exp $ +# $NetBSD: RPC44,v 1.32 2008/11/12 12:35:57 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/arc/conf/std.arc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.31 $" +#ident "GENERIC-$Revision: 1.32 $" maxusers 32 # estimated number of users @@ -45,7 +45,6 @@ options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing #options SHMMAXPGS=1024 # 1024 pages is the default -options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/arc/conf/majors.arc b/sys/arch/arc/conf/majors.arc index 97cb4d2bb54..df9a78fd824 100644 --- a/sys/arch/arc/conf/majors.arc +++ b/sys/arch/arc/conf/majors.arc @@ -1,4 +1,4 @@ -# $NetBSD: majors.arc,v 1.21 2007/12/31 15:31:49 ad Exp $ +# $NetBSD: majors.arc,v 1.22 2008/11/12 12:35:57 ad Exp $ # # Device majors for arc # @@ -45,7 +45,6 @@ device-major isdnbchan char 39 isdnbchan device-major isdntrc char 40 isdntrc device-major isdntel char 41 isdntel -device-major lkm char 51 lkm device-major clockctl char 52 clockctl device-major cgd char 54 block 10 cgd device-major ksyms char 55 ksyms diff --git a/sys/arch/arm/arm32/pmap.c b/sys/arch/arm/arm32/pmap.c index 5ec695b1f17..bf0853499da 100644 --- a/sys/arch/arm/arm32/pmap.c +++ b/sys/arch/arm/arm32/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.189 2008/11/04 07:21:24 matt Exp $ */ +/* $NetBSD: pmap.c,v 1.190 2008/11/12 12:35:57 ad Exp $ */ /* * Copyright 2003 Wasabi Systems, Inc. @@ -212,7 +212,7 @@ #include <machine/param.h> #include <arm/arm32/katelib.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.189 2008/11/04 07:21:24 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.190 2008/11/12 12:35:57 ad Exp $"); #ifdef PMAP_DEBUG @@ -5797,7 +5797,7 @@ pmap_devmap_find_va(vaddr_t va, vsize_t size) * These routines are called when the CPU type is identified to set up * the PTE prototypes, cache modes, etc. * - * The variables are always here, just in case LKMs need to reference + * The variables are always here, just in case modules need to reference * them (though, they shouldn't). */ diff --git a/sys/arch/arm/at91/at91bus.c b/sys/arch/arm/at91/at91bus.c index 06436c72b6d..12d04683301 100644 --- a/sys/arch/arm/at91/at91bus.c +++ b/sys/arch/arm/at91/at91bus.c @@ -1,4 +1,4 @@ -/* $NetBSD: at91bus.c,v 1.2 2008/07/03 01:15:38 matt Exp $ */ +/* $NetBSD: at91bus.c,v 1.3 2008/11/12 12:35:57 ad Exp $ */ /* * Copyright (c) 2007 Embedtronics Oy @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.2 2008/07/03 01:15:38 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: at91bus.c,v 1.3 2008/11/12 12:35:57 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -564,7 +564,7 @@ at91bus_setup(BootConfig *mem) ipkdb_connect(0); #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* Firmware doesn't load symbols. */ ksyms_init(0, NULL, NULL); #endif diff --git a/sys/arch/arm/conf/majors.arm32 b/sys/arch/arm/conf/majors.arm32 index 8f6c913f401..baa5793b717 100644 --- a/sys/arch/arm/conf/majors.arm32 +++ b/sys/arch/arm/conf/majors.arm32 @@ -1,4 +1,4 @@ -# $NetBSD: majors.arm32,v 1.28 2007/12/31 15:31:49 ad Exp $ +# $NetBSD: majors.arm32,v 1.29 2008/11/12 12:35:57 ad Exp $ # # Device majors for arm32 # @@ -37,7 +37,6 @@ device-major ses char 30 ses device-major bpf char 32 bpfilter device-major tun char 33 tun device-major filedesc char 34 -device-major lkm char 35 lkm device-major audio char 36 audio device-major vidcconsole char 37 vidcconsole diff --git a/sys/arch/arm/ofw/ofwgencfg_machdep.c b/sys/arch/arm/ofw/ofwgencfg_machdep.c index a8a26301c36..a3bafc33f90 100644 --- a/sys/arch/arm/ofw/ofwgencfg_machdep.c +++ b/sys/arch/arm/ofw/ofwgencfg_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: ofwgencfg_machdep.c,v 1.13 2008/08/29 19:08:29 matt Exp $ */ +/* $NetBSD: ofwgencfg_machdep.c,v 1.14 2008/11/12 12:35:57 ad Exp $ */ /* * Copyright 1997 @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofwgencfg_machdep.c,v 1.13 2008/08/29 19:08:29 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofwgencfg_machdep.c,v 1.14 2008/11/12 12:35:57 ad Exp $"); #include "opt_ddb.h" @@ -202,7 +202,7 @@ initarm(void *cookie) /* Set-up the IRQ system. */ irq_init(); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init(0, NULL, NULL); /* XXX */ #endif diff --git a/sys/arch/atari/atari/machdep.c b/sys/arch/atari/atari/machdep.c index 68e92833e98..3d251dc2d0d 100644 --- a/sys/arch/atari/atari/machdep.c +++ b/sys/arch/atari/atari/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.151 2008/11/11 06:46:40 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.152 2008/11/12 12:35:57 ad Exp $ */ /* * Copyright (c) 1982, 1986, 1990 The Regents of the University of California. @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.151 2008/11/11 06:46:40 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.152 2008/11/12 12:35:57 ad Exp $"); #include "opt_ddb.h" #include "opt_compat_netbsd.h" @@ -198,7 +198,7 @@ consinit(void) */ cninit(); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) { extern int end; extern int *esym; diff --git a/sys/arch/atari/conf/majors.atari b/sys/arch/atari/conf/majors.atari index 9bf5ccdd747..075a88967ce 100644 --- a/sys/arch/atari/conf/majors.atari +++ b/sys/arch/atari/conf/majors.atari @@ -1,4 +1,4 @@ -# $NetBSD: majors.atari,v 1.20 2007/12/31 15:31:50 ad Exp $ +# $NetBSD: majors.atari,v 1.21 2008/11/12 12:35:57 ad Exp $ # # Device majors for atari # @@ -23,7 +23,6 @@ device-major fd char 16 block 2 fd | fdisa | hdfd device-major vnd char 17 block 0 vnd device-major filedesc char 18 device-major bpf char 19 bpfilter -device-major lkm char 20 lkm device-major ses char 26 ses device-major ccd char 27 block 13 ccd diff --git a/sys/arch/bebox/conf/GENERIC b/sys/arch/bebox/conf/GENERIC index 7018db23031..febbae2905a 100644 --- a/sys/arch/bebox/conf/GENERIC +++ b/sys/arch/bebox/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.112 2008/08/10 15:31:20 tls Exp $ +# $NetBSD: GENERIC,v 1.113 2008/11/12 12:35:57 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/bebox/conf/std.bebox" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.112 $" +#ident "GENERIC-$Revision: 1.113 $" maxusers 32 @@ -40,7 +40,6 @@ options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel diff --git a/sys/arch/bebox/conf/majors.bebox b/sys/arch/bebox/conf/majors.bebox index 8e2940f1473..f75bf6fae74 100644 --- a/sys/arch/bebox/conf/majors.bebox +++ b/sys/arch/bebox/conf/majors.bebox @@ -1,4 +1,4 @@ -# $NetBSD: majors.bebox,v 1.20 2007/12/31 15:31:50 ad Exp $ +# $NetBSD: majors.bebox,v 1.21 2008/11/12 12:35:57 ad Exp $ # # Device majors for bebox # @@ -31,7 +31,6 @@ device-major md char 24 block 17 md device-major joy char 26 joy device-major spkr char 27 spkr -device-major lkm char 28 lkm device-major mms char 35 mms device-major lms char 36 lms diff --git a/sys/arch/cats/cats/cats_machdep.c b/sys/arch/cats/cats/cats_machdep.c index 190e156e525..d76cfb07dba 100644 --- a/sys/arch/cats/cats/cats_machdep.c +++ b/sys/arch/cats/cats/cats_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: cats_machdep.c,v 1.61 2008/11/11 06:46:40 dyoung Exp $ */ +/* $NetBSD: cats_machdep.c,v 1.62 2008/11/12 12:35:57 ad Exp $ */ /* * Copyright (c) 1997,1998 Mark Brinicombe. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.61 2008/11/11 06:46:40 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.62 2008/11/12 12:35:57 ad Exp $"); #include "opt_ddb.h" #include "opt_pmap_debug.h" @@ -882,7 +882,7 @@ initarm(void *arm_bootargs) footbridge_intr_init(); printf("done.\n"); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) #ifdef __ELF__ /* ok this is really rather sick, in ELF what happens is that the * ELF symbol table is added after the text section. diff --git a/sys/arch/cats/conf/GENERIC b/sys/arch/cats/conf/GENERIC index 87dfce606d5..fbf7cb966f1 100644 --- a/sys/arch/cats/conf/GENERIC +++ b/sys/arch/cats/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.124 2008/09/20 14:56:57 chris Exp $ +# $NetBSD: GENERIC,v 1.125 2008/11/12 12:35:57 ad Exp $ # # GENERIC machine description file # @@ -157,7 +157,6 @@ options P1003_1B_SEMAPHORE # p1003.1b semaphore support # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics options SCSIVERBOSE # Verbose SCSI errors options PCIVERBOSE # Verbose PCI descriptions diff --git a/sys/arch/cats/conf/INSTALL b/sys/arch/cats/conf/INSTALL index a07d9f45985..e385adbe532 100644 --- a/sys/arch/cats/conf/INSTALL +++ b/sys/arch/cats/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.67 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: INSTALL,v 1.68 2008/11/12 12:35:57 ad Exp $ # # CATSINST -- CHALTECH CATS Install kernel # @@ -115,7 +115,6 @@ options MEMORY_DISK_SERVER=0 # no userspace memory disk support # Miscellaneous kernel options #options KTRACE # system call tracing, a la ktrace(1) #options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors #options PCIVERBOSE # Verbose PCI descriptions diff --git a/sys/arch/cesfic/cesfic/machdep.c b/sys/arch/cesfic/cesfic/machdep.c index 2781670ba65..72bc9d3dd0e 100644 --- a/sys/arch/cesfic/cesfic/machdep.c +++ b/sys/arch/cesfic/cesfic/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.43 2008/11/11 06:46:40 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.44 2008/11/12 12:35:57 ad Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993 @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.43 2008/11/11 06:46:40 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.44 2008/11/12 12:35:57 ad Exp $"); #include "opt_bufcache.h" #include "opt_ddb.h" @@ -272,7 +272,7 @@ consinit() zscons.cn_getc = zs_kgdb_cngetc; } #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init(0, 0, 0); #endif #ifdef DDB diff --git a/sys/arch/cesfic/conf/GENERIC b/sys/arch/cesfic/conf/GENERIC index dbbf45c1f18..4dace19ab7b 100644 --- a/sys/arch/cesfic/conf/GENERIC +++ b/sys/arch/cesfic/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.50 2008/08/10 15:31:20 tls Exp $ +# $NetBSD: GENERIC,v 1.51 2008/11/12 12:35:57 ad Exp $ # # GENERIC machine description file # @@ -59,7 +59,6 @@ options COMPAT_40 # NetBSD 4.0 compatibility. #options P1003_1B_SEMAPHORE # p1003.1b semaphore support options KTRACE # system call tracing support #options NKMEMCLUSTERS=1024 # 4K pages in kernel malloc pool -#options LKM # Loadable kernel modules options COMPAT_SUNOS options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. diff --git a/sys/arch/cesfic/conf/majors.cesfic b/sys/arch/cesfic/conf/majors.cesfic index 73ded6bcf27..81797cb14a1 100644 --- a/sys/arch/cesfic/conf/majors.cesfic +++ b/sys/arch/cesfic/conf/majors.cesfic @@ -1,4 +1,4 @@ -# $NetBSD: majors.cesfic,v 1.19 2007/12/31 15:31:51 ad Exp $ +# $NetBSD: majors.cesfic,v 1.20 2008/11/12 12:35:58 ad Exp $ # # Device majors for cesfic # @@ -17,7 +17,6 @@ device-major zstty char 10 zstty device-major filedesc char 11 device-major bpf char 12 bpfilter device-major tun char 13 tun -device-major lkm char 14 lkm device-major md char 15 block 3 md device-major raid char 16 block 5 raid device-major sd char 17 block 6 sd diff --git a/sys/arch/cobalt/cobalt/machdep.c b/sys/arch/cobalt/cobalt/machdep.c index 0d5013e7061..7d71688e54c 100644 --- a/sys/arch/cobalt/cobalt/machdep.c +++ b/sys/arch/cobalt/cobalt/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.99 2008/11/11 06:46:40 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.100 2008/11/12 12:35:58 ad Exp $ */ /*- * Copyright (c) 2006 Izumi Tsutsui. All rights reserved. @@ -50,7 +50,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.99 2008/11/11 06:46:40 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.100 2008/11/12 12:35:58 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -86,7 +86,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.99 2008/11/11 06:46:40 dyoung Exp $"); #include "ksyms.h" -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) #include <machine/db_machdep.h> #include <ddb/db_extern.h> #define ELFSIZE DB_ELFSIZE @@ -152,7 +152,7 @@ mach_init(unsigned int memsize, u_int bim, char *bip) u_long first, last; extern char edata[], end[]; const char *bi_msg; -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) int nsym = 0; char *ssym = 0; struct btinfo_symtab *bi_syms; @@ -165,7 +165,7 @@ mach_init(unsigned int memsize, u_int bim, char *bip) if (memcmp(((Elf_Ehdr *)end)->e_ident, ELFMAG, SELFMAG) == 0 && ((Elf_Ehdr *)end)->e_ident[EI_CLASS] == ELFCLASS) { esym = end; -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) esym += ((Elf_Ehdr *)end)->e_entry; #endif kernend = (char *)mips_round_page(esym); @@ -209,7 +209,7 @@ mach_init(unsigned int memsize, u_int bim, char *bip) } else bi_msg = "invalid bootinfo (standalone boot?)\n"; -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) bi_syms = lookup_bootinfo(BTINFO_SYMTAB); /* Load symbol table if present */ @@ -284,7 +284,7 @@ mach_init(unsigned int memsize, u_int bim, char *bip) decode_bootstring(); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* init symbols if present */ if ((bi_syms != NULL) && (esym != NULL)) ksyms_init(esym - ssym, ssym, esym); diff --git a/sys/arch/cobalt/conf/GENERIC b/sys/arch/cobalt/conf/GENERIC index 2878611c707..8297ccaad38 100644 --- a/sys/arch/cobalt/conf/GENERIC +++ b/sys/arch/cobalt/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.119 2008/10/30 16:27:15 tsutsui Exp $ +# $NetBSD: GENERIC,v 1.120 2008/11/12 12:35:58 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/cobalt/conf/std.cobalt" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.119 $" +#ident "GENERIC-$Revision: 1.120 $" maxusers 32 @@ -32,7 +32,6 @@ options SYSVMSG # System V message queues options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options NTP # network time protocol options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/cobalt/conf/INSTALL b/sys/arch/cobalt/conf/INSTALL index 94949280ca0..609fe18fdcc 100644 --- a/sys/arch/cobalt/conf/INSTALL +++ b/sys/arch/cobalt/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.37 2008/10/30 16:27:16 tsutsui Exp $ +# $NetBSD: INSTALL,v 1.38 2008/11/12 12:35:58 ad Exp $ # # INSTALL -- installation and rescue kernel. # @@ -10,7 +10,7 @@ include "arch/cobalt/conf/std.cobalt" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "INSTALL-$Revision: 1.37 $" +#ident "INSTALL-$Revision: 1.38 $" makeoptions COPTS="-Os -mmemcpy" makeoptions CPUFLAGS="-march=vr5000 -mabi=32" @@ -28,7 +28,6 @@ maxusers 32 #options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default #options P1003_1B_SEMAPHORE # p1003.1b semaphore support -#options LKM # loadable kernel modules #options NTP # network time protocol #options USERCONF # userconf(4) support options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/cobalt/conf/majors.cobalt b/sys/arch/cobalt/conf/majors.cobalt index f006b2fe8f0..10427c37964 100644 --- a/sys/arch/cobalt/conf/majors.cobalt +++ b/sys/arch/cobalt/conf/majors.cobalt @@ -1,4 +1,4 @@ -# $NetBSD: majors.cobalt,v 1.24 2008/10/12 04:36:36 tsutsui Exp $ +# $NetBSD: majors.cobalt,v 1.25 2008/11/12 12:35:58 ad Exp $ # # Device majors for cobalt # @@ -20,7 +20,6 @@ device-major ptc char 13 pty device-major log char 14 device-major filedesc char 15 device-major rnd char 16 rnd -device-major lkm char 17 lkm device-major bpf char 18 bpfilter device-major tun char 19 tun device-major ipl char 20 ipfilter diff --git a/sys/arch/dreamcast/conf/majors.dreamcast b/sys/arch/dreamcast/conf/majors.dreamcast index 3c1a471b783..19f31db72a4 100644 --- a/sys/arch/dreamcast/conf/majors.dreamcast +++ b/sys/arch/dreamcast/conf/majors.dreamcast @@ -1,4 +1,4 @@ -# $NetBSD: majors.dreamcast,v 1.20 2007/12/31 15:31:52 ad Exp $ +# $NetBSD: majors.dreamcast,v 1.21 2008/11/12 12:35:58 ad Exp $ # # Device majors for dreamcast # @@ -28,7 +28,6 @@ device-major filedesc char 22 device-major bpf char 23 bpfilter device-major md char 24 block 17 md -device-major lkm char 28 lkm device-major tun char 40 tun device-major vnd char 41 block 14 vnd diff --git a/sys/arch/dreamcast/dreamcast/machdep.c b/sys/arch/dreamcast/dreamcast/machdep.c index 79862640e1c..537cc8e406a 100644 --- a/sys/arch/dreamcast/dreamcast/machdep.c +++ b/sys/arch/dreamcast/dreamcast/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.37 2008/11/11 06:46:41 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.38 2008/11/12 12:35:58 ad Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2002 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.37 2008/11/11 06:46:41 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.38 2008/11/12 12:35:58 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -139,7 +139,7 @@ dreamcast_startup(void) pmap_bootstrap(); /* Debugger. */ -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init(0, NULL, NULL); #endif #if defined(KGDB) && (NSCIF > 0) diff --git a/sys/arch/evbarm/adi_brh/brh_machdep.c b/sys/arch/evbarm/adi_brh/brh_machdep.c index cbd1a450619..b1dc2c6daed 100644 --- a/sys/arch/evbarm/adi_brh/brh_machdep.c +++ b/sys/arch/evbarm/adi_brh/brh_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: brh_machdep.c,v 1.29 2008/11/11 06:46:41 dyoung Exp $ */ +/* $NetBSD: brh_machdep.c,v 1.30 2008/11/12 12:35:58 ad Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.29 2008/11/11 06:46:41 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: brh_machdep.c,v 1.30 2008/11/12 12:35:58 ad Exp $"); #include "opt_ddb.h" #include "opt_pmap_debug.h" @@ -803,7 +803,7 @@ initarm(void *arg) printf("done.\n"); #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* Firmware doesn't load symbols. */ ksyms_init(0, NULL, NULL); #endif diff --git a/sys/arch/evbarm/armadillo/armadillo9_machdep.c b/sys/arch/evbarm/armadillo/armadillo9_machdep.c index 16de9d3d288..1f072f28ad5 100644 --- a/sys/arch/evbarm/armadillo/armadillo9_machdep.c +++ b/sys/arch/evbarm/armadillo/armadillo9_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: armadillo9_machdep.c,v 1.12 2008/11/11 06:46:41 dyoung Exp $ */ +/* $NetBSD: armadillo9_machdep.c,v 1.13 2008/11/12 12:35:58 ad Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -110,7 +110,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.12 2008/11/11 06:46:41 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: armadillo9_machdep.c,v 1.13 2008/11/12 12:35:58 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -881,7 +881,7 @@ initarm(void *arg) boothowto = BOOTHOWTO; #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* Firmware doesn't load symbols. */ ksyms_init(0, NULL, NULL); #endif diff --git a/sys/arch/evbarm/conf/ADI_BRH b/sys/arch/evbarm/conf/ADI_BRH index 8458ad9724f..811013fa8e2 100644 --- a/sys/arch/evbarm/conf/ADI_BRH +++ b/sys/arch/evbarm/conf/ADI_BRH @@ -1,4 +1,4 @@ -# $NetBSD: ADI_BRH,v 1.43 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: ADI_BRH,v 1.44 2008/11/12 12:35:58 ad Exp $ # # ADI_BRH -- ADI Engineering "Big Red Head" i80200 Evaluation Board # @@ -119,7 +119,6 @@ options SHMMAXPGS=1024 # 1024 pages is the default # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors options PCIVERBOSE # Verbose PCI descriptions diff --git a/sys/arch/evbarm/conf/ARMADILLO210 b/sys/arch/evbarm/conf/ARMADILLO210 index 41dae6a5a00..964f6819ce1 100644 --- a/sys/arch/evbarm/conf/ARMADILLO210 +++ b/sys/arch/evbarm/conf/ARMADILLO210 @@ -1,4 +1,4 @@ -# $NetBSD: ARMADILLO210,v 1.8 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: ARMADILLO210,v 1.9 2008/11/12 12:35:58 ad Exp $ # # ARMADILLO210 -- Atmark Techno, Armadillo-210 # @@ -111,7 +111,6 @@ options CONUNIT=1 # Console port number # Miscellaneous kernel options #options KTRACE # system call tracing, a la ktrace(1) #options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors #options PCIVERBOSE # Verbose PCI descriptions diff --git a/sys/arch/evbarm/conf/ARMADILLO9 b/sys/arch/evbarm/conf/ARMADILLO9 index f6aa57624a7..fbc486ce2d3 100644 --- a/sys/arch/evbarm/conf/ARMADILLO9 +++ b/sys/arch/evbarm/conf/ARMADILLO9 @@ -1,4 +1,4 @@ -# $NetBSD: ARMADILLO9,v 1.21 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: ARMADILLO9,v 1.22 2008/11/12 12:35:58 ad Exp $ # # ARMADILLO9 -- Atmark Techno, Armadillo-9 # @@ -110,7 +110,6 @@ options CONUNIT=0 # Console port number # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) #options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors #options PCIVERBOSE # Verbose PCI descriptions diff --git a/sys/arch/evbarm/conf/BEAGLEBOARD b/sys/arch/evbarm/conf/BEAGLEBOARD index d0681172b43..7ef6630fbcf 100644 --- a/sys/arch/evbarm/conf/BEAGLEBOARD +++ b/sys/arch/evbarm/conf/BEAGLEBOARD @@ -1,5 +1,5 @@ # -# $NetBSD: BEAGLEBOARD,v 1.2 2008/10/22 17:38:59 matt Exp $ +# $NetBSD: BEAGLEBOARD,v 1.3 2008/11/12 12:35:58 ad Exp $ # # BEAGLEBOARD -- TI OMAP 3530 Eval Board Kernel # @@ -123,7 +123,6 @@ options SYSVSHM # System V-like memory sharing # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors #options MIIVERBOSE # Verbose MII autoconfuration messages diff --git a/sys/arch/evbarm/conf/CP3100 b/sys/arch/evbarm/conf/CP3100 index 73ca3ade387..5838a329f41 100644 --- a/sys/arch/evbarm/conf/CP3100 +++ b/sys/arch/evbarm/conf/CP3100 @@ -1,4 +1,4 @@ -# $NetBSD: CP3100,v 1.9 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: CP3100,v 1.10 2008/11/12 12:35:58 ad Exp $ # # CP3100 -- Certance CP3100 Kernel # @@ -124,7 +124,6 @@ options CONSPEED=115200 # Console speed # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors #options PCIVERBOSE # Verbose PCI descriptions diff --git a/sys/arch/evbarm/conf/GEMINI b/sys/arch/evbarm/conf/GEMINI index 9248754a7f8..18fb5727b71 100644 --- a/sys/arch/evbarm/conf/GEMINI +++ b/sys/arch/evbarm/conf/GEMINI @@ -113,7 +113,6 @@ options SYSVSHM # System V-like memory sharing # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors #options MIIVERBOSE # Verbose MII autoconfuration messages diff --git a/sys/arch/evbarm/conf/GEMINI_MASTER b/sys/arch/evbarm/conf/GEMINI_MASTER index 2f20e959acd..1318614ed38 100644 --- a/sys/arch/evbarm/conf/GEMINI_MASTER +++ b/sys/arch/evbarm/conf/GEMINI_MASTER @@ -113,7 +113,6 @@ options MEMORY_DISK_DYNAMIC # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors #options MIIVERBOSE # Verbose MII autoconfuration messages diff --git a/sys/arch/evbarm/conf/GEMINI_SLAVE b/sys/arch/evbarm/conf/GEMINI_SLAVE index e2c0762b225..db1e8e63e38 100644 --- a/sys/arch/evbarm/conf/GEMINI_SLAVE +++ b/sys/arch/evbarm/conf/GEMINI_SLAVE @@ -112,7 +112,6 @@ options MEMORY_DISK_DYNAMIC # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors #options MIIVERBOSE # Verbose MII autoconfuration messages diff --git a/sys/arch/evbarm/conf/GUMSTIX b/sys/arch/evbarm/conf/GUMSTIX index 388ef3d856b..e165ee18038 100644 --- a/sys/arch/evbarm/conf/GUMSTIX +++ b/sys/arch/evbarm/conf/GUMSTIX @@ -1,4 +1,4 @@ -# $NetBSD: GUMSTIX,v 1.29 2008/10/19 11:34:31 joerg Exp $ +# $NetBSD: GUMSTIX,v 1.30 2008/11/12 12:35:58 ad Exp $ # # GUMSTIX -- Gumstix. Inc. gumstix platforms kernel # @@ -135,7 +135,6 @@ options P1003_1B_SEMAPHORE # p1003.1b semaphore support options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics options PCMCIAVERBOSE # verbose PCMCIA configuration messages #options USBVERBOSE # verbose USB device autoconfig messages diff --git a/sys/arch/evbarm/conf/HDL_G b/sys/arch/evbarm/conf/HDL_G index 140dcb0ce70..b2fa537a537 100644 --- a/sys/arch/evbarm/conf/HDL_G +++ b/sys/arch/evbarm/conf/HDL_G @@ -1,4 +1,4 @@ -# $NetBSD: HDL_G,v 1.11 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: HDL_G,v 1.12 2008/11/12 12:35:58 ad Exp $ # # HDL_G -- I-O DATA HDL-G Kernel # @@ -120,7 +120,6 @@ options P1003_1B_SEMAPHORE # p1003.1b semaphore support # Miscellaneous kernel options options KTRACE # system call tracing via ktrace(1) options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors options PCIVERBOSE # Verbose PCI descriptions diff --git a/sys/arch/evbarm/conf/IMX31LITE b/sys/arch/evbarm/conf/IMX31LITE index 97092c5bcb0..7aec4f4795b 100644 --- a/sys/arch/evbarm/conf/IMX31LITE +++ b/sys/arch/evbarm/conf/IMX31LITE @@ -1,4 +1,4 @@ -# $NetBSD: IMX31LITE,v 1.4 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: IMX31LITE,v 1.5 2008/11/12 12:35:58 ad Exp $ # # IMX31LITE -- Freescale IMX31LITE Evaluation Board Kernel # @@ -115,7 +115,6 @@ options SHMMAXPGS=1024 # 1024 pages is the default # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors options MIIVERBOSE # Verbose MII autoconfuration messages diff --git a/sys/arch/evbarm/conf/INTEGRATOR b/sys/arch/evbarm/conf/INTEGRATOR index ece4276a784..9694d05614e 100644 --- a/sys/arch/evbarm/conf/INTEGRATOR +++ b/sys/arch/evbarm/conf/INTEGRATOR @@ -1,4 +1,4 @@ -# $NetBSD: INTEGRATOR,v 1.52 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: INTEGRATOR,v 1.53 2008/11/12 12:35:58 ad Exp $ # # GENERIC -- ARM Integrator board Generic kernel # @@ -114,7 +114,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics options SCSIVERBOSE # Verbose SCSI errors options PCIVERBOSE # Verbose PCI descriptions diff --git a/sys/arch/evbarm/conf/IQ31244 b/sys/arch/evbarm/conf/IQ31244 index 7bf578db52f..dab27385c79 100644 --- a/sys/arch/evbarm/conf/IQ31244 +++ b/sys/arch/evbarm/conf/IQ31244 @@ -1,4 +1,4 @@ -# $NetBSD: IQ31244,v 1.40 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: IQ31244,v 1.41 2008/11/12 12:35:58 ad Exp $ # # IQ31244 -- Intel IQ31244 Evaluation Board Kernel # @@ -117,7 +117,6 @@ options SHMMAXPGS=1024 # 1024 pages is the default # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors options PCIVERBOSE # Verbose PCI descriptions diff --git a/sys/arch/evbarm/conf/IQ80310 b/sys/arch/evbarm/conf/IQ80310 index 4c5db7756b0..b0ebee76f92 100644 --- a/sys/arch/evbarm/conf/IQ80310 +++ b/sys/arch/evbarm/conf/IQ80310 @@ -1,4 +1,4 @@ -# $NetBSD: IQ80310,v 1.61 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: IQ80310,v 1.62 2008/11/12 12:35:58 ad Exp $ # # IQ80310 -- Intel IQ80310 Evaluation Board Kernel # @@ -119,7 +119,6 @@ options SHMMAXPGS=1024 # 1024 pages is the default # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors options PCIVERBOSE # Verbose PCI descriptions diff --git a/sys/arch/evbarm/conf/IQ80321 b/sys/arch/evbarm/conf/IQ80321 index cfa0f7320f5..11e32331d18 100644 --- a/sys/arch/evbarm/conf/IQ80321 +++ b/sys/arch/evbarm/conf/IQ80321 @@ -1,4 +1,4 @@ -# $NetBSD: IQ80321,v 1.56 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: IQ80321,v 1.57 2008/11/12 12:35:58 ad Exp $ # # IQ80321 -- Intel IQ80321 Evaluation Board Kernel # @@ -117,7 +117,6 @@ options SHMMAXPGS=1024 # 1024 pages is the default # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors options PCIVERBOSE # Verbose PCI descriptions diff --git a/sys/arch/evbarm/conf/IXDP425 b/sys/arch/evbarm/conf/IXDP425 index 8e1d891cf78..7b7e293f90b 100644 --- a/sys/arch/evbarm/conf/IXDP425 +++ b/sys/arch/evbarm/conf/IXDP425 @@ -1,4 +1,4 @@ -# $NetBSD: IXDP425,v 1.24 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: IXDP425,v 1.25 2008/11/12 12:35:58 ad Exp $ # # IXDP425 -- Intel IXDP425/IXCDP1100 Development Platform # @@ -122,7 +122,6 @@ options CONUNIT=0 # Console port number # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors options PCIVERBOSE # Verbose PCI descriptions diff --git a/sys/arch/evbarm/conf/IXM1200 b/sys/arch/evbarm/conf/IXM1200 index 19bd87344bd..dec799068da 100644 --- a/sys/arch/evbarm/conf/IXM1200 +++ b/sys/arch/evbarm/conf/IXM1200 @@ -1,4 +1,4 @@ -# $NetBSD: IXM1200,v 1.35 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: IXM1200,v 1.36 2008/11/12 12:35:58 ad Exp $ # # IXM1200 -- Intel IXM1200 Evaluation Board Kernel # @@ -116,7 +116,6 @@ options SHMMAXPGS=1024 # 1024 pages is the default # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors options PCIVERBOSE # Verbose PCI descriptions diff --git a/sys/arch/evbarm/conf/LUBBOCK b/sys/arch/evbarm/conf/LUBBOCK index b5aba3007e0..8c06ada44c9 100644 --- a/sys/arch/evbarm/conf/LUBBOCK +++ b/sys/arch/evbarm/conf/LUBBOCK @@ -113,7 +113,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics options PCMCIAVERBOSE # verbose PCMCIA configuration messages #options SCSIVERBOSE # Verbose SCSI errors diff --git a/sys/arch/evbarm/conf/MPCSA_GENERIC b/sys/arch/evbarm/conf/MPCSA_GENERIC index 33612fba75c..005bb64acbf 100644 --- a/sys/arch/evbarm/conf/MPCSA_GENERIC +++ b/sys/arch/evbarm/conf/MPCSA_GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: MPCSA_GENERIC,v 1.5 2008/10/07 12:43:31 pgoyette Exp $ +# $NetBSD: MPCSA_GENERIC,v 1.6 2008/11/12 12:35:58 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/evbarm/conf/std.mpcsa" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.5 $" +#ident "GENERIC-$Revision: 1.6 $" maxusers 32 # estimated number of users @@ -68,7 +68,6 @@ options SYSVSHM # System V-like memory sharing #options SHMMAXPGS=2048 # 2048 pages is the default options P1003_1B_SEMAPHORE # p1003.1b semaphore support -#options LKM # loadable kernel modules #options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/evbarm/conf/NAPPI b/sys/arch/evbarm/conf/NAPPI index df871125e75..7f241feb387 100644 --- a/sys/arch/evbarm/conf/NAPPI +++ b/sys/arch/evbarm/conf/NAPPI @@ -1,4 +1,4 @@ -# $NetBSD: NAPPI,v 1.29 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: NAPPI,v 1.30 2008/11/12 12:35:58 ad Exp $ # # NAPPI -- Netwise APlication Platform Board Kernel # @@ -110,7 +110,6 @@ options SHMMAXPGS=1024 # 1024 pages is the default # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors options PCIVERBOSE # Verbose PCI descriptions diff --git a/sys/arch/evbarm/conf/NSLU2 b/sys/arch/evbarm/conf/NSLU2 index 24a2852dc8a..c12154bf079 100644 --- a/sys/arch/evbarm/conf/NSLU2 +++ b/sys/arch/evbarm/conf/NSLU2 @@ -1,4 +1,4 @@ -# $NetBSD: NSLU2,v 1.11 2008/05/30 20:10:01 tsutsui Exp $ +# $NetBSD: NSLU2,v 1.12 2008/11/12 12:35:58 ad Exp $ # # Linksys NSLU2 "Slug" NAS Device # @@ -121,7 +121,6 @@ options CONUNIT=0 # Console port number # Miscellaneous kernel options #options KTRACE # system call tracing, a la ktrace(1) #options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors #options PCIVERBOSE # Verbose PCI descriptions diff --git a/sys/arch/evbarm/conf/OSK5912 b/sys/arch/evbarm/conf/OSK5912 index 88602e0cc22..c20e1c7819f 100644 --- a/sys/arch/evbarm/conf/OSK5912 +++ b/sys/arch/evbarm/conf/OSK5912 @@ -111,7 +111,6 @@ options SYSVSHM # System V-like memory sharing # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors #options MIIVERBOSE # Verbose MII autoconfuration messages diff --git a/sys/arch/evbarm/conf/SMDK2410 b/sys/arch/evbarm/conf/SMDK2410 index 11c6010f389..d8553b90a5f 100644 --- a/sys/arch/evbarm/conf/SMDK2410 +++ b/sys/arch/evbarm/conf/SMDK2410 @@ -1,4 +1,4 @@ -# $NetBSD: SMDK2410,v 1.34 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: SMDK2410,v 1.35 2008/11/12 12:35:58 ad Exp $ # # SMDK2410 -- Samsung's S3C2410 evaluation board. # @@ -126,7 +126,6 @@ options SYSVSHM # System V-like memory sharing # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) #XXX: options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics options SCSIVERBOSE # Verbose SCSI errors options PCIVERBOSE # Verbose PCI descriptions diff --git a/sys/arch/evbarm/conf/SMDK2800 b/sys/arch/evbarm/conf/SMDK2800 index 700a9f9a450..22e7f186e2b 100644 --- a/sys/arch/evbarm/conf/SMDK2800 +++ b/sys/arch/evbarm/conf/SMDK2800 @@ -1,4 +1,4 @@ -# $NetBSD: SMDK2800,v 1.35 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: SMDK2800,v 1.36 2008/11/12 12:35:58 ad Exp $ # # SMDK2800 -- Samsung's S3C2800 evaluation board. # @@ -115,7 +115,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) #XXX: options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics options SCSIVERBOSE # Verbose SCSI errors options PCIVERBOSE # Verbose PCI descriptions diff --git a/sys/arch/evbarm/conf/TEAMASA_NPWR b/sys/arch/evbarm/conf/TEAMASA_NPWR index 2368d0603f9..c9486f2b5fe 100644 --- a/sys/arch/evbarm/conf/TEAMASA_NPWR +++ b/sys/arch/evbarm/conf/TEAMASA_NPWR @@ -1,4 +1,4 @@ -# $NetBSD: TEAMASA_NPWR,v 1.57 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: TEAMASA_NPWR,v 1.58 2008/11/12 12:35:58 ad Exp $ # # TEAMASA_NPWR -- Team ASA, Inc. Npwr -- XScale/IOP310-based # server appliance. @@ -124,7 +124,6 @@ options SHMMAXPGS=1024 # 1024 pages is the default # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics options SCSIVERBOSE # Verbose SCSI errors options PCIVERBOSE # Verbose PCI descriptions diff --git a/sys/arch/evbarm/conf/TEAMASA_NPWR_FC b/sys/arch/evbarm/conf/TEAMASA_NPWR_FC index 6148a1844b0..18237583abb 100644 --- a/sys/arch/evbarm/conf/TEAMASA_NPWR_FC +++ b/sys/arch/evbarm/conf/TEAMASA_NPWR_FC @@ -1,4 +1,4 @@ -# $NetBSD: TEAMASA_NPWR_FC,v 1.22 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: TEAMASA_NPWR_FC,v 1.23 2008/11/12 12:35:58 ad Exp $ # # TeamASA NPWR-FC, i80321-based SBC # @@ -118,7 +118,6 @@ options SHMMAXPGS=1024 # 1024 pages is the default # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors options PCIVERBOSE # Verbose PCI descriptions diff --git a/sys/arch/evbarm/conf/TISDP2420 b/sys/arch/evbarm/conf/TISDP2420 index 2380c40f58b..67541698679 100644 --- a/sys/arch/evbarm/conf/TISDP2420 +++ b/sys/arch/evbarm/conf/TISDP2420 @@ -1,5 +1,5 @@ # -# $NetBSD: TISDP2420,v 1.6 2008/10/21 23:45:06 matt Exp $ +# $NetBSD: TISDP2420,v 1.7 2008/11/12 12:35:58 ad Exp $ # # TISDP2420 -- TI OMAP 2420 Eval Board Kernel # @@ -123,7 +123,6 @@ options SYSVSHM # System V-like memory sharing # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors #options MIIVERBOSE # Verbose MII autoconfuration messages diff --git a/sys/arch/evbarm/conf/TISDP2430 b/sys/arch/evbarm/conf/TISDP2430 index 60e3ea3b500..daa8287b15a 100644 --- a/sys/arch/evbarm/conf/TISDP2430 +++ b/sys/arch/evbarm/conf/TISDP2430 @@ -1,5 +1,5 @@ # -# $NetBSD: TISDP2430,v 1.6 2008/10/30 04:27:35 matt Exp $ +# $NetBSD: TISDP2430,v 1.7 2008/11/12 12:35:58 ad Exp $ # # TISDP2430 -- TI OMAP 2430 Eval Board Kernel # @@ -122,7 +122,6 @@ options SYSVSHM # System V-like memory sharing # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors #options MIIVERBOSE # Verbose MII autoconfuration messages diff --git a/sys/arch/evbarm/conf/TS7200 b/sys/arch/evbarm/conf/TS7200 index eff0070dd21..470589277a1 100644 --- a/sys/arch/evbarm/conf/TS7200 +++ b/sys/arch/evbarm/conf/TS7200 @@ -1,4 +1,4 @@ -# $NetBSD: TS7200,v 1.33 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: TS7200,v 1.34 2008/11/12 12:35:58 ad Exp $ # # GENERIC -- Generic kernel # @@ -112,7 +112,6 @@ options SHMMAXPGS=1024 # 1024 pages is the default # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors #options PCIVERBOSE # Verbose PCI descriptions diff --git a/sys/arch/evbarm/conf/TWINTAIL b/sys/arch/evbarm/conf/TWINTAIL index 301ddc205f2..45f3fb07e60 100644 --- a/sys/arch/evbarm/conf/TWINTAIL +++ b/sys/arch/evbarm/conf/TWINTAIL @@ -1,4 +1,4 @@ -# $NetBSD: TWINTAIL,v 1.25 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: TWINTAIL,v 1.26 2008/11/12 12:35:58 ad Exp $ # # TWINTAIL -- Genetec corp. G4255EB-X002 Evaluation Board Kernel # @@ -117,7 +117,6 @@ options COMPAT_16 # NetBSD 1.6 compatibility. # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics options PCMCIAVERBOSE # verbose PCMCIA configuration messages options USBVERBOSE # verbose USB device autoconfig messages diff --git a/sys/arch/evbarm/conf/VIPER b/sys/arch/evbarm/conf/VIPER index f65d94accdf..630dc540ef8 100644 --- a/sys/arch/evbarm/conf/VIPER +++ b/sys/arch/evbarm/conf/VIPER @@ -1,4 +1,4 @@ -# $NetBSD: VIPER,v 1.13 2008/05/30 20:10:01 tsutsui Exp $ +# $NetBSD: VIPER,v 1.14 2008/11/12 12:35:58 ad Exp $ # # Arcom Viper # @@ -112,7 +112,6 @@ options SHMMAXPGS=1024 # 1024 pages is the default # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors #options PCIVERBOSE # Verbose PCI descriptions diff --git a/sys/arch/evbarm/conf/ZAO425 b/sys/arch/evbarm/conf/ZAO425 index 8997a3d0dd1..fecafde1577 100644 --- a/sys/arch/evbarm/conf/ZAO425 +++ b/sys/arch/evbarm/conf/ZAO425 @@ -1,4 +1,4 @@ -# $NetBSD: ZAO425,v 1.32 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: ZAO425,v 1.33 2008/11/12 12:35:58 ad Exp $ # # ZAO425 -- Intel IXP425 # @@ -122,7 +122,6 @@ options CONUNIT=0 # Console port number # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors options PCIVERBOSE # Verbose PCI descriptions diff --git a/sys/arch/evbarm/gumstix/gumstix_machdep.c b/sys/arch/evbarm/gumstix/gumstix_machdep.c index feb6f9f41ed..bd2b2288864 100644 --- a/sys/arch/evbarm/gumstix/gumstix_machdep.c +++ b/sys/arch/evbarm/gumstix/gumstix_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: gumstix_machdep.c,v 1.10 2008/11/11 06:46:41 dyoung Exp $ */ +/* $NetBSD: gumstix_machdep.c,v 1.11 2008/11/12 12:35:59 ad Exp $ */ /* * Copyright (C) 2005, 2006, 2007 WIDE Project and SOUM Corporation. * All rights reserved. @@ -387,9 +387,9 @@ static const struct pmap_devmap gumstix_devmap[] = { VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, { - GUMSTIX_CLKMAN_VBASE, - _A(PXA2X0_CLKMAN_BASE), - _S(PXA2X0_CLKMAN_SIZE), + GUMSTIX_CMODULARAN_VBASE, + _A(PXA2X0_CMODULARAN_BASE), + _S(PXA2X0_CMODULARAN_SIZE), VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, { @@ -461,7 +461,7 @@ initarm(void *arg) pmap_devmap_bootstrap((vaddr_t)read_ttb(), gumstix_devmap); /* start 32.768kHz OSC */ - ioreg_write(GUMSTIX_CLKMAN_VBASE + CLKMAN_OSCC, OSCC_OON); + ioreg_write(GUMSTIX_CMODULARAN_VBASE + CMODULARAN_OSCC, OSCC_OON); /* Get ready for splfoo() */ pxa2x0_intr_bootstrap(GUMSTIX_INTCTL_VBASE); @@ -860,7 +860,7 @@ initarm(void *arg) } #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* Firmware doesn't load symbols. */ ddb_init(0, NULL, NULL); #endif @@ -983,7 +983,7 @@ void consinit(void) { static int consinit_called = 0; - uint32_t ckenreg = ioreg_read(GUMSTIX_CLKMAN_VBASE + CLKMAN_CKEN); + uint32_t ckenreg = ioreg_read(GUMSTIX_CMODULARAN_VBASE + CMODULARAN_CKEN); if (consinit_called != 0) return; @@ -1001,7 +1001,7 @@ consinit(void) { if (0 == comcnattach(&pxa2x0_a4x_bs_tag, PXA2X0_FFUART_BASE, comcnspeed, PXA2X0_COM_FREQ, COM_TYPE_PXA2x0, comcnmode)) { - ioreg_write(GUMSTIX_CLKMAN_VBASE + CLKMAN_CKEN, + ioreg_write(GUMSTIX_CMODULARAN_VBASE + CMODULARAN_CKEN, ckenreg|CKEN_FFUART); return; @@ -1018,7 +1018,7 @@ consinit(void) { if (0 == comcnattach(&pxa2x0_a4x_bs_tag, PXA2X0_STUART_BASE, comcnspeed, PXA2X0_COM_FREQ, COM_TYPE_PXA2x0, comcnmode)) { - ioreg_write(GUMSTIX_CLKMAN_VBASE + CLKMAN_CKEN, + ioreg_write(GUMSTIX_CMODULARAN_VBASE + CMODULARAN_CKEN, ckenreg|CKEN_STUART); return; } @@ -1034,7 +1034,7 @@ consinit(void) { if (0 == comcnattach(&pxa2x0_a4x_bs_tag, PXA2X0_BTUART_BASE, comcnspeed, PXA2X0_COM_FREQ, COM_TYPE_PXA2x0, comcnmode)) { - ioreg_write(GUMSTIX_CLKMAN_VBASE + CLKMAN_CKEN, + ioreg_write(GUMSTIX_CMODULARAN_VBASE + CMODULARAN_CKEN, ckenreg|CKEN_BTUART); return; } @@ -1050,7 +1050,7 @@ consinit(void) { if (0 == comcnattach(&pxa2x0_a4x_bs_tag, PXA2X0_HWUART_BASE, comcnspeed, PXA2X0_COM_FREQ, COM_TYPE_PXA2x0, comcnmode)) { - ioreg_write(GUMSTIX_CLKMAN_VBASE + CLKMAN_CKEN, + ioreg_write(GUMSTIX_CMODULARAN_VBASE + CMODULARAN_CKEN, ckenreg|CKEN_HWUART); return; } @@ -1067,7 +1067,7 @@ kgdb_port_init(void) { #if (NCOM > 0) && defined(COM_PXA2X0) paddr_t paddr = 0; - uint32_t ckenreg = ioreg_read(GUMSTIX_CLKMAN_VBASE + CLKMAN_CKEN); + uint32_t ckenreg = ioreg_read(GUMSTIX_CMODULARAN_VBASE + CMODULARAN_CKEN); if (0 == strcmp(kgdb_devname, "ffuart")) { paddr = PXA2X0_FFUART_BASE; @@ -1087,7 +1087,7 @@ kgdb_port_init(void) 0 == com_kgdb_attach(&pxa2x0_a4x_bs_tag, paddr, kgdb_devrate, PXA2X0_COM_FREQ, COM_TYPE_PXA2x0, comkgdbmode)) { - ioreg_write(GUMSTIX_CLKMAN_VBASE + CLKMAN_CKEN, ckenreg); + ioreg_write(GUMSTIX_CMODULARAN_VBASE + CMODULARAN_CKEN, ckenreg); } diff --git a/sys/arch/evbarm/hdl_g/hdlg_machdep.c b/sys/arch/evbarm/hdl_g/hdlg_machdep.c index bb7ae2cf277..1d261fba78e 100644 --- a/sys/arch/evbarm/hdl_g/hdlg_machdep.c +++ b/sys/arch/evbarm/hdl_g/hdlg_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: hdlg_machdep.c,v 1.7 2008/11/11 06:46:41 dyoung Exp $ */ +/* $NetBSD: hdlg_machdep.c,v 1.8 2008/11/12 12:35:59 ad Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.7 2008/11/11 06:46:41 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hdlg_machdep.c,v 1.8 2008/11/12 12:35:59 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -649,7 +649,7 @@ initarm(void *arg) boothowto = BOOTHOWTO; #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* Firmware doesn't load symbols. */ ksyms_init(0, NULL, NULL); #endif diff --git a/sys/arch/evbarm/integrator/integrator_machdep.c b/sys/arch/evbarm/integrator/integrator_machdep.c index be1dd2b3a55..f746985ccca 100644 --- a/sys/arch/evbarm/integrator/integrator_machdep.c +++ b/sys/arch/evbarm/integrator/integrator_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: integrator_machdep.c,v 1.59 2008/11/11 06:46:41 dyoung Exp $ */ +/* $NetBSD: integrator_machdep.c,v 1.60 2008/11/12 12:35:59 ad Exp $ */ /* * Copyright (c) 2001,2002 ARM Ltd @@ -68,7 +68,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: integrator_machdep.c,v 1.59 2008/11/11 06:46:41 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: integrator_machdep.c,v 1.60 2008/11/12 12:35:59 ad Exp $"); #include "opt_ddb.h" #include "opt_pmap_debug.h" @@ -779,7 +779,7 @@ initarm(void *arg) printf("done.\n"); #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* Firmware doesn't load symbols. */ ksyms_init(0, NULL, NULL); #endif diff --git a/sys/arch/evbarm/iq80310/iq80310_machdep.c b/sys/arch/evbarm/iq80310/iq80310_machdep.c index 7fa2fa84c94..34cae84147c 100644 --- a/sys/arch/evbarm/iq80310/iq80310_machdep.c +++ b/sys/arch/evbarm/iq80310/iq80310_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: iq80310_machdep.c,v 1.71 2008/11/11 06:46:41 dyoung Exp $ */ +/* $NetBSD: iq80310_machdep.c,v 1.72 2008/11/12 12:35:59 ad Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.71 2008/11/11 06:46:41 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iq80310_machdep.c,v 1.72 2008/11/12 12:35:59 ad Exp $"); #include "opt_ddb.h" #include "opt_pmap_debug.h" @@ -765,7 +765,7 @@ initarm(void *arg) printf("done.\n"); #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* Firmware doesn't load symbols. */ ksyms_init(0, NULL, NULL); #endif diff --git a/sys/arch/evbarm/iq80321/iq80321_machdep.c b/sys/arch/evbarm/iq80321/iq80321_machdep.c index 0881aaf912a..55b4d292399 100644 --- a/sys/arch/evbarm/iq80321/iq80321_machdep.c +++ b/sys/arch/evbarm/iq80321/iq80321_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: iq80321_machdep.c,v 1.40 2008/11/11 06:46:41 dyoung Exp $ */ +/* $NetBSD: iq80321_machdep.c,v 1.41 2008/11/12 12:35:59 ad Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.40 2008/11/11 06:46:41 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iq80321_machdep.c,v 1.41 2008/11/12 12:35:59 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -784,7 +784,7 @@ initarm(void *arg) boothowto = BOOTHOWTO; #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* Firmware doesn't load symbols. */ ksyms_init(0, NULL, NULL); #endif diff --git a/sys/arch/evbarm/ixdp425/ixdp425_machdep.c b/sys/arch/evbarm/ixdp425/ixdp425_machdep.c index fba8bc11cd1..6d3a2ad5d8d 100644 --- a/sys/arch/evbarm/ixdp425/ixdp425_machdep.c +++ b/sys/arch/evbarm/ixdp425/ixdp425_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: ixdp425_machdep.c,v 1.18 2008/11/11 06:46:41 dyoung Exp $ */ +/* $NetBSD: ixdp425_machdep.c,v 1.19 2008/11/12 12:35:59 ad Exp $ */ /* * Copyright (c) 2003 * Ichiro FUKUHARA <ichiro@ichiro.org>. @@ -70,7 +70,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.18 2008/11/11 06:46:41 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixdp425_machdep.c,v 1.19 2008/11/12 12:35:59 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -765,7 +765,7 @@ initarm(void *arg) boothowto = BOOTHOWTO; #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* Firmware doesn't load symbols. */ ksyms_init(0, NULL, NULL); #endif diff --git a/sys/arch/evbarm/ixm1200/ixm1200_machdep.c b/sys/arch/evbarm/ixm1200/ixm1200_machdep.c index 1b2009fc544..30183a6929e 100644 --- a/sys/arch/evbarm/ixm1200/ixm1200_machdep.c +++ b/sys/arch/evbarm/ixm1200/ixm1200_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: ixm1200_machdep.c,v 1.35 2008/11/11 06:46:41 dyoung Exp $ */ +/* $NetBSD: ixm1200_machdep.c,v 1.36 2008/11/12 12:35:59 ad Exp $ */ /* * Copyright (c) 2002, 2003 @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.35 2008/11/11 06:46:41 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.36 2008/11/12 12:35:59 ad Exp $"); #include "opt_ddb.h" #include "opt_pmap_debug.h" @@ -89,7 +89,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixm1200_machdep.c,v 1.35 2008/11/11 06:46:41 dyoung #include "ksyms.h" -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) #include <machine/db_machdep.h> #include <ddb/db_sym.h> #include <ddb/db_extern.h> @@ -360,7 +360,7 @@ initarm(void *arg) u_int kerneldatasize, symbolsize; vaddr_t l1pagetable; vaddr_t freemempos; -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) Elf_Shdr *sh; #endif @@ -394,7 +394,7 @@ initarm(void *arg) pmap_debug(-1); #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) if (! memcmp(&end, "\177ELF", 4)) { sh = (Elf_Shdr *)((char *)&end + ((Elf_Ehdr *)&end)->e_shoff); loop = ((Elf_Ehdr *)&end)->e_shnum; @@ -741,7 +741,7 @@ initarm(void *arg) printf("bootstrap done.\n"); #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init(symbolsize, ((int *)&end), ((char *)&end) + symbolsize); #endif diff --git a/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c b/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c index 0d46cd1c1f9..e95aa1e6a19 100644 --- a/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c +++ b/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: npwr_fc_machdep.c,v 1.7 2008/11/11 06:46:41 dyoung Exp $ */ +/* $NetBSD: npwr_fc_machdep.c,v 1.8 2008/11/12 12:35:59 ad Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.7 2008/11/11 06:46:41 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: npwr_fc_machdep.c,v 1.8 2008/11/12 12:35:59 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -766,7 +766,7 @@ initarm(void *arg) boothowto = BOOTHOWTO; #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* Firmware doesn't load symbols. */ ksyms_init(0, NULL, NULL); #endif diff --git a/sys/arch/evbarm/nslu2/nslu2_machdep.c b/sys/arch/evbarm/nslu2/nslu2_machdep.c index fd38977f0c7..4592cd3b429 100644 --- a/sys/arch/evbarm/nslu2/nslu2_machdep.c +++ b/sys/arch/evbarm/nslu2/nslu2_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: nslu2_machdep.c,v 1.8 2008/11/11 06:46:41 dyoung Exp $ */ +/* $NetBSD: nslu2_machdep.c,v 1.9 2008/11/12 12:35:59 ad Exp $ */ /*- * Copyright (c) 2006 The NetBSD Foundation, Inc. @@ -100,7 +100,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.8 2008/11/11 06:46:41 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.9 2008/11/12 12:35:59 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -833,7 +833,7 @@ initarm(void *arg) boothowto = BOOTHOWTO; #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* Firmware doesn't load symbols. */ ksyms_init(0, NULL, NULL); #endif diff --git a/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c b/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c index 33f74c693f1..b1ac3f8c5c1 100644 --- a/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c +++ b/sys/arch/evbarm/smdk2xx0/smdk2410_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: smdk2410_machdep.c,v 1.19 2008/11/11 06:46:41 dyoung Exp $ */ +/* $NetBSD: smdk2410_machdep.c,v 1.20 2008/11/12 12:35:59 ad Exp $ */ /* * Copyright (c) 2002, 2003 Fujitsu Component Limited @@ -105,7 +105,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.19 2008/11/11 06:46:41 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: smdk2410_machdep.c,v 1.20 2008/11/12 12:35:59 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -365,7 +365,7 @@ cpu_reboot(int howto, char *bootstr) #define GPIO_VBASE _V(0) #define INTCTL_VBASE _V(1) -#define CLKMAN_VBASE _V(2) +#define CMODULARAN_VBASE _V(2) #define UART_VBASE _V(3) #ifdef MEMORY_DISK_DYNAMIC #define MEMORY_DISK_VADDR _V(4) @@ -386,9 +386,9 @@ static const struct pmap_devmap smdk2410_devmap[] = { VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, { - CLKMAN_VBASE, - _A(S3C2410_CLKMAN_BASE), - _S(S3C24X0_CLKMAN_SIZE), + CMODULARAN_VBASE, + _A(S3C2410_CMODULARAN_BASE), + _S(S3C24X0_CMODULARAN_SIZE), VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, { /* UART registers for UART0, 1, 2. */ @@ -918,7 +918,7 @@ initarm(void *arg) } #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* Firmware doesn't load symbols. */ ksyms_init(0, NULL, NULL); #endif @@ -945,7 +945,7 @@ consinit(void) consinit_done = 1; - s3c24x0_clock_freq2(CLKMAN_VBASE, NULL, NULL, &pclk); + s3c24x0_clock_freq2(CMODULARAN_VBASE, NULL, NULL, &pclk); #if NSSCOM > 0 #ifdef SSCOM0CONSOLE @@ -1000,7 +1000,7 @@ kgdb_port_init(void) unit = 1; if (unit >= 0) { - s3c24x0_clock_freq2(CLKMAN_VBASE, NULL, NULL, &pclk); + s3c24x0_clock_freq2(CMODULARAN_VBASE, NULL, NULL, &pclk); s3c2410_sscom_kgdb_attach(&s3c2xx0_bs_tag, unit, kgdb_rate, pclk, kgdb_sscom_mode); diff --git a/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c b/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c index b318edc0263..b7ee24f2372 100644 --- a/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c +++ b/sys/arch/evbarm/smdk2xx0/smdk2800_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: smdk2800_machdep.c,v 1.27 2008/11/11 06:46:41 dyoung Exp $ */ +/* $NetBSD: smdk2800_machdep.c,v 1.28 2008/11/12 12:35:59 ad Exp $ */ /* * Copyright (c) 2002, 2003, 2005 Fujitsu Component Limited @@ -106,7 +106,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.27 2008/11/11 06:46:41 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: smdk2800_machdep.c,v 1.28 2008/11/12 12:35:59 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -835,7 +835,7 @@ initarm(void *arg) } #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* Firmware doesn't load symbols. */ ksyms_init(0, NULL, NULL); #endif @@ -864,7 +864,7 @@ consinit(void) pmap_devmap_register(smdk2800_devmap); - s3c2800_clock_freq2(ioreg_vaddr(S3C2800_CLKMAN_BASE), NULL, NULL, &pclk); + s3c2800_clock_freq2(ioreg_vaddr(S3C2800_CMODULARAN_BASE), NULL, NULL, &pclk); #if NSSCOM > 0 #ifdef SSCOM0CONSOLE @@ -919,7 +919,7 @@ kgdb_port_init(void) unit = 1; if (unit >= 0) { - s3c2800_clock_freq2(ioreg_vaddr(S3C2800_CLKMAN_BASE), + s3c2800_clock_freq2(ioreg_vaddr(S3C2800_CMODULARAN_BASE), NULL, NULL, &pclk); s3c2800_sscom_kgdb_attach(&s3c2xx0_bs_tag, diff --git a/sys/arch/evbarm/tsarm/tsarm_machdep.c b/sys/arch/evbarm/tsarm/tsarm_machdep.c index cbf58af126d..16acdbe1d00 100644 --- a/sys/arch/evbarm/tsarm/tsarm_machdep.c +++ b/sys/arch/evbarm/tsarm/tsarm_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: tsarm_machdep.c,v 1.8 2008/11/11 06:46:41 dyoung Exp $ */ +/* $NetBSD: tsarm_machdep.c,v 1.9 2008/11/12 12:35:59 ad Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: tsarm_machdep.c,v 1.8 2008/11/11 06:46:41 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: tsarm_machdep.c,v 1.9 2008/11/12 12:35:59 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -801,7 +801,7 @@ initarm(void *arg) boothowto = BOOTHOWTO; #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* Firmware doesn't load symbols. */ ksyms_init(0, NULL, NULL); #endif diff --git a/sys/arch/evbmips/adm5120/machdep.c b/sys/arch/evbmips/adm5120/machdep.c index b5800f178b6..1122eb4ca81 100644 --- a/sys/arch/evbmips/adm5120/machdep.c +++ b/sys/arch/evbmips/adm5120/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.7 2008/11/11 06:46:42 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.8 2008/11/12 12:35:59 ad Exp $ */ /*- * Copyright (c) 2007 Ruslan Ermilov and Vsevolod Lobko. @@ -107,7 +107,7 @@ */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.7 2008/11/11 06:46:42 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.8 2008/11/12 12:35:59 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -140,7 +140,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.7 2008/11/11 06:46:42 dyoung Exp $"); #include "ksyms.h" -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) #include <machine/db_machdep.h> #include <ddb/db_extern.h> #endif @@ -447,7 +447,7 @@ mach_init(int argc, char **argv, void *a2, void *a3) /* * Initialize debuggers, and break into them, if appropriate. */ -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init(0, 0, 0); #endif #ifdef DDB diff --git a/sys/arch/evbmips/alchemy/machdep.c b/sys/arch/evbmips/alchemy/machdep.c index adaa48de7af..258d7cb8a2b 100644 --- a/sys/arch/evbmips/alchemy/machdep.c +++ b/sys/arch/evbmips/alchemy/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.38 2008/11/11 06:46:42 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.39 2008/11/12 12:35:59 ad Exp $ */ /*- * Copyright (c) 2006 Itronix Inc. @@ -107,7 +107,7 @@ */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.38 2008/11/11 06:46:42 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.39 2008/11/12 12:35:59 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -137,7 +137,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.38 2008/11/11 06:46:42 dyoung Exp $"); #include "ksyms.h" -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) #include <machine/db_machdep.h> #include <ddb/db_extern.h> #endif @@ -373,7 +373,7 @@ mach_init(int argc, char **argv, yamon_env_var *envp, u_long memsize) /* * Initialize debuggers, and break into them, if appropriate. */ -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init(0, 0, 0); #endif #ifdef DDB diff --git a/sys/arch/evbmips/atheros/machdep.c b/sys/arch/evbmips/atheros/machdep.c index f831867de95..0b06be58613 100644 --- a/sys/arch/evbmips/atheros/machdep.c +++ b/sys/arch/evbmips/atheros/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.14 2008/11/11 06:46:42 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.15 2008/11/12 12:35:59 ad Exp $ */ /* * Copyright (c) 2006 Urbana-Champaign Independent Media Center. @@ -147,7 +147,7 @@ */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14 2008/11/11 06:46:42 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.15 2008/11/12 12:35:59 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -171,7 +171,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.14 2008/11/11 06:46:42 dyoung Exp $"); #include "ksyms.h" -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) #include <machine/db_machdep.h> #include <ddb/db_extern.h> #endif @@ -339,7 +339,7 @@ mach_init(void) /* * Initialize debuggers, and break into them, if appropriate. */ -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init(0, 0, 0); #endif diff --git a/sys/arch/evbmips/conf/ALCHEMY b/sys/arch/evbmips/conf/ALCHEMY index a163f567998..f2f831b2c16 100644 --- a/sys/arch/evbmips/conf/ALCHEMY +++ b/sys/arch/evbmips/conf/ALCHEMY @@ -1,11 +1,11 @@ -# $NetBSD: ALCHEMY,v 1.20 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: ALCHEMY,v 1.21 2008/11/12 12:35:59 ad Exp $ # # Kernel config for the Alchemy Semiconductor (AMD) PB1000, PB1500, # DBAu1000 and DBAu1500 evaluation boards. include "arch/evbmips/conf/std.alchemy" -#ident "ALCHEMY-$Revision: 1.20 $" +#ident "ALCHEMY-$Revision: 1.21 $" maxusers 32 @@ -38,7 +38,6 @@ options SYSVMSG # System V message queues options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default -#options LKM # loadable kernel modules options NTP # network time protocol # Debugging options diff --git a/sys/arch/evbmips/conf/AP30 b/sys/arch/evbmips/conf/AP30 index a14bccc7892..657fa5feca4 100644 --- a/sys/arch/evbmips/conf/AP30 +++ b/sys/arch/evbmips/conf/AP30 @@ -1,10 +1,10 @@ -# $NetBSD: AP30,v 1.10 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: AP30,v 1.11 2008/11/12 12:35:59 ad Exp $ include "arch/evbmips/conf/std.atheros" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "AP30-$Revision: 1.10 $" +#ident "AP30-$Revision: 1.11 $" maxusers 32 @@ -35,7 +35,6 @@ options SOSEND_NO_LOAN #options SYSVSEM # System V semaphores #options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default -#options LKM # loadable kernel modules options NTP # network time protocol # Debugging options diff --git a/sys/arch/evbmips/conf/MALTA b/sys/arch/evbmips/conf/MALTA index 263655b2235..98b62778c01 100644 --- a/sys/arch/evbmips/conf/MALTA +++ b/sys/arch/evbmips/conf/MALTA @@ -1,10 +1,10 @@ -# $NetBSD: MALTA,v 1.48 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: MALTA,v 1.49 2008/11/12 12:35:59 ad Exp $ include "arch/evbmips/conf/std.malta" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "MALTA-$Revision: 1.48 $" +#ident "MALTA-$Revision: 1.49 $" maxusers 32 @@ -26,7 +26,6 @@ options SYSVMSG # System V message queues options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default -#options LKM # loadable kernel modules options NTP # network time protocol # Debugging options diff --git a/sys/arch/evbmips/conf/MERAKI b/sys/arch/evbmips/conf/MERAKI index 7e38b2c1098..213c89ce49a 100644 --- a/sys/arch/evbmips/conf/MERAKI +++ b/sys/arch/evbmips/conf/MERAKI @@ -1,10 +1,10 @@ -# $NetBSD: MERAKI,v 1.6 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: MERAKI,v 1.7 2008/11/12 12:35:59 ad Exp $ include "arch/evbmips/conf/std.meraki" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "AP30-$Revision: 1.6 $" +#ident "AP30-$Revision: 1.7 $" maxusers 32 @@ -35,7 +35,6 @@ options SOSEND_NO_LOAN #options SYSVSEM # System V semaphores #options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default -#options LKM # loadable kernel modules options NTP # network time protocol # Debugging options diff --git a/sys/arch/evbmips/conf/WGT624V3 b/sys/arch/evbmips/conf/WGT624V3 index eecf60d29a1..b8b5bfe5a8d 100644 --- a/sys/arch/evbmips/conf/WGT624V3 +++ b/sys/arch/evbmips/conf/WGT624V3 @@ -1,10 +1,10 @@ -# $NetBSD: WGT624V3,v 1.3 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: WGT624V3,v 1.4 2008/11/12 12:35:59 ad Exp $ include "arch/evbmips/conf/std.atheros" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "AP30-$Revision: 1.3 $" +#ident "AP30-$Revision: 1.4 $" maxusers 32 @@ -36,7 +36,6 @@ options SOSEND_NO_LOAN #options SYSVSEM # System V semaphores #options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default -#options LKM # loadable kernel modules options NTP # network time protocol # Debugging options diff --git a/sys/arch/evbmips/conf/majors.evbmips b/sys/arch/evbmips/conf/majors.evbmips index 9b086f7ae5c..5d62c073a34 100644 --- a/sys/arch/evbmips/conf/majors.evbmips +++ b/sys/arch/evbmips/conf/majors.evbmips @@ -1,4 +1,4 @@ -# $NetBSD: majors.evbmips,v 1.23 2007/12/31 15:31:53 ad Exp $ +# $NetBSD: majors.evbmips,v 1.24 2008/11/12 12:35:59 ad Exp $ # # Device majors for evbmips # @@ -19,7 +19,6 @@ device-major st char 12 block 2 st device-major cd char 13 block 3 cd device-major ch char 14 ch -device-major lkm char 16 lkm device-major sbjcn char 17 jtagconsole device-major sbscn char 17 sbscn & !jtagconsole diff --git a/sys/arch/evbmips/malta/machdep.c b/sys/arch/evbmips/malta/machdep.c index 8cac9ac006c..a789c603b99 100644 --- a/sys/arch/evbmips/malta/machdep.c +++ b/sys/arch/evbmips/malta/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.29 2008/11/11 06:46:42 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.30 2008/11/12 12:35:59 ad Exp $ */ /* * Copyright 2001, 2002 Wasabi Systems, Inc. @@ -112,7 +112,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.29 2008/11/11 06:46:42 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.30 2008/11/12 12:35:59 ad Exp $"); #include "opt_ddb.h" #include "opt_execfmt.h" @@ -136,7 +136,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.29 2008/11/11 06:46:42 dyoung Exp $"); #include "ksyms.h" -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) #include <machine/db_machdep.h> #include <ddb/db_extern.h> #endif @@ -329,7 +329,7 @@ mach_init(int argc, char **argv, yamon_env_var *envp, u_long memsize) /* * Initialize debuggers, and break into them, if appropriate. */ -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init(0, 0, 0); #endif diff --git a/sys/arch/evbppc/conf/EV64260 b/sys/arch/evbppc/conf/EV64260 index 540c05c1da9..abc05c0b779 100644 --- a/sys/arch/evbppc/conf/EV64260 +++ b/sys/arch/evbppc/conf/EV64260 @@ -1,4 +1,4 @@ -# $NetBSD: EV64260,v 1.36 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: EV64260,v 1.37 2008/11/12 12:35:59 ad Exp $ # # MVP -- Motorola's Multiprocessing Verification Platform # @@ -46,7 +46,6 @@ options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default -#options LKM # loadable kernel modules #options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/evbppc/conf/EXPLORA451 b/sys/arch/evbppc/conf/EXPLORA451 index 64b41af4c2a..18a440bd984 100644 --- a/sys/arch/evbppc/conf/EXPLORA451 +++ b/sys/arch/evbppc/conf/EXPLORA451 @@ -1,4 +1,4 @@ -# $NetBSD: EXPLORA451,v 1.35 2008/07/31 07:41:00 simonb Exp $ +# $NetBSD: EXPLORA451,v 1.36 2008/11/12 12:35:59 ad Exp $ # # GENERIC -- everything that's currently supported # @@ -35,7 +35,6 @@ options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing #options SHMMAXPGS=2048 # 2048 pages is the default -options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/evbppc/conf/OPENBLOCKS200 b/sys/arch/evbppc/conf/OPENBLOCKS200 index 150a6ff18be..744edd46aea 100644 --- a/sys/arch/evbppc/conf/OPENBLOCKS200 +++ b/sys/arch/evbppc/conf/OPENBLOCKS200 @@ -1,4 +1,4 @@ -# $NetBSD: OPENBLOCKS200,v 1.19 2008/07/31 07:41:01 simonb Exp $ +# $NetBSD: OPENBLOCKS200,v 1.20 2008/11/12 12:35:59 ad Exp $ # # GENERIC -- everything that's currently supported # @@ -30,7 +30,6 @@ options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default -#options LKM # loadable kernel modules #options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/evbppc/conf/OPENBLOCKS266 b/sys/arch/evbppc/conf/OPENBLOCKS266 index 5aed75f31e1..f3749275d41 100644 --- a/sys/arch/evbppc/conf/OPENBLOCKS266 +++ b/sys/arch/evbppc/conf/OPENBLOCKS266 @@ -1,4 +1,4 @@ -# $NetBSD: OPENBLOCKS266,v 1.41 2008/07/31 07:41:01 simonb Exp $ +# $NetBSD: OPENBLOCKS266,v 1.42 2008/11/12 12:35:59 ad Exp $ # # GENERIC -- everything that's currently supported # @@ -7,7 +7,7 @@ include "arch/evbppc/conf/std.obs405" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "OPENBLOCKS266-$Revision: 1.41 $" +#ident "OPENBLOCKS266-$Revision: 1.42 $" maxusers 32 @@ -25,7 +25,6 @@ options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory options P1003_1B_SEMAPHORE # p1003.1b semaphore support -#options LKM # loadable kernel modules #options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/evbppc/conf/PMPPC b/sys/arch/evbppc/conf/PMPPC index 8e958569a36..7f7216ef391 100644 --- a/sys/arch/evbppc/conf/PMPPC +++ b/sys/arch/evbppc/conf/PMPPC @@ -1,4 +1,4 @@ -# $NetBSD: PMPPC,v 1.5 2008/07/31 07:41:01 simonb Exp $ +# $NetBSD: PMPPC,v 1.6 2008/11/12 12:35:59 ad Exp $ # # PMPPC # @@ -24,7 +24,6 @@ options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default -options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/evbppc/conf/VIRTEX_DFC b/sys/arch/evbppc/conf/VIRTEX_DFC index 768b23d0331..8dae187d347 100644 --- a/sys/arch/evbppc/conf/VIRTEX_DFC +++ b/sys/arch/evbppc/conf/VIRTEX_DFC @@ -1,4 +1,4 @@ -# $NetBSD: VIRTEX_DFC,v 1.3 2008/07/31 07:41:01 simonb Exp $ +# $NetBSD: VIRTEX_DFC,v 1.4 2008/11/12 12:36:00 ad Exp $ # # VIRTEX_DFC # @@ -42,7 +42,6 @@ options KTRACE # system call tracing via ktrace(1) #options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default -#options LKM # loadable kernel modules #options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/evbppc/conf/VIRTEX_GSRD1 b/sys/arch/evbppc/conf/VIRTEX_GSRD1 index a8f547e33c2..16b4aab5795 100644 --- a/sys/arch/evbppc/conf/VIRTEX_GSRD1 +++ b/sys/arch/evbppc/conf/VIRTEX_GSRD1 @@ -1,4 +1,4 @@ -# $NetBSD: VIRTEX_GSRD1,v 1.3 2008/07/31 07:41:01 simonb Exp $ +# $NetBSD: VIRTEX_GSRD1,v 1.4 2008/11/12 12:36:00 ad Exp $ # # VIRTEX_GSRD1 # @@ -36,7 +36,6 @@ options UVMHIST #options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default -#options LKM # loadable kernel modules #options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/evbppc/conf/VIRTEX_GSRD2 b/sys/arch/evbppc/conf/VIRTEX_GSRD2 index 282483d6e7e..09928bd8637 100644 --- a/sys/arch/evbppc/conf/VIRTEX_GSRD2 +++ b/sys/arch/evbppc/conf/VIRTEX_GSRD2 @@ -1,4 +1,4 @@ -# $NetBSD: VIRTEX_GSRD2,v 1.4 2008/07/31 07:41:01 simonb Exp $ +# $NetBSD: VIRTEX_GSRD2,v 1.5 2008/11/12 12:36:00 ad Exp $ # # VIRTEX_GSRD2 # @@ -44,7 +44,6 @@ options CONS_ADDR=0x010000 # offset in OPB window #options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default -#options LKM # loadable kernel modules #options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/evbppc/conf/WALNUT b/sys/arch/evbppc/conf/WALNUT index 5860d3c90ce..71f8a55ef88 100644 --- a/sys/arch/evbppc/conf/WALNUT +++ b/sys/arch/evbppc/conf/WALNUT @@ -1,4 +1,4 @@ -# $NetBSD: WALNUT,v 1.37 2008/07/31 07:41:01 simonb Exp $ +# $NetBSD: WALNUT,v 1.38 2008/11/12 12:36:00 ad Exp $ # # GENERIC -- everything that's currently supported # @@ -30,7 +30,6 @@ options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default -#options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/evbppc/conf/majors.evbppc b/sys/arch/evbppc/conf/majors.evbppc index 665cfe008f7..306d90d9f9e 100644 --- a/sys/arch/evbppc/conf/majors.evbppc +++ b/sys/arch/evbppc/conf/majors.evbppc @@ -1,4 +1,4 @@ -# $NetBSD: majors.evbppc,v 1.27 2007/12/31 15:31:53 ad Exp $ +# $NetBSD: majors.evbppc,v 1.28 2008/11/12 12:36:00 ad Exp $ # # Device majors for evbppc # (When possible, make entries the same as macppc) @@ -33,7 +33,6 @@ device-major md char 27 block 9 md # char 28 device-major vcoda char 29 vcoda device-major wd char 30 block 10 wd -device-major lkm char 31 lkm device-major filedesc char 32 # char 33 device-major scsibus char 34 scsibus diff --git a/sys/arch/evbppc/ev64260/machdep.c b/sys/arch/evbppc/ev64260/machdep.c index f3aff83506d..a5197147b1d 100644 --- a/sys/arch/evbppc/ev64260/machdep.c +++ b/sys/arch/evbppc/ev64260/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.21 2008/11/11 06:46:42 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.22 2008/11/12 12:36:00 ad Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.21 2008/11/11 06:46:42 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.22 2008/11/12 12:36:00 ad Exp $"); #include "opt_marvell.h" #include "opt_ev64260.h" @@ -231,7 +231,7 @@ initppc(startkernel, endkernel, args, btinfo) */ pmap_bootstrap(startkernel, endkernel); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) { extern void *startsym, *endsym; ksyms_init((int)((u_int)endsym - (u_int)startsym), diff --git a/sys/arch/evbppc/explora/machdep.c b/sys/arch/evbppc/explora/machdep.c index 75826a370c0..ff049f4069d 100644 --- a/sys/arch/evbppc/explora/machdep.c +++ b/sys/arch/evbppc/explora/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.24 2008/11/11 06:46:42 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.25 2008/11/12 12:36:00 ad Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.24 2008/11/11 06:46:42 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.25 2008/11/12 12:36:00 ad Exp $"); #include "opt_explora.h" #include "ksyms.h" @@ -60,7 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.24 2008/11/11 06:46:42 dyoung Exp $"); #include <powerpc/spr.h> #include <powerpc/ibm4xx/dcr403cgx.h> -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) #include <machine/db_machdep.h> #include <ddb/db_extern.h> #endif @@ -264,7 +264,7 @@ bootstrap(u_int startkernel, u_int endkernel) */ pmap_bootstrap(startkernel, endkernel); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init(0, NULL, NULL); #endif diff --git a/sys/arch/evbppc/obs405/obs200_machdep.c b/sys/arch/evbppc/obs405/obs200_machdep.c index c6c43b35725..3c6e5287562 100644 --- a/sys/arch/evbppc/obs405/obs200_machdep.c +++ b/sys/arch/evbppc/obs405/obs200_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: obs200_machdep.c,v 1.6 2008/11/11 06:46:42 dyoung Exp $ */ +/* $NetBSD: obs200_machdep.c,v 1.7 2008/11/12 12:36:00 ad Exp $ */ /* Original: machdep.c,v 1.3 2005/01/17 17:24:09 shige Exp */ /* @@ -68,7 +68,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: obs200_machdep.c,v 1.6 2008/11/11 06:46:42 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obs200_machdep.c,v 1.7 2008/11/12 12:36:00 ad Exp $"); #include "opt_compat_netbsd.h" #include "opt_ddb.h" @@ -108,7 +108,7 @@ char bootpath[256]; extern paddr_t msgbuf_paddr; -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) void *startsym, *endsym; #endif @@ -161,7 +161,7 @@ initppc(u_int startkernel, u_int endkernel, char *args, void *info_block) printf(" Chip Pin Strapping Register = 0x%08x\n", psr); #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init((int)((u_int)endsym - (u_int)startsym), startsym, endsym); #endif #ifdef DDB diff --git a/sys/arch/evbppc/obs405/obs266_machdep.c b/sys/arch/evbppc/obs405/obs266_machdep.c index 5128862cf3f..57d95c81803 100644 --- a/sys/arch/evbppc/obs405/obs266_machdep.c +++ b/sys/arch/evbppc/obs405/obs266_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: obs266_machdep.c,v 1.7 2008/11/11 06:46:42 dyoung Exp $ */ +/* $NetBSD: obs266_machdep.c,v 1.8 2008/11/12 12:36:00 ad Exp $ */ /* Original: md_machdep.c,v 1.3 2005/01/24 18:47:37 shige Exp $ */ /* @@ -68,7 +68,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: obs266_machdep.c,v 1.7 2008/11/11 06:46:42 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: obs266_machdep.c,v 1.8 2008/11/12 12:36:00 ad Exp $"); #include "opt_compat_netbsd.h" #include "opt_ddb.h" @@ -108,7 +108,7 @@ char bootpath[256]; extern paddr_t msgbuf_paddr; -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) void *startsym, *endsym; #endif @@ -155,7 +155,7 @@ initppc(u_int startkernel, u_int endkernel, char *args, void *info_block) openbios_board_print(); #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init((int)((u_int)endsym - (u_int)startsym), startsym, endsym); #endif #ifdef DDB diff --git a/sys/arch/evbppc/pmppc/machdep.c b/sys/arch/evbppc/pmppc/machdep.c index 5ab830b61bd..25cf4c2b3d1 100644 --- a/sys/arch/evbppc/pmppc/machdep.c +++ b/sys/arch/evbppc/pmppc/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.4 2008/11/11 06:46:42 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.5 2008/11/12 12:36:00 ad Exp $ */ /* * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.4 2008/11/11 06:46:42 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.5 2008/11/12 12:36:00 ad Exp $"); #include "opt_compat_netbsd.h" #include "opt_ddb.h" @@ -244,7 +244,7 @@ initppc(u_int startkernel, u_int endkernel, u_int args, void *btinfo) */ pmap_bootstrap(startkernel, endkernel); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) #ifdef SYMTAB_SPACE ksyms_init(0, NULL, NULL); #else diff --git a/sys/arch/evbppc/virtex/machdep.c b/sys/arch/evbppc/virtex/machdep.c index e9d091116ba..8c45ee29273 100644 --- a/sys/arch/evbppc/virtex/machdep.c +++ b/sys/arch/evbppc/virtex/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.7 2008/11/11 06:46:42 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.8 2008/11/12 12:36:00 ad Exp $ */ /* * Copyright (c) 2006 Jachym Holecek @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.7 2008/11/11 06:46:42 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.8 2008/11/12 12:36:00 ad Exp $"); #include "opt_compat_netbsd.h" #include "opt_ddb.h" @@ -105,7 +105,7 @@ char bootpath[256]; paddr_t msgbuf_paddr; vaddr_t msgbuf_vaddr; -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) void *startsym, *endsym; #endif @@ -246,7 +246,7 @@ initppc(u_int startkernel, u_int endkernel) uvm_setpagesize(); pmap_bootstrap(startkernel, endkernel); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init((int)((u_int)endsym - (u_int)startsym), startsym, endsym); #endif #ifdef DDB diff --git a/sys/arch/evbppc/walnut/machdep.c b/sys/arch/evbppc/walnut/machdep.c index d2cc86bb1c9..77ea0b6e5f4 100644 --- a/sys/arch/evbppc/walnut/machdep.c +++ b/sys/arch/evbppc/walnut/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.37 2008/11/11 06:46:42 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.38 2008/11/12 12:36:00 ad Exp $ */ /* * Copyright 2001, 2002 Wasabi Systems, Inc. @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.37 2008/11/11 06:46:42 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.38 2008/11/12 12:36:00 ad Exp $"); #include "opt_compat_netbsd.h" #include "opt_ddb.h" @@ -136,7 +136,7 @@ char bootpath[256]; paddr_t msgbuf_paddr; vaddr_t msgbuf_vaddr; -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) void *startsym, *endsym; #endif @@ -321,7 +321,7 @@ initppc(u_int startkernel, u_int endkernel, char *args, void *info_block) printf(" pci_speed = %u\n", board_data.pci_speed); #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init((int)((u_int)endsym - (u_int)startsym), startsym, endsym); #endif #ifdef DDB diff --git a/sys/arch/evbsh3/conf/majors.evbsh3 b/sys/arch/evbsh3/conf/majors.evbsh3 index 84555aa18bb..ef2f3bf368c 100644 --- a/sys/arch/evbsh3/conf/majors.evbsh3 +++ b/sys/arch/evbsh3/conf/majors.evbsh3 @@ -1,4 +1,4 @@ -# $NetBSD: majors.evbsh3,v 1.17 2007/12/31 15:31:53 ad Exp $ +# $NetBSD: majors.evbsh3,v 1.18 2008/11/12 12:36:00 ad Exp $ # # Device majors for evbsh3 # @@ -29,7 +29,6 @@ device-major filedesc char 22 device-major bpf char 23 bpfilter device-major md char 24 block 17 md -device-major lkm char 28 lkm device-major tun char 40 tun device-major vnd char 41 block 14 vnd diff --git a/sys/arch/evbsh3/evbsh3/machdep.c b/sys/arch/evbsh3/evbsh3/machdep.c index 3e8dc86859f..15102f0ad04 100644 --- a/sys/arch/evbsh3/evbsh3/machdep.c +++ b/sys/arch/evbsh3/evbsh3/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.61 2008/11/11 06:46:42 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.62 2008/11/12 12:36:00 ad Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.61 2008/11/11 06:46:42 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.62 2008/11/12 12:36:00 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -270,7 +270,7 @@ initSH3(void *pc) /* XXX return address */ /* Initialize pmap and start to address translation */ pmap_bootstrap(); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init(0, NULL, NULL); #endif diff --git a/sys/arch/ews4800mips/conf/GENERIC b/sys/arch/ews4800mips/conf/GENERIC index 76f04e08cbc..509189eeb54 100644 --- a/sys/arch/ews4800mips/conf/GENERIC +++ b/sys/arch/ews4800mips/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.25 2008/08/10 15:31:20 tls Exp $ +# $NetBSD: GENERIC,v 1.26 2008/11/12 12:36:00 ad Exp $ # # GENERIC machine description file # This machine description file is used to generate the default NetBSD @@ -25,7 +25,7 @@ include "arch/ews4800mips/conf/std.ews4800mips" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.25 $" +#ident "GENERIC-$Revision: 1.26 $" maxusers 16 @@ -53,7 +53,6 @@ options SEMMNI=10 # number of semaphore identifiers options SYSVSHM # System V shared memory options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/ews4800mips/conf/majors.ews4800mips b/sys/arch/ews4800mips/conf/majors.ews4800mips index 00780ea2ef3..ad373ecd10f 100644 --- a/sys/arch/ews4800mips/conf/majors.ews4800mips +++ b/sys/arch/ews4800mips/conf/majors.ews4800mips @@ -1,4 +1,4 @@ -# $NetBSD: majors.ews4800mips,v 1.3 2007/12/31 15:31:54 ad Exp $ +# $NetBSD: majors.ews4800mips,v 1.4 2008/11/12 12:36:00 ad Exp $ # # Device majors for ews4800mips # @@ -11,7 +11,6 @@ device-major filedesc char 4 device-major log char 5 device-major ptc char 6 pty device-major pts char 7 pty -device-major lkm char 8 lkm device-major zstty char 9 zstty device-major md char 12 block 6 md diff --git a/sys/arch/hp300/conf/GENERIC b/sys/arch/hp300/conf/GENERIC index 9949c5f8fa2..dac0f90860f 100644 --- a/sys/arch/hp300/conf/GENERIC +++ b/sys/arch/hp300/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.147 2008/08/10 15:31:20 tls Exp $ +# $NetBSD: GENERIC,v 1.148 2008/11/12 12:36:00 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/hp300/conf/std.hp300" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.147 $" +#ident "GENERIC-$Revision: 1.148 $" maxusers 32 # estimated number of users @@ -46,7 +46,6 @@ options FPSP # floating point interface for 68040 # Standard system options options KTRACE # system call tracing support -options LKM # Loadable kernel modules #options INSECURE # disable kernel security level options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/hp300/conf/INSTALL b/sys/arch/hp300/conf/INSTALL index f183e4d64fe..927170f71ee 100644 --- a/sys/arch/hp300/conf/INSTALL +++ b/sys/arch/hp300/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.36 2008/07/31 07:41:01 simonb Exp $ +# $NetBSD: INSTALL,v 1.37 2008/11/12 12:36:00 ad Exp $ # # INSTALL machine description file # @@ -66,7 +66,6 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. #options SEMMNU=30 # number of undo structures in system #options SYSVMSG # System V-style message queues #options KTRACE # system call tracing support -#options LKM # Loadable kernel modules #options SCSIVERBOSE # Verbose SCSI errors # Filesystems diff --git a/sys/arch/hp300/conf/majors.hp300 b/sys/arch/hp300/conf/majors.hp300 index 9ee13b224dc..22efc1bfe33 100644 --- a/sys/arch/hp300/conf/majors.hp300 +++ b/sys/arch/hp300/conf/majors.hp300 @@ -1,4 +1,4 @@ -# $NetBSD: majors.hp300,v 1.21 2007/12/31 15:31:54 ad Exp $ +# $NetBSD: majors.hp300,v 1.22 2008/11/12 12:36:00 ad Exp $ # # Device majors for hp300 # @@ -27,7 +27,6 @@ device-major st char 20 block 7 st device-major filedesc char 21 device-major bpf char 22 bpfilter device-major tun char 23 tun -device-major lkm char 24 lkm # device major 31 was apci (superseded by MI com) device-major md char 32 block 14 md diff --git a/sys/arch/hp300/hp300/machdep.c b/sys/arch/hp300/hp300/machdep.c index 3a55c2ee880..98ec5df4087 100644 --- a/sys/arch/hp300/hp300/machdep.c +++ b/sys/arch/hp300/hp300/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.201 2008/11/11 06:46:42 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.202 2008/11/12 12:36:00 ad Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993 @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.201 2008/11/11 06:46:42 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.202 2008/11/12 12:36:00 ad Exp $"); #include "opt_ddb.h" #include "opt_compat_netbsd.h" @@ -289,7 +289,7 @@ consinit(void) if (bootinfo_va == 0) printf("WARNING: boot loader did not provide bootinfo\n"); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) { extern int end; extern int *esym; diff --git a/sys/arch/hp700/conf/GENERIC b/sys/arch/hp700/conf/GENERIC index dbbed1d5d64..0ff2ab68a87 100644 --- a/sys/arch/hp700/conf/GENERIC +++ b/sys/arch/hp700/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.83 2008/08/10 15:31:21 tls Exp $ +# $NetBSD: GENERIC,v 1.84 2008/11/12 12:36:00 ad Exp $ # # GENERIC machine description file # @@ -23,7 +23,7 @@ include "arch/hp700/conf/std.hp700" options INCLUDE_CONFIG_FILE # embed config file in kernel binary options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel -#ident "GENERIC-$Revision: 1.83 $" +#ident "GENERIC-$Revision: 1.84 $" maxusers 32 # estimated number of users @@ -59,7 +59,6 @@ options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules # Enable experimental buffer queue strategy for better responsiveness under # high disk I/O load. Use it with caution - it's not proven to be stable yet. diff --git a/sys/arch/hp700/conf/majors.hp700 b/sys/arch/hp700/conf/majors.hp700 index 39ef9ee96c5..816450605a4 100644 --- a/sys/arch/hp700/conf/majors.hp700 +++ b/sys/arch/hp700/conf/majors.hp700 @@ -1,4 +1,4 @@ -# $NetBSD: majors.hp700,v 1.22 2007/12/31 15:31:54 ad Exp $ +# $NetBSD: majors.hp700,v 1.23 2008/11/12 12:36:00 ad Exp $ # # Device majors for hp700 # @@ -22,7 +22,6 @@ device-major uk char 15 uk device-major filedesc char 16 device-major bpf char 17 bpfilter device-major tun char 18 tun -device-major lkm char 19 lkm device-major rnd char 20 rnd device-major ipl char 21 ipfilter device-major pdc char 22 diff --git a/sys/arch/hp700/hp700/machdep.c b/sys/arch/hp700/hp700/machdep.c index 90c1b6e6451..f8cbb1d1789 100644 --- a/sys/arch/hp700/hp700/machdep.c +++ b/sys/arch/hp700/hp700/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.49 2008/11/11 06:46:42 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.50 2008/11/12 12:36:00 ad Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -63,7 +63,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.49 2008/11/11 06:46:42 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.50 2008/11/12 12:36:00 ad Exp $"); #include "opt_cputype.h" #include "opt_ddb.h" @@ -815,7 +815,7 @@ do { \ #endif /* NCOM > 0 */ #endif /* KGDB */ -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) if ((bi_sym = lookup_bootinfo(BTINFO_SYMTAB)) != NULL) ksyms_init(bi_sym->nsym, (int *)bi_sym->ssym, (int *)bi_sym->esym); diff --git a/sys/arch/hpcarm/conf/IPAQ b/sys/arch/hpcarm/conf/IPAQ index b63c76c58d4..a2a22dd6af9 100644 --- a/sys/arch/hpcarm/conf/IPAQ +++ b/sys/arch/hpcarm/conf/IPAQ @@ -1,4 +1,4 @@ -# $NetBSD: IPAQ,v 1.54 2008/07/31 07:41:01 simonb Exp $ +# $NetBSD: IPAQ,v 1.55 2008/11/12 12:36:01 ad Exp $ # # iPAQ H3600 -- Windows-CE based PDA # @@ -107,7 +107,6 @@ options SHMMAXPGS=1024 # 1024 pages is the default # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -options LKM # loadable kernel modules options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors options USERCONF # userconf(4) support diff --git a/sys/arch/hpcarm/conf/JORNADA720 b/sys/arch/hpcarm/conf/JORNADA720 index a9a1888b63f..5766dbbc0fd 100644 --- a/sys/arch/hpcarm/conf/JORNADA720 +++ b/sys/arch/hpcarm/conf/JORNADA720 @@ -1,4 +1,4 @@ -# $NetBSD: JORNADA720,v 1.70 2008/07/31 07:41:01 simonb Exp $ +# $NetBSD: JORNADA720,v 1.71 2008/11/12 12:36:01 ad Exp $ # # JORNADA -- Windows-CE based jornada 720 # @@ -7,7 +7,7 @@ include "arch/hpcarm/conf/std.hpcarm" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.70 $" +#ident "GENERIC-$Revision: 1.71 $" # estimated number of users maxusers 32 @@ -111,7 +111,6 @@ options SHMMAXPGS=1024 # 1024 pages is the default # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -options LKM # loadable kernel modules options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors options USERCONF # userconf(4) support diff --git a/sys/arch/hpcarm/conf/JORNADA820 b/sys/arch/hpcarm/conf/JORNADA820 index 535f2b699de..3fdc9d0c1cd 100644 --- a/sys/arch/hpcarm/conf/JORNADA820 +++ b/sys/arch/hpcarm/conf/JORNADA820 @@ -1,4 +1,4 @@ -# $NetBSD: JORNADA820,v 1.12 2008/07/31 07:41:01 simonb Exp $ +# $NetBSD: JORNADA820,v 1.13 2008/11/12 12:36:01 ad Exp $ # # JORNADA -- Windows-CE based jornada 820 # @@ -7,7 +7,7 @@ include "arch/hpcarm/conf/std.hpcarm" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.12 $" +#ident "GENERIC-$Revision: 1.13 $" # estimated number of users maxusers 32 @@ -109,7 +109,6 @@ options SHMMAXPGS=1024 # 1024 pages is the default # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -options LKM # loadable kernel modules options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors options USERCONF # userconf(4) support diff --git a/sys/arch/hpcarm/conf/majors.hpcarm b/sys/arch/hpcarm/conf/majors.hpcarm index 3307fbbf04a..587e637b544 100644 --- a/sys/arch/hpcarm/conf/majors.hpcarm +++ b/sys/arch/hpcarm/conf/majors.hpcarm @@ -1,4 +1,4 @@ -# $NetBSD: majors.hpcarm,v 1.8 2007/12/31 15:31:54 ad Exp $ +# $NetBSD: majors.hpcarm,v 1.9 2008/11/12 12:36:01 ad Exp $ # # Device majors for hpcarm # @@ -37,7 +37,6 @@ device-major ses char 30 ses device-major bpf char 32 bpfilter device-major tun char 33 tun device-major filedesc char 34 -device-major lkm char 35 lkm device-major audio char 36 audio device-major vidcconsole char 37 vidcconsole diff --git a/sys/arch/hpcarm/hpcarm/hpc_machdep.c b/sys/arch/hpcarm/hpcarm/hpc_machdep.c index 101444ad845..e1bb32c544a 100644 --- a/sys/arch/hpcarm/hpcarm/hpc_machdep.c +++ b/sys/arch/hpcarm/hpcarm/hpc_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: hpc_machdep.c,v 1.87 2008/11/11 06:46:42 dyoung Exp $ */ +/* $NetBSD: hpc_machdep.c,v 1.88 2008/11/12 12:36:01 ad Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.87 2008/11/11 06:46:42 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.88 2008/11/12 12:36:01 ad Exp $"); #include "opt_ddb.h" #include "opt_pmap_debug.h" @@ -59,7 +59,7 @@ __KERNEL_RCSID(0, "$NetBSD: hpc_machdep.c,v 1.87 2008/11/11 06:46:42 dyoung Exp #include <sys/conf.h> /* XXX for consinit related hacks */ #include <sys/device.h> -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) #include <machine/db_machdep.h> #include <ddb/db_sym.h> #include <ddb/db_extern.h> @@ -303,7 +303,7 @@ initarm(int argc, char **argv, struct bootinfo *bi) vaddr_t freemempos; vsize_t pt_size; int loop, i; -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) Elf_Shdr *sh; #endif @@ -335,7 +335,7 @@ initarm(int argc, char **argv, struct bootinfo *bi) kerneldatasize = (uint32_t)&end - (uint32_t)KERNEL_TEXT_BASE; symbolsize = 0; -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) if (!memcmp(&end, "\177ELF", 4)) { sh = (Elf_Shdr *)((char *)&end + ((Elf_Ehdr *)&end)->e_shoff); loop = ((Elf_Ehdr *)&end)->e_shnum; @@ -706,7 +706,7 @@ initarm(int argc, char **argv, struct bootinfo *bi) #ifdef DDB db_machine_init(); #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init(symbolsize, ((int *)&end), ((char *)&end) + symbolsize); #endif diff --git a/sys/arch/hpcmips/conf/GENERIC b/sys/arch/hpcmips/conf/GENERIC index 217c34e5727..73ef69d8874 100644 --- a/sys/arch/hpcmips/conf/GENERIC +++ b/sys/arch/hpcmips/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.203 2008/08/10 15:31:21 tls Exp $ +# $NetBSD: GENERIC,v 1.204 2008/11/12 12:36:01 ad Exp $ # # GENERIC machine description file # @@ -24,7 +24,7 @@ include "arch/hpcmips/conf/std.hpcmips.tx39" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.203 $" +#ident "GENERIC-$Revision: 1.204 $" maxusers 16 @@ -133,7 +133,6 @@ options COMPAT_30 # NetBSD 3.0 compatibility. options COMPAT_40 # NetBSD 4.0 compatibility. options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. -options LKM # loadable kernel modules #options NFS_BOOT_DHCP options NFS_BOOT_BOOTP diff --git a/sys/arch/hpcmips/conf/majors.hpcmips b/sys/arch/hpcmips/conf/majors.hpcmips index 98234f63674..2fe48e1abf1 100644 --- a/sys/arch/hpcmips/conf/majors.hpcmips +++ b/sys/arch/hpcmips/conf/majors.hpcmips @@ -1,4 +1,4 @@ -# $NetBSD: majors.hpcmips,v 1.26 2007/12/31 15:31:55 ad Exp $ +# $NetBSD: majors.hpcmips,v 1.27 2008/11/12 12:36:01 ad Exp $ # # Device majors for hpcmips # @@ -50,7 +50,6 @@ device-major isdnbchan char 43 isdnbchan device-major isdntrc char 44 isdntrc device-major isdntel char 45 isdntel device-major clockctl char 46 clockctl -device-major lkm char 47 lkm device-major audio char 48 audio device-major cgd char 50 block 10 cgd device-major apmdev char 51 apmdev diff --git a/sys/arch/hpcmips/hpcmips/machdep.c b/sys/arch/hpcmips/hpcmips/machdep.c index 0a5466f4075..5471e235402 100644 --- a/sys/arch/hpcmips/hpcmips/machdep.c +++ b/sys/arch/hpcmips/hpcmips/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.97 2008/11/11 06:46:42 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.98 2008/11/12 12:36:01 ad Exp $ */ /*- * Copyright (c) 1999 Shin Takemura, All rights reserved. @@ -108,7 +108,7 @@ */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.97 2008/11/11 06:46:42 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.98 2008/11/12 12:36:01 ad Exp $"); #include "opt_vr41xx.h" #include "opt_tx39xx.h" @@ -156,7 +156,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.97 2008/11/11 06:46:42 dyoung Exp $"); #include "ksyms.h" -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) #include <machine/db_machdep.h> #include <ddb/db_sym.h> #include <ddb/db_extern.h> @@ -261,7 +261,7 @@ mach_init(int argc, char *argv[], struct bootinfo *bi) #endif extern struct user *proc0paddr; extern char edata[], end[]; -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) extern void *esym; #endif void *kernend; @@ -269,7 +269,7 @@ mach_init(int argc, char *argv[], struct bootinfo *bi) int i; /* clear the BSS segment */ -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) size_t symbolsz = 0; Elf_Ehdr *eh = (void *)end; if (memcmp(eh->e_ident, ELFMAG, SELFMAG) == 0 && @@ -293,7 +293,7 @@ mach_init(int argc, char *argv[], struct bootinfo *bi) kernend = (void *)mips_round_page(esym); bzero(edata, end - edata); } else -#endif /* NKSYMS || defined(DDB) || defined(LKM) */ +#endif /* NKSYMS || defined(DDB) || defined(MODULAR) */ { kernend = (void *)mips_round_page(end); memset(edata, 0, (char *)kernend - edata); @@ -447,7 +447,7 @@ mach_init(int argc, char *argv[], struct bootinfo *bi) } #endif /* MFS */ -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* init symbols if present */ if (esym) ksyms_init(symbolsz, &end, esym); diff --git a/sys/arch/hpcsh/conf/GENERIC b/sys/arch/hpcsh/conf/GENERIC index aec8e0dcd93..86d770c4580 100644 --- a/sys/arch/hpcsh/conf/GENERIC +++ b/sys/arch/hpcsh/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.83 2008/10/28 00:05:04 uwe Exp $ +# $NetBSD: GENERIC,v 1.84 2008/11/12 12:36:01 ad Exp $ # # GENERIC machine description file # @@ -72,7 +72,6 @@ options KTRACE # system call tracing via ktrace(1) #options SYSVSHM # System V-like memory sharing #options P1003_1B_SEMAPHORE # p1003.1b semaphore support -#options LKM # loadable kernel modules options USERCONF # userconf(4) support options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/hpcsh/conf/majors.hpcsh b/sys/arch/hpcsh/conf/majors.hpcsh index fc2a4045a6c..40989fe150f 100644 --- a/sys/arch/hpcsh/conf/majors.hpcsh +++ b/sys/arch/hpcsh/conf/majors.hpcsh @@ -1,4 +1,4 @@ -# $NetBSD: majors.hpcsh,v 1.21 2007/12/31 15:31:55 ad Exp $ +# $NetBSD: majors.hpcsh,v 1.22 2008/11/12 12:36:01 ad Exp $ # # Device majors for hpcsh # @@ -40,7 +40,6 @@ device-major biconsdev char 33 biconsdev device-major clockctl char 34 clockctl device-major cgd char 36 block 10 cgd device-major ksyms char 37 ksyms -device-major lkm char 38 lkm device-major wsfont char 39 wsfont device-major apmdev char 40 apmdev device-major audio char 42 audio diff --git a/sys/arch/hpcsh/hpcsh/machdep.c b/sys/arch/hpcsh/hpcsh/machdep.c index 4f7fd61496e..786edd43581 100644 --- a/sys/arch/hpcsh/hpcsh/machdep.c +++ b/sys/arch/hpcsh/hpcsh/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.62 2008/11/11 06:46:42 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.63 2008/11/12 12:36:01 ad Exp $ */ /*- * Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.62 2008/11/11 06:46:42 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.63 2008/11/12 12:36:01 ad Exp $"); #include "opt_md.h" #include "opt_ddb.h" @@ -74,7 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.62 2008/11/11 06:46:42 dyoung Exp $"); #include "ksyms.h" -#if NKSYMS || defined(LKM) || defined(DDB) || defined(KGDB) +#if NKSYMS || defined(MODULAR) || defined(DDB) || defined(KGDB) #include <machine/db_machdep.h> #include <ddb/db_sym.h> #include <ddb/db_extern.h> @@ -292,7 +292,7 @@ machine_startup(int argc, char *argv[], struct bootinfo *bi) /* Initialize pmap and start to address translation */ pmap_bootstrap(); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) if (symbolsize) { ksyms_init(symbolsize, &end, end + symbolsize); _DPRINTF("symbol size = %d byte\n", symbolsize); diff --git a/sys/arch/i386/conf/ALL b/sys/arch/i386/conf/ALL index 039ef4e148e..fc04291514a 100644 --- a/sys/arch/i386/conf/ALL +++ b/sys/arch/i386/conf/ALL @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.183 2008/10/13 12:20:37 pgoyette Exp $ +# $NetBSD: ALL,v 1.184 2008/11/12 12:36:01 ad Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.183 $" +#ident "ALL-$Revision: 1.184 $" maxusers 32 # estimated number of users @@ -87,7 +87,6 @@ options SYSVSHM # System V-like memory sharing options SHMMAXPGS=2048 # 2048 pages is the default options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options MODULAR # new modules framework options USERCONF # userconf(4) support diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC index cae583f4aca..7f889bf10e6 100644 --- a/sys/arch/i386/conf/GENERIC +++ b/sys/arch/i386/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.915 2008/10/29 11:56:53 joerg Exp $ +# $NetBSD: GENERIC,v 1.916 2008/11/12 12:36:01 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.915 $" +#ident "GENERIC-$Revision: 1.916 $" maxusers 64 # estimated number of users @@ -95,7 +95,6 @@ options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options MODULAR # new style module framework options APM_NO_IDLE # needed for SMP diff --git a/sys/arch/i386/conf/GENERIC_PS2TINY b/sys/arch/i386/conf/GENERIC_PS2TINY index cf94eb5d95c..bb5f58c5c36 100644 --- a/sys/arch/i386/conf/GENERIC_PS2TINY +++ b/sys/arch/i386/conf/GENERIC_PS2TINY @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_PS2TINY,v 1.53 2008/07/31 07:41:01 simonb Exp $ +# $NetBSD: GENERIC_PS2TINY,v 1.54 2008/11/12 12:36:01 ad Exp $ # # GENERIC-style kernel config for IBM PS/2 with MCA bus. It only contains # IBM PS/2 related stuff and has been generally trimmed down somewhat, @@ -51,7 +51,6 @@ options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/i386/conf/GENERIC_TINY b/sys/arch/i386/conf/GENERIC_TINY index f3a6b40e0ac..1c94428651e 100644 --- a/sys/arch/i386/conf/GENERIC_TINY +++ b/sys/arch/i386/conf/GENERIC_TINY @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_TINY,v 1.114 2008/05/13 13:43:47 ad Exp $ +# $NetBSD: GENERIC_TINY,v 1.115 2008/11/12 12:36:01 ad Exp $ # # GENERIC_TINY -- suitable default for 4M machines # No EISA, PCI, or SCSI. @@ -48,7 +48,6 @@ options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT options NMBCLUSTERS=256 -#options LKM # loadable kernel modules #options USERCONF # userconf(4) support options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/i386/conf/INSTALL_FLOPPY b/sys/arch/i386/conf/INSTALL_FLOPPY index 0a0dbfaa1fd..41b2a6c09cf 100644 --- a/sys/arch/i386/conf/INSTALL_FLOPPY +++ b/sys/arch/i386/conf/INSTALL_FLOPPY @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL_FLOPPY,v 1.2 2008/11/04 14:21:39 joerg Exp $ +# $NetBSD: INSTALL_FLOPPY,v 1.3 2008/11/12 12:36:01 ad Exp $ # # INSTALL - Installation kernel. # @@ -58,7 +58,6 @@ options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT #options SYSVSHM # System V-like memory sharing #options SHMMAXPGS=2048 # 2048 pages is the default -#options LKM # loadable kernel modules options USERCONF # userconf(4) support options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/i386/conf/INSTALL_TINY b/sys/arch/i386/conf/INSTALL_TINY index 458c8510534..4fd28521493 100644 --- a/sys/arch/i386/conf/INSTALL_TINY +++ b/sys/arch/i386/conf/INSTALL_TINY @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL_TINY,v 1.120 2008/05/13 13:43:47 ad Exp $ +# $NetBSD: INSTALL_TINY,v 1.121 2008/11/12 12:36:02 ad Exp $ # # This kernel should be derived from INSTALL (which is derived # from GENERIC) with some features commented out. @@ -52,7 +52,6 @@ options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT #options SYSVSHM # System V-like memory sharing #options SHMMAXPGS=2048 # 2048 pages is the default -#options LKM # loadable kernel modules #options USERCONF # userconf(4) support options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/i386/conf/NET4501 b/sys/arch/i386/conf/NET4501 index 1f68ca74ee7..f375201d649 100644 --- a/sys/arch/i386/conf/NET4501 +++ b/sys/arch/i386/conf/NET4501 @@ -1,4 +1,4 @@ -# $NetBSD: NET4501,v 1.62 2008/04/30 15:29:12 ad Exp $ +# $NetBSD: NET4501,v 1.63 2008/11/12 12:36:02 ad Exp $ # # NET4501 -- kernel configuration for a Soekris Engineering net4501 # single-board computer. @@ -10,7 +10,7 @@ include "arch/i386/conf/std.i386" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "NET4501-$Revision: 1.62 $" +#ident "NET4501-$Revision: 1.63 $" maxusers 32 # estimated number of users @@ -63,7 +63,6 @@ options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing #options SHMMAXPGS=2048 # 2048 pages is the default -options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/i386/conf/XBOX b/sys/arch/i386/conf/XBOX index 94eb458f61f..1bb0acc404e 100644 --- a/sys/arch/i386/conf/XBOX +++ b/sys/arch/i386/conf/XBOX @@ -1,4 +1,4 @@ -# $NetBSD: XBOX,v 1.14 2008/04/30 15:29:12 ad Exp $ +# $NetBSD: XBOX,v 1.15 2008/11/12 12:36:02 ad Exp $ # # XBOX -- A basic Microsoft XBox kernel config file. # @@ -24,7 +24,6 @@ options INSECURE # disable kernel security levels - X needs this options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT options NTP # NTP phase/frequency locked loop options KTRACE # system call tracing via ktrace(1) -options LKM # loadable kernel modules options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel # Diagnostic/debugging support options diff --git a/sys/arch/i386/conf/XEN2_DOM0 b/sys/arch/i386/conf/XEN2_DOM0 index 6b48f910a16..4e162e7b031 100644 --- a/sys/arch/i386/conf/XEN2_DOM0 +++ b/sys/arch/i386/conf/XEN2_DOM0 @@ -1,4 +1,4 @@ -# $NetBSD: XEN2_DOM0,v 1.53 2008/10/29 11:56:53 joerg Exp $ +# $NetBSD: XEN2_DOM0,v 1.54 2008/11/12 12:36:02 ad Exp $ include "arch/xen/conf/std.xen" @@ -44,7 +44,6 @@ options SYSVSHM # System V-like memory sharing #options SHMMAXPGS=2048 # 2048 pages is the default options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options USERCONF # userconf(4) support options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel diff --git a/sys/arch/i386/conf/XEN2_DOMU b/sys/arch/i386/conf/XEN2_DOMU index f8da937b99a..500be572e2f 100644 --- a/sys/arch/i386/conf/XEN2_DOMU +++ b/sys/arch/i386/conf/XEN2_DOMU @@ -1,4 +1,4 @@ -# $NetBSD: XEN2_DOMU,v 1.19 2008/08/04 03:55:47 tls Exp $ +# $NetBSD: XEN2_DOMU,v 1.20 2008/11/12 12:36:02 ad Exp $ include "arch/xen/conf/std.xen" @@ -41,7 +41,6 @@ options SYSVSHM # System V-like memory sharing #options SHMMAXPGS=2048 # 2048 pages is the default options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options USERCONF # userconf(4) support options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel diff --git a/sys/arch/i386/conf/majors.i386 b/sys/arch/i386/conf/majors.i386 index 7159a3b0001..e1606f3362b 100644 --- a/sys/arch/i386/conf/majors.i386 +++ b/sys/arch/i386/conf/majors.i386 @@ -1,4 +1,4 @@ -# $NetBSD: majors.i386,v 1.36 2007/12/31 15:31:57 ad Exp $ +# $NetBSD: majors.i386,v 1.37 2008/11/12 12:36:02 ad Exp $ # # Device majors for i386 # @@ -31,7 +31,6 @@ device-major md char 24 block 17 md device-major joy char 26 joy device-major spkr char 27 spkr -device-major lkm char 28 lkm # next three are obsolete #device-major omms char 35 omms diff --git a/sys/arch/i386/i386/kobj_machdep.c b/sys/arch/i386/i386/kobj_machdep.c index 91e0964f3af..0931a1b73e2 100644 --- a/sys/arch/i386/i386/kobj_machdep.c +++ b/sys/arch/i386/i386/kobj_machdep.c @@ -1,9 +1,12 @@ -/* $NetBSD: kobj_machdep.c,v 1.5 2008/05/01 14:48:19 ad Exp $ */ +/* $NetBSD: kobj_machdep.c,v 1.6 2008/11/12 12:36:02 ad 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: @@ -52,7 +55,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.5 2008/05/01 14:48:19 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kobj_machdep.c,v 1.6 2008/11/12 12:36:02 ad Exp $"); #define ELFSIZE ARCH_ELFSIZE @@ -109,14 +112,6 @@ kobj_reloc(kobj_t ko, uintptr_t relocbase, const void *data, addr += addend - (Elf_Addr)where; break; - case R_386_COPY: /* none */ - /* - * There shouldn't be copy relocations in kernel - * objects. - */ - printf("kobj_reloc: unexpected R_COPY relocation\n"); - return -1; - case R_386_GLOB_DAT: /* S */ addr = kobj_sym_lookup(ko, symidx); if (addr == 0) diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 1b6e1b78d06..28d4e0f6d9a 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.648 2008/11/12 01:14:01 cegger Exp $ */ +/* $NetBSD: machdep.c,v 1.649 2008/11/12 12:36:02 ad Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.648 2008/11/12 01:14:01 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.649 2008/11/12 12:36:02 ad Exp $"); #include "opt_beep.h" #include "opt_compat_ibcs2.h" @@ -1386,7 +1386,7 @@ init386_pte0(void) static void init386_ksyms(void) { -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) extern int end; struct btinfo_symtab *symtab; diff --git a/sys/arch/i386/i386/powernow_k7.c b/sys/arch/i386/i386/powernow_k7.c index 10129d3b238..5c28b3986c3 100644 --- a/sys/arch/i386/i386/powernow_k7.c +++ b/sys/arch/i386/i386/powernow_k7.c @@ -1,4 +1,4 @@ -/* $NetBSD: powernow_k7.c,v 1.31 2008/05/10 16:12:32 ad Exp $ */ +/* $NetBSD: powernow_k7.c,v 1.32 2008/11/12 12:36:02 ad Exp $ */ /* $OpenBSD: powernow-k7.c,v 1.24 2006/06/16 05:58:50 gwk Exp $ */ /*- @@ -59,7 +59,7 @@ /* AMD POWERNOW K7 driver */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: powernow_k7.c,v 1.31 2008/05/10 16:12:32 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: powernow_k7.c,v 1.32 2008/11/12 12:36:02 ad Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -76,7 +76,7 @@ __KERNEL_RCSID(0, "$NetBSD: powernow_k7.c,v 1.31 2008/05/10 16:12:32 ad Exp $"); #include <x86/include/isa_machdep.h> #include <x86/include/powernow.h> -#ifdef _LKM +#ifdef _MODULE static struct sysctllog *sysctllog; #define SYSCTLLOG &sysctllog #else @@ -481,7 +481,7 @@ k7_powernow_init(void) void k7_powernow_destroy(void) { -#ifdef _LKM +#ifdef _MODULE sysctl_teardown(SYSCTLLOG); if (freq_names) diff --git a/sys/arch/i386/i386/vm_machdep.c b/sys/arch/i386/i386/vm_machdep.c index 8f912b6045e..b04ed387b78 100644 --- a/sys/arch/i386/i386/vm_machdep.c +++ b/sys/arch/i386/i386/vm_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: vm_machdep.c,v 1.139 2008/05/27 14:25:11 ad Exp $ */ +/* $NetBSD: vm_machdep.c,v 1.140 2008/11/12 12:36:02 ad Exp $ */ /*- * Copyright (c) 1982, 1986 The Regents of the University of California. @@ -80,7 +80,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.139 2008/05/27 14:25:11 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.140 2008/11/12 12:36:02 ad Exp $"); #include "opt_user_ldt.h" #include "opt_mtrr.h" @@ -266,7 +266,7 @@ cpu_lwp_free2(struct lwp *l) } #if (defined(EXEC_AOUT) || defined(EXEC_COFF) || defined(EXEC_ECOFF) || \ - defined(EXEC_MACHO) || defined(LKM)) && defined(COREDUMP) + defined(EXEC_MACHO) || defined(MODULAR)) && defined(COREDUMP) /* * Dump the machine specific segment at the start of a core dump. */ diff --git a/sys/arch/ia64/conf/majors.ia64 b/sys/arch/ia64/conf/majors.ia64 index 012eeb900ff..04130545eef 100644 --- a/sys/arch/ia64/conf/majors.ia64 +++ b/sys/arch/ia64/conf/majors.ia64 @@ -1,4 +1,4 @@ -# $NetBSD: majors.ia64,v 1.4 2007/12/31 15:31:57 ad Exp $ +# $NetBSD: majors.ia64,v 1.5 2008/11/12 12:36:02 ad Exp $ # # Device majors for ia64 # @@ -31,7 +31,6 @@ device-major md char 24 block 17 md device-major joy char 26 joy device-major spkr char 27 spkr -device-major lkm char 28 lkm # next three are obsolete #device-major omms char 35 omms diff --git a/sys/arch/ia64/ia64/machdep.c b/sys/arch/ia64/ia64/machdep.c index bb0379728fc..a5c20635db8 100644 --- a/sys/arch/ia64/ia64/machdep.c +++ b/sys/arch/ia64/ia64/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.10 2008/10/15 06:51:18 wrstuden Exp $ */ +/* $NetBSD: machdep.c,v 1.11 2008/11/12 12:36:02 ad Exp $ */ /*- * Copyright (c) 2003,2004 Marcel Moolenaar @@ -122,7 +122,7 @@ char machine[] = MACHINE; /* from <machine/param.h> */ char machine_arch[] = MACHINE_ARCH; /* from <machine/param.h> */ -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* start and end of kernel symbol table */ void *ksym_start, *ksym_end; vaddr_t ia64_unwindtab; @@ -749,7 +749,7 @@ ia64_init() /* * Initialize debuggers, and break into them if appropriate. */ -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init((int)((u_int64_t)ksym_end - (u_int64_t)ksym_start), ksym_start, ksym_end); #endif diff --git a/sys/arch/ibmnws/conf/majors.ibmnws b/sys/arch/ibmnws/conf/majors.ibmnws index 9e241d11ef5..54cd89eec2a 100644 --- a/sys/arch/ibmnws/conf/majors.ibmnws +++ b/sys/arch/ibmnws/conf/majors.ibmnws @@ -1,4 +1,4 @@ -# $NetBSD: majors.ibmnws,v 1.12 2007/12/31 15:31:57 ad Exp $ +# $NetBSD: majors.ibmnws,v 1.13 2008/11/12 12:36:02 ad Exp $ # # Device majors for ibmnws # @@ -26,7 +26,6 @@ device-major filedesc char 22 device-major bpf char 23 bpfilter device-major md char 24 block 17 md -device-major lkm char 28 lkm device-major tun char 40 tun device-major vnd char 41 block 14 vnd diff --git a/sys/arch/iyonix/conf/GENERIC b/sys/arch/iyonix/conf/GENERIC index 67f293d6c9a..9121fd830d4 100644 --- a/sys/arch/iyonix/conf/GENERIC +++ b/sys/arch/iyonix/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.51 2008/09/07 12:01:26 tron Exp $ +# $NetBSD: GENERIC,v 1.52 2008/11/12 12:36:02 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/iyonix/conf/std.iyonix" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.51 $" +#ident "GENERIC-$Revision: 1.52 $" maxusers 32 # estimated number of users @@ -59,7 +59,6 @@ options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors options PCIVERBOSE # Verbose PCI descriptions diff --git a/sys/arch/iyonix/iyonix/iyonix_machdep.c b/sys/arch/iyonix/iyonix/iyonix_machdep.c index 9793fc2f12b..ffd34224de8 100644 --- a/sys/arch/iyonix/iyonix/iyonix_machdep.c +++ b/sys/arch/iyonix/iyonix/iyonix_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: iyonix_machdep.c,v 1.9 2008/11/11 06:46:42 dyoung Exp $ */ +/* $NetBSD: iyonix_machdep.c,v 1.10 2008/11/12 12:36:02 ad Exp $ */ /* * Copyright (c) 2001, 2002, 2003 Wasabi Systems, Inc. @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.9 2008/11/11 06:46:42 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iyonix_machdep.c,v 1.10 2008/11/12 12:36:02 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -812,7 +812,7 @@ initarm(void *arg) boothowto = BOOTHOWTO; #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* Firmware doesn't load symbols. */ ksyms_init(0, NULL, NULL); #endif diff --git a/sys/arch/landisk/conf/GENERIC b/sys/arch/landisk/conf/GENERIC index 203791c16c2..3279ae41f75 100644 --- a/sys/arch/landisk/conf/GENERIC +++ b/sys/arch/landisk/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.16 2008/08/10 15:31:21 tls Exp $ +# $NetBSD: GENERIC,v 1.17 2008/11/12 12:36:02 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/landisk/conf/std.landisk" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.16 $" +#ident "GENERIC-$Revision: 1.17 $" maxusers 16 # estimated number of users @@ -59,7 +59,6 @@ options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/landisk/conf/majors.landisk b/sys/arch/landisk/conf/majors.landisk index 31c6b6c336f..9f6c04a1331 100644 --- a/sys/arch/landisk/conf/majors.landisk +++ b/sys/arch/landisk/conf/majors.landisk @@ -1,4 +1,4 @@ -# $NetBSD: majors.landisk,v 1.3 2007/12/31 15:31:58 ad Exp $ +# $NetBSD: majors.landisk,v 1.4 2008/11/12 12:36:02 ad Exp $ # # Device majors for landisk # @@ -28,7 +28,6 @@ device-major filedesc char 22 device-major bpf char 23 bpfilter device-major md char 24 block 17 md -device-major lkm char 28 lkm device-major tun char 40 tun device-major vnd char 41 block 14 vnd diff --git a/sys/arch/landisk/landisk/machdep.c b/sys/arch/landisk/landisk/machdep.c index 5db10c68c6e..351908af25e 100644 --- a/sys/arch/landisk/landisk/machdep.c +++ b/sys/arch/landisk/landisk/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.7 2008/11/11 06:46:42 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.8 2008/11/12 12:36:02 ad Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.7 2008/11/11 06:46:42 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.8 2008/11/12 12:36:02 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -115,7 +115,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.7 2008/11/11 06:46:42 dyoung Exp $"); #include <sh3/dev/scifvar.h> #endif -#if NKSYMS || defined(LKM) || defined(DDB) +#if NKSYMS || defined(MODULAR) || defined(DDB) #include <machine/db_machdep.h> #include <ddb/db_sym.h> #include <ddb/db_extern.h> @@ -227,7 +227,7 @@ landisk_startup(int howto, void *bi) pmap_bootstrap(); /* Debugger. */ -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) if (symbolsize != 0) { ksyms_init(symbolsize, &end, end + symbolsize); } diff --git a/sys/arch/luna68k/conf/GENERIC b/sys/arch/luna68k/conf/GENERIC index 98e8882de38..8c8ad3dbcab 100644 --- a/sys/arch/luna68k/conf/GENERIC +++ b/sys/arch/luna68k/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.84 2008/08/10 15:31:21 tls Exp $ +# $NetBSD: GENERIC,v 1.85 2008/11/12 12:36:02 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/luna68k/conf/std.luna68k" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.84 $" +#ident "GENERIC-$Revision: 1.85 $" maxusers 8 @@ -39,7 +39,6 @@ options KTRACE #options SYSVSEM # System V semaphores #options SYSVSHM # System V shared memory #options P1003_1B_SEMAPHORE # p1003.1b semaphore support -#options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel diff --git a/sys/arch/luna68k/conf/majors.luna68k b/sys/arch/luna68k/conf/majors.luna68k index 15952afd9b3..5c967300fca 100644 --- a/sys/arch/luna68k/conf/majors.luna68k +++ b/sys/arch/luna68k/conf/majors.luna68k @@ -1,4 +1,4 @@ -# $NetBSD: majors.luna68k,v 1.18 2007/12/31 15:31:58 ad Exp $ +# $NetBSD: majors.luna68k,v 1.19 2008/11/12 12:36:02 ad Exp $ # # Device majors for luna68k # @@ -27,7 +27,6 @@ device-major filedesc char 20 device-major bpf char 21 bpfilter device-major tun char 22 tun device-major ipl char 23 ipfilter -device-major lkm char 24 lkm device-major scsibus char 31 scsibus device-major raid char 32 block 14 raid diff --git a/sys/arch/luna68k/luna68k/machdep.c b/sys/arch/luna68k/luna68k/machdep.c index 0f267788b08..57d9deab1fb 100644 --- a/sys/arch/luna68k/luna68k/machdep.c +++ b/sys/arch/luna68k/luna68k/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.56 2008/11/11 06:46:43 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.57 2008/11/12 12:36:02 ad Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.56 2008/11/11 06:46:43 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.57 2008/11/12 12:36:02 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -214,7 +214,7 @@ consinit() ws_cnattach(); } -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) { extern char end[]; extern int *esym; diff --git a/sys/arch/mac68k/conf/GENERIC b/sys/arch/mac68k/conf/GENERIC index 99d0fc25bbb..1813994be86 100644 --- a/sys/arch/mac68k/conf/GENERIC +++ b/sys/arch/mac68k/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.191 2008/08/10 15:31:21 tls Exp $ +# $NetBSD: GENERIC,v 1.192 2008/11/12 12:36:02 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/mac68k/conf/std.mac68k" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.191 $" +#ident "GENERIC-$Revision: 1.192 $" maxusers 16 # estimated number of users @@ -49,7 +49,6 @@ options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/mac68k/conf/SMALLRAM b/sys/arch/mac68k/conf/SMALLRAM index 69ca2bb012f..980223a2d57 100644 --- a/sys/arch/mac68k/conf/SMALLRAM +++ b/sys/arch/mac68k/conf/SMALLRAM @@ -1,4 +1,4 @@ -# $NetBSD: SMALLRAM,v 1.32 2008/08/08 13:59:24 hauke Exp $ +# $NetBSD: SMALLRAM,v 1.33 2008/11/12 12:36:03 ad Exp $ # # This is an example of how to configure a small, efficient kernel for # a system with limited RAM. Even so it's capable of doing quite a @@ -26,7 +26,6 @@ no options FPU_EMULATE no options INSECURE -no options LKM no options SYSCTL_INCLUDE_DESCR no options KMEMSTATS diff --git a/sys/arch/mac68k/conf/majors.mac68k b/sys/arch/mac68k/conf/majors.mac68k index e8804522dca..404c334edf5 100644 --- a/sys/arch/mac68k/conf/majors.mac68k +++ b/sys/arch/mac68k/conf/majors.mac68k @@ -1,4 +1,4 @@ -# $NetBSD: majors.mac68k,v 1.20 2008/05/22 19:49:43 hauke Exp $ +# $NetBSD: majors.mac68k,v 1.21 2008/11/12 12:36:03 ad Exp $ # # Device majors for mac68k # @@ -26,7 +26,6 @@ device-major filedesc char 21 device-major bpf char 22 bpfilter device-major aed char 23 aed device-major tun char 24 tun -device-major lkm char 25 lkm device-major md char 32 block 13 md device-major ss char 33 ss diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c index 45fe85ac5c1..8d05eeafef3 100644 --- a/sys/arch/mac68k/mac68k/machdep.c +++ b/sys/arch/mac68k/mac68k/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.323 2008/11/11 06:46:43 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.324 2008/11/12 12:36:03 ad Exp $ */ /* * Copyright (c) 1982, 1990 The Regents of the University of California. @@ -107,7 +107,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.323 2008/11/11 06:46:43 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.324 2008/11/12 12:36:03 ad Exp $"); #include "opt_adb.h" #include "opt_ddb.h" @@ -377,7 +377,7 @@ consinit(void) #if NZSC > 0 && defined(KGDB) zs_kgdb_init(); #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* * Initialize kernel debugger, if compiled in. */ diff --git a/sys/arch/mac68k/obio/iwm_fd.c b/sys/arch/mac68k/obio/iwm_fd.c index 998e65e2196..b39e54f1b17 100644 --- a/sys/arch/mac68k/obio/iwm_fd.c +++ b/sys/arch/mac68k/obio/iwm_fd.c @@ -1,4 +1,4 @@ -/* $NetBSD: iwm_fd.c,v 1.43 2008/06/15 10:46:14 tsutsui Exp $ */ +/* $NetBSD: iwm_fd.c,v 1.44 2008/11/12 12:36:03 ad Exp $ */ /* * Copyright (c) 1997, 1998 Hauke Fath. All rights reserved. @@ -32,9 +32,9 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: iwm_fd.c,v 1.43 2008/06/15 10:46:14 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: iwm_fd.c,v 1.44 2008/11/12 12:36:03 ad Exp $"); -#ifdef _LKM +#ifdef _MODULE #define IWMCF_DRIVE 0 #else #include "locators.h" @@ -97,7 +97,7 @@ static int checkTrack(diskPosition_t *, int); static int initCylinderCache(fd_softc_t *); static void invalidateCylinderCache(fd_softc_t *); -#ifdef _LKM +#ifdef _MODULE static int probe_fd(void); int fd_mod_init(void); void fd_mod_free(void); @@ -223,12 +223,12 @@ enum { * {device}_cd * references all found devices of a type. */ -#ifndef _LKM +#ifndef _MODULE extern struct cfdriver iwm_cd; extern struct cfdriver fd_cd; -#endif /* defined _LKM */ +#endif /* defined _MODULE */ /* IWM floppy disk controller */ CFATTACH_DECL(iwm, sizeof(iwm_softc_t), @@ -274,7 +274,7 @@ int iwm_match(struct device *parent, struct cfdata *match, void *auxp) { int matched; -#ifdef _LKM +#ifdef _MODULE int iwmErr; #endif extern u_long IOBase; /* from mac68k/machdep.c */ @@ -296,7 +296,7 @@ iwm_match(struct device *parent, struct cfdata *match, void *auxp) printf("iwm: IWMBase mapped to 0x%lx in VM.\n", IWMBase); } -#ifdef _LKM +#ifdef _MODULE iwmErr = iwmInit(); if (TRACE_CONFIG) printf("initIWM() says %d.\n", iwmErr); @@ -511,7 +511,7 @@ fd_print(void *auxp, const char *controller) } -#ifdef _LKM +#ifdef _MODULE static iwm_softc_t *iwm; @@ -614,7 +614,7 @@ probe_fd(void) return err; } -#endif /* defined _LKM */ +#endif /* defined _MODULE */ /** @@ -640,7 +640,7 @@ fdopen(dev_t dev, int flags, int devType, struct lwp *l) int partitionMask; int fdType, fdUnit; int ierr, err; -#ifndef _LKM +#ifndef _MODULE iwm_softc_t *iwm = device_lookup_private(&iwm_cd, 0); /* XXX */ #endif info = NULL; /* XXX shut up egcs */ @@ -774,7 +774,7 @@ fdclose(dev_t dev, int flags, int devType, struct lwp *l) { fd_softc_t *fd; int partitionMask, fdUnit, fdType; -#ifndef _LKM +#ifndef _MODULE iwm_softc_t *iwm = device_lookup_private(&iwm_cd, 0); #endif @@ -818,7 +818,7 @@ fdioctl(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l) { int result, fdUnit, fdType; fd_softc_t *fd; -#ifndef _LKM +#ifndef _MODULE iwm_softc_t *iwm = device_lookup_private(&iwm_cd, 0); #endif @@ -981,7 +981,7 @@ fdstrategy(struct buf *bp) int sectSize, transferSize; diskPosition_t physDiskLoc; fd_softc_t *fd; -#ifndef _LKM +#ifndef _MODULE iwm_softc_t *iwm = device_lookup_private(&iwm_cd, 0); #endif @@ -1274,7 +1274,7 @@ fdstart_Read(fd_softc_t *fd) int i; diskPosition_t *pos; sectorHdr_t *shdr; -#ifndef _LKM +#ifndef _MODULE iwm_softc_t *iwm = device_lookup_private(&iwm_cd, 0); /* XXX */ #endif @@ -1390,7 +1390,7 @@ fdstart_Flush(fd_softc_t *fd) int i, dcnt; diskPosition_t *pos; sectorHdr_t *shdr; -#ifndef _LKM +#ifndef _MODULE iwm_softc_t *iwm = device_lookup_private(&iwm_cd, 0); /* XXX */ #endif dcnt = 0; @@ -1520,7 +1520,7 @@ static int fdstart_IOErr(fd_softc_t *fd) { int state; -#ifndef _LKM +#ifndef _MODULE iwm_softc_t *iwm = device_lookup_private(&iwm_cd, 0); /* XXX */ #endif @@ -1886,7 +1886,7 @@ seek(fd_softc_t *fd, int style) diskPosition_t *loc; sectorHdr_t hdr; char action[32]; -#ifndef _LKM +#ifndef _MODULE iwm_softc_t *iwm = device_lookup_private(&iwm_cd, 0); /* XXX */ #endif diff --git a/sys/arch/macppc/conf/GENERIC b/sys/arch/macppc/conf/GENERIC index 1bd8a713c01..ecbd1c92a10 100644 --- a/sys/arch/macppc/conf/GENERIC +++ b/sys/arch/macppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.271 2008/10/07 12:43:32 pgoyette Exp $ +# $NetBSD: GENERIC,v 1.272 2008/11/12 12:36:03 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/macppc/conf/std.macppc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.271 $" +#ident "GENERIC-$Revision: 1.272 $" maxusers 32 @@ -40,7 +40,6 @@ options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/macppc/conf/MAMBO b/sys/arch/macppc/conf/MAMBO index deb01bf2ce1..bbaba6b2850 100644 --- a/sys/arch/macppc/conf/MAMBO +++ b/sys/arch/macppc/conf/MAMBO @@ -6,7 +6,7 @@ include "arch/macppc/conf/std.macppc.g5" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.5 $" +#ident "GENERIC-$Revision: 1.6 $" maxusers 32 @@ -29,7 +29,6 @@ options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/macppc/conf/POWERMAC_G5 b/sys/arch/macppc/conf/POWERMAC_G5 index 131f085404d..d09c781617f 100644 --- a/sys/arch/macppc/conf/POWERMAC_G5 +++ b/sys/arch/macppc/conf/POWERMAC_G5 @@ -26,7 +26,6 @@ options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/mipsco/conf/GENERIC b/sys/arch/mipsco/conf/GENERIC index 8ee79f4e1c0..4526dffa765 100644 --- a/sys/arch/mipsco/conf/GENERIC +++ b/sys/arch/mipsco/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.70 2008/08/10 15:31:21 tls Exp $ +# $NetBSD: GENERIC,v 1.71 2008/11/12 12:36:03 ad Exp $ # # GENERIC machine description file # @@ -32,7 +32,6 @@ options SYSVMSG # System V message queues options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory options P1003_1B_SEMAPHORE # p1003.1b semaphore support -#options LKM # loadable kernel modules #options NTP # network time protocol options HZ=25 options USERCONF # userconf(4) support diff --git a/sys/arch/mipsco/conf/RC3230 b/sys/arch/mipsco/conf/RC3230 index c4a7c48b016..0df6c671973 100644 --- a/sys/arch/mipsco/conf/RC3230 +++ b/sys/arch/mipsco/conf/RC3230 @@ -1,5 +1,5 @@ # -# $NetBSD: RC3230,v 1.34 2008/05/30 20:10:02 tsutsui Exp $ +# $NetBSD: RC3230,v 1.35 2008/11/12 12:36:03 ad Exp $ # include "arch/mipsco/conf/std.mipsco" @@ -15,7 +15,6 @@ options SYSVMSG # System V message queues options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default -#options LKM # loadable kernel modules #options NTP # network time protocol options HZ=25 options USERCONF # userconf(4) support diff --git a/sys/arch/mipsco/conf/majors.mipsco b/sys/arch/mipsco/conf/majors.mipsco index 72d3a6b115a..752687653fd 100644 --- a/sys/arch/mipsco/conf/majors.mipsco +++ b/sys/arch/mipsco/conf/majors.mipsco @@ -1,4 +1,4 @@ -# $NetBSD: majors.mipsco,v 1.18 2007/12/31 15:31:59 ad Exp $ +# $NetBSD: majors.mipsco,v 1.19 2008/11/12 12:36:03 ad Exp $ # # Device majors for mipsco # @@ -23,7 +23,6 @@ device-major tun char 25 tun device-major log char 33 -device-major lkm char 45 lkm device-major ipl char 46 ipfilter device-major rnd char 47 rnd device-major filedesc char 48 diff --git a/sys/arch/mipsco/mipsco/machdep.c b/sys/arch/mipsco/mipsco/machdep.c index e3351bc7488..429b8bbf460 100644 --- a/sys/arch/mipsco/mipsco/machdep.c +++ b/sys/arch/mipsco/mipsco/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.59 2008/11/11 06:46:43 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.60 2008/11/12 12:36:04 ad Exp $ */ /* * Copyright (c) 1992, 1993 @@ -76,7 +76,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.59 2008/11/11 06:46:43 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.60 2008/11/12 12:36:04 ad Exp $"); /* from: Utah Hdr: machdep.c 1.63 91/04/24 */ @@ -240,7 +240,7 @@ mach_init(argc, argv, envp, bim, bip) int i, howto; extern char edata[], end[]; const char *bi_msg; -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) int nsym = 0; char *ssym = 0; char *esym = 0; @@ -265,7 +265,7 @@ mach_init(argc, argv, envp, bim, bip) kernend = (void *)mips_round_page(end); memset(edata, 0, end - edata); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) bi_syms = lookup_bootinfo(BTINFO_SYMTAB); /* Load sysmbol table if present */ @@ -329,7 +329,7 @@ mach_init(argc, argv, envp, bim, bip) } -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* init symbols if present */ if (esym) ksyms_init(esym - ssym, ssym, esym); diff --git a/sys/arch/mmeye/conf/GENERIC b/sys/arch/mmeye/conf/GENERIC index 386fc80b0d4..0b49b717720 100644 --- a/sys/arch/mmeye/conf/GENERIC +++ b/sys/arch/mmeye/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.95 2008/08/10 15:31:21 tls Exp $ +# $NetBSD: GENERIC,v 1.96 2008/11/12 12:36:04 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/mmeye/conf/std.mmeye" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.95 $" +#ident "GENERIC-$Revision: 1.96 $" maxusers 16 # estimated number of users @@ -47,7 +47,6 @@ options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing options P1003_1B_SEMAPHORE # p1003.1b semaphore support -#options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/mmeye/conf/MMTA b/sys/arch/mmeye/conf/MMTA index 39ab394679a..c353f883f58 100644 --- a/sys/arch/mmeye/conf/MMTA +++ b/sys/arch/mmeye/conf/MMTA @@ -1,4 +1,4 @@ -# $NetBSD: MMTA,v 1.38 2008/02/29 14:42:32 jmmv Exp $ +# $NetBSD: MMTA,v 1.39 2008/11/12 12:36:04 ad Exp $ # # GENERIC -- everything that's currently supported # @@ -34,7 +34,6 @@ options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing #options SHMMAXPGS=1024 # 1024 pages is the default -#options LKM # loadable kernel modules #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) #options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel diff --git a/sys/arch/mmeye/conf/MMTAICE b/sys/arch/mmeye/conf/MMTAICE index eb3ddaa10de..3227963b988 100644 --- a/sys/arch/mmeye/conf/MMTAICE +++ b/sys/arch/mmeye/conf/MMTAICE @@ -1,4 +1,4 @@ -# $NetBSD: MMTAICE,v 1.40 2008/02/29 14:42:32 jmmv Exp $ +# $NetBSD: MMTAICE,v 1.41 2008/11/12 12:36:04 ad Exp $ # # GENERIC -- everything that's currently supported # @@ -64,7 +64,6 @@ options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing #options SHMMAXPGS=1024 # 1024 pages is the default -#options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/mmeye/conf/MMTAROMNEW b/sys/arch/mmeye/conf/MMTAROMNEW index 381dc365683..27c989936ee 100644 --- a/sys/arch/mmeye/conf/MMTAROMNEW +++ b/sys/arch/mmeye/conf/MMTAROMNEW @@ -1,4 +1,4 @@ -# $NetBSD: MMTAROMNEW,v 1.39 2008/02/29 14:42:32 jmmv Exp $ +# $NetBSD: MMTAROMNEW,v 1.40 2008/11/12 12:36:04 ad Exp $ # # GENERIC -- everything that's currently supported # @@ -43,7 +43,6 @@ options HZ=10 # clock interrupt generates every 1/10 sec #options SYSVSHM # System V-like memory sharing #options SHMMAXPGS=1024 # 1024 pages is the default -#options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/mmeye/conf/majors.mmeye b/sys/arch/mmeye/conf/majors.mmeye index 180b4da824d..a11fff7aa59 100644 --- a/sys/arch/mmeye/conf/majors.mmeye +++ b/sys/arch/mmeye/conf/majors.mmeye @@ -1,4 +1,4 @@ -# $NetBSD: majors.mmeye,v 1.18 2007/12/31 15:32:00 ad Exp $ +# $NetBSD: majors.mmeye,v 1.19 2008/11/12 12:36:04 ad Exp $ # # Device majors for mmeye # @@ -26,7 +26,6 @@ device-major filedesc char 22 device-major bpf char 23 bpfilter device-major md char 24 block 17 md -device-major lkm char 28 lkm device-major tun char 40 tun device-major vnd char 41 block 14 vnd diff --git a/sys/arch/mmeye/mmeye/machdep.c b/sys/arch/mmeye/mmeye/machdep.c index a49d7af756c..65ffff24eb1 100644 --- a/sys/arch/mmeye/mmeye/machdep.c +++ b/sys/arch/mmeye/mmeye/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.44 2008/11/11 06:46:43 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.45 2008/11/12 12:36:04 ad Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.44 2008/11/11 06:46:43 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.45 2008/11/12 12:36:04 ad Exp $"); #include "opt_ddb.h" #include "opt_memsize.h" @@ -240,7 +240,7 @@ initSH3(void *pc) /* XXX return address */ consinit(); kernend = atop(round_page(SH3_P1SEG_TO_PHYS(end))); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* XXX Currently symbol table size is not passed to the kernel. */ kernend += atop(0x40000); /* XXX */ #endif @@ -258,7 +258,7 @@ initSH3(void *pc) /* XXX return address */ /* Initialize pmap and start to address translation */ pmap_bootstrap(); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init(1, end, end + 0x40000); /* XXX */ #endif /* diff --git a/sys/arch/mvme68k/conf/majors.mvme68k b/sys/arch/mvme68k/conf/majors.mvme68k index 8d9f4ca485d..9a6c5ae66df 100644 --- a/sys/arch/mvme68k/conf/majors.mvme68k +++ b/sys/arch/mvme68k/conf/majors.mvme68k @@ -1,4 +1,4 @@ -# $NetBSD: majors.mvme68k,v 1.18 2007/12/31 15:32:00 ad Exp $ +# $NetBSD: majors.mvme68k,v 1.19 2008/11/12 12:36:04 ad Exp $ # # Device majors for mvme68k # @@ -24,7 +24,6 @@ device-major st char 20 block 7 st device-major filedesc char 21 device-major bpf char 22 bpfilter device-major tun char 23 tun -device-major lkm char 24 lkm device-major ses char 30 ses device-major ch char 31 ch diff --git a/sys/arch/mvme68k/mvme68k/machdep.c b/sys/arch/mvme68k/mvme68k/machdep.c index 5e8908b9998..e97a4aef6cc 100644 --- a/sys/arch/mvme68k/mvme68k/machdep.c +++ b/sys/arch/mvme68k/mvme68k/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.130 2008/11/11 06:46:43 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.131 2008/11/12 12:36:04 ad Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993 @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.130 2008/11/11 06:46:43 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.131 2008/11/12 12:36:04 ad Exp $"); #include "opt_ddb.h" #include "opt_m060sp.h" @@ -109,7 +109,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.130 2008/11/11 06:46:43 dyoung Exp $") #include "ksyms.h" -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) #include <sys/exec_elf.h> #endif @@ -438,7 +438,7 @@ consinit(void) */ cninit(); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) { extern char end[]; extern int *esym; diff --git a/sys/arch/mvmeppc/conf/majors.mvmeppc b/sys/arch/mvmeppc/conf/majors.mvmeppc index 065b8458261..914a269b617 100644 --- a/sys/arch/mvmeppc/conf/majors.mvmeppc +++ b/sys/arch/mvmeppc/conf/majors.mvmeppc @@ -1,4 +1,4 @@ -# $NetBSD: majors.mvmeppc,v 1.18 2007/12/31 15:32:00 ad Exp $ +# $NetBSD: majors.mvmeppc,v 1.19 2008/11/12 12:36:04 ad Exp $ # # Device majors for mvmeppc # @@ -26,7 +26,6 @@ device-major filedesc char 22 device-major bpf char 23 bpfilter device-major md char 24 block 17 md -device-major lkm char 28 lkm device-major tun char 40 tun device-major vnd char 41 block 14 vnd diff --git a/sys/arch/netwinder/conf/GENERIC b/sys/arch/netwinder/conf/GENERIC index f6599cf11dc..806700441d8 100644 --- a/sys/arch/netwinder/conf/GENERIC +++ b/sys/arch/netwinder/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.93 2008/08/10 15:31:21 tls Exp $ +# $NetBSD: GENERIC,v 1.94 2008/11/12 12:36:04 ad Exp $ # # GENERIC machine description file # @@ -154,7 +154,6 @@ options P1003_1B_SEMAPHORE # p1003.1b semaphore support # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors options PCIVERBOSE # Verbose PCI descriptions diff --git a/sys/arch/netwinder/netwinder/netwinder_machdep.c b/sys/arch/netwinder/netwinder/netwinder_machdep.c index f7a624b37f1..68d9ef926c5 100644 --- a/sys/arch/netwinder/netwinder/netwinder_machdep.c +++ b/sys/arch/netwinder/netwinder/netwinder_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: netwinder_machdep.c,v 1.67 2008/11/11 06:46:43 dyoung Exp $ */ +/* $NetBSD: netwinder_machdep.c,v 1.68 2008/11/12 12:36:04 ad Exp $ */ /* * Copyright (c) 1997,1998 Mark Brinicombe. @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netwinder_machdep.c,v 1.67 2008/11/11 06:46:43 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netwinder_machdep.c,v 1.68 2008/11/12 12:36:04 ad Exp $"); #include "opt_ddb.h" #include "opt_pmap_debug.h" @@ -855,7 +855,7 @@ initarm(void *arg) if (nwbootinfo.bi_pagesize == 0xdeadbeef) printf("WARNING: NeTTrom boot info corrupt\n"); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* Firmware doesn't load symbols. */ ksyms_init(0, NULL, NULL); #endif diff --git a/sys/arch/news68k/conf/GENERIC b/sys/arch/news68k/conf/GENERIC index 6ab3fd05205..4f2d234dfaa 100644 --- a/sys/arch/news68k/conf/GENERIC +++ b/sys/arch/news68k/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.94 2008/08/10 15:31:21 tls Exp $ +# $NetBSD: GENERIC,v 1.95 2008/11/12 12:36:04 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/news68k/conf/std.news68k" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.94 $" +#ident "GENERIC-$Revision: 1.95 $" maxusers 8 @@ -38,7 +38,6 @@ options SYSVMSG # System V message queues options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel diff --git a/sys/arch/news68k/conf/GENERIC_TINY b/sys/arch/news68k/conf/GENERIC_TINY index 93d1d29ef3e..fc97490eada 100644 --- a/sys/arch/news68k/conf/GENERIC_TINY +++ b/sys/arch/news68k/conf/GENERIC_TINY @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC_TINY,v 1.61 2008/07/31 07:41:02 simonb Exp $ +# $NetBSD: GENERIC_TINY,v 1.62 2008/11/12 12:36:04 ad Exp $ # news68k GENERIC config file for low memory machines; # @@ -6,7 +6,7 @@ include "arch/news68k/conf/std.news68k" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC_TINY-$Revision: 1.61 $" +#ident "GENERIC_TINY-$Revision: 1.62 $" maxusers 4 @@ -22,7 +22,6 @@ options SYSVMSG # System V message queues options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options USERCONF # userconf(4) support options PIPE_SOCKETPAIR # smaller, but slower pipe(2) #options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel diff --git a/sys/arch/news68k/conf/INSTALL b/sys/arch/news68k/conf/INSTALL index 428b8234b14..437e135eff8 100644 --- a/sys/arch/news68k/conf/INSTALL +++ b/sys/arch/news68k/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.46 2008/11/08 10:24:23 he Exp $ +# $NetBSD: INSTALL,v 1.47 2008/11/12 12:36:04 ad Exp $ # config for bootable floppy kernel # @@ -25,7 +25,6 @@ options MEMORY_DISK_ROOT_SIZE=3000 # 1.50 Megabytes #options SYSVMSG # System V message queues #options SYSVSEM # System V semaphores #options SYSVSHM # System V shared memory -#options LKM # loadable kernel modules options USERCONF # userconf(4) support options PIPE_SOCKETPAIR # smaller, but slower pipe(2) #options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel diff --git a/sys/arch/news68k/conf/LIBERO b/sys/arch/news68k/conf/LIBERO index 5c5d5c34766..2ff788f739d 100644 --- a/sys/arch/news68k/conf/LIBERO +++ b/sys/arch/news68k/conf/LIBERO @@ -1,4 +1,4 @@ -# $NetBSD: LIBERO,v 1.48 2008/04/27 06:26:04 tsutsui Exp $ +# $NetBSD: LIBERO,v 1.49 2008/11/12 12:36:04 ad Exp $ # NEWS1750 config file; # @@ -20,7 +20,6 @@ options KTRACE # system call tracing support options SYSVMSG # System V message queues options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory -options LKM # loadable kernel modules #options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) #options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel diff --git a/sys/arch/news68k/conf/NEWS1200 b/sys/arch/news68k/conf/NEWS1200 index b2bbeb6b4bd..ce27f6e4953 100644 --- a/sys/arch/news68k/conf/NEWS1200 +++ b/sys/arch/news68k/conf/NEWS1200 @@ -1,4 +1,4 @@ -# $NetBSD: NEWS1200,v 1.44 2008/07/31 07:41:02 simonb Exp $ +# $NetBSD: NEWS1200,v 1.45 2008/11/12 12:36:04 ad Exp $ # news1200 config file # @@ -18,7 +18,6 @@ options KTRACE # system call tracing support options SYSVMSG # System V message queues options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory -options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) #options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel diff --git a/sys/arch/news68k/conf/majors.news68k b/sys/arch/news68k/conf/majors.news68k index 7f88e5918a0..cf8fc302e6d 100644 --- a/sys/arch/news68k/conf/majors.news68k +++ b/sys/arch/news68k/conf/majors.news68k @@ -1,4 +1,4 @@ -# $NetBSD: majors.news68k,v 1.19 2007/12/31 15:32:01 ad Exp $ +# $NetBSD: majors.news68k,v 1.20 2008/11/12 12:36:04 ad Exp $ # # Device majors for news68k # @@ -21,7 +21,6 @@ device-major tun char 25 tun device-major log char 33 -device-major lkm char 45 lkm device-major ipl char 46 ipfilter device-major rnd char 47 rnd device-major filedesc char 48 diff --git a/sys/arch/news68k/news68k/machdep.c b/sys/arch/news68k/news68k/machdep.c index 7e38b6876c3..b70b849352f 100644 --- a/sys/arch/news68k/news68k/machdep.c +++ b/sys/arch/news68k/news68k/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.73 2008/11/11 06:46:43 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.74 2008/11/12 12:36:04 ad Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993 @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.73 2008/11/11 06:46:43 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.74 2008/11/12 12:36:04 ad Exp $"); #include "opt_ddb.h" #include "opt_compat_netbsd.h" @@ -1084,7 +1084,7 @@ consinit(void) (*cn_tab->cn_init)(cn_tab); break; } -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init((int)esym - (int)&end - sizeof(Elf32_Ehdr), (void *)&end, esym); #endif diff --git a/sys/arch/newsmips/conf/GENERIC b/sys/arch/newsmips/conf/GENERIC index 8bb71d3b405..a798b204b90 100644 --- a/sys/arch/newsmips/conf/GENERIC +++ b/sys/arch/newsmips/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.104 2008/08/10 15:31:21 tls Exp $ +# $NetBSD: GENERIC,v 1.105 2008/11/12 12:36:04 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/newsmips/conf/std.newsmips" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.104 $" +#ident "GENERIC-$Revision: 1.105 $" maxusers 16 @@ -38,7 +38,6 @@ options SYSVMSG # System V message queues options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options NTP # network time protocol options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/newsmips/conf/majors.newsmips b/sys/arch/newsmips/conf/majors.newsmips index 5c9232bbfd1..02b570fe328 100644 --- a/sys/arch/newsmips/conf/majors.newsmips +++ b/sys/arch/newsmips/conf/majors.newsmips @@ -1,4 +1,4 @@ -# $NetBSD: majors.newsmips,v 1.19 2007/12/31 15:32:02 ad Exp $ +# $NetBSD: majors.newsmips,v 1.20 2008/11/12 12:36:04 ad Exp $ # # Device majors for newsmips # @@ -21,7 +21,6 @@ device-major tun char 25 tun device-major log char 33 -device-major lkm char 45 lkm device-major ipl char 46 ipfilter device-major rnd char 47 rnd device-major filedesc char 48 diff --git a/sys/arch/newsmips/newsmips/machdep.c b/sys/arch/newsmips/newsmips/machdep.c index 5855d540a2b..26e2d0bcead 100644 --- a/sys/arch/newsmips/newsmips/machdep.c +++ b/sys/arch/newsmips/newsmips/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.99 2008/11/11 06:46:43 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.100 2008/11/12 12:36:04 ad Exp $ */ /* * Copyright (c) 1992, 1993 @@ -76,7 +76,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.99 2008/11/11 06:46:43 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.100 2008/11/12 12:36:04 ad Exp $"); /* from: Utah Hdr: machdep.c 1.63 91/04/24 */ @@ -222,7 +222,7 @@ mach_init(int x_boothowto, int x_bootdev, int x_bootname, int x_maxmem) struct btinfo_magic *bi_magic; struct btinfo_bootarg *bi_arg; struct btinfo_systype *bi_systype; -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) struct btinfo_symtab *bi_sym; int nsym = 0; char *ssym, *esym; @@ -240,7 +240,7 @@ mach_init(int x_boothowto, int x_bootdev, int x_bootname, int x_maxmem) x_bootdev = bi_arg->bootdev; x_maxmem = bi_arg->maxmem; } -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) bi_sym = lookup_bootinfo(BTINFO_SYMTAB); if (bi_sym) { nsym = bi_sym->nsym; @@ -304,7 +304,7 @@ mach_init(int x_boothowto, int x_bootdev, int x_bootname, int x_maxmem) *(int *)(MIPS_PHYS_TO_KSEG1(MACH_BOOTSW_ADDR)) = x_boothowto; kernend = (char *)mips_round_page(end); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) if (nsym) kernend = (char *)mips_round_page(esym); #endif @@ -339,7 +339,7 @@ mach_init(int x_boothowto, int x_bootdev, int x_bootname, int x_maxmem) */ newsmips_bus_dma_init(); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) if (nsym) ksyms_init(esym - ssym, ssym, esym); #endif diff --git a/sys/arch/next68k/conf/GENERIC b/sys/arch/next68k/conf/GENERIC index 4553353436d..967b709b9e8 100644 --- a/sys/arch/next68k/conf/GENERIC +++ b/sys/arch/next68k/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.113 2008/08/10 15:31:21 tls Exp $ +# $NetBSD: GENERIC,v 1.114 2008/11/12 12:36:04 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/next68k/conf/std.next68k" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.113 $" +#ident "GENERIC-$Revision: 1.114 $" # Needs to be set per system. i.e change these as you see fit maxusers 16 @@ -39,7 +39,6 @@ options SYSVSHM # System V shared memory options P1003_1B_SEMAPHORE # POSIX semaphore support #options SHMMAXPGS=1024 # 1024 pages is the default -options LKM # loadable kernel modules options INSECURE # disable kernel security level options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/next68k/conf/SLAB b/sys/arch/next68k/conf/SLAB index df6dacc94d7..65395b65c30 100644 --- a/sys/arch/next68k/conf/SLAB +++ b/sys/arch/next68k/conf/SLAB @@ -1,4 +1,4 @@ -# $NetBSD: SLAB,v 1.35 2008/05/30 20:10:02 tsutsui Exp $ +# $NetBSD: SLAB,v 1.36 2008/11/12 12:36:04 ad Exp $ # # deberg's development machine # @@ -19,7 +19,6 @@ options SYSVSHM # System V shared memory options P1003_1B_SEMAPHORE # POSIX semaphore support #options SHMMAXPGS=1024 # 1024 pages is the default -options LKM # loadable kernel modules options INSECURE # disable kernel security level options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/next68k/conf/majors.next68k b/sys/arch/next68k/conf/majors.next68k index 5d3aac64faf..20edaecd136 100644 --- a/sys/arch/next68k/conf/majors.next68k +++ b/sys/arch/next68k/conf/majors.next68k @@ -1,4 +1,4 @@ -# $NetBSD: majors.next68k,v 1.20 2007/12/31 15:32:02 ad Exp $ +# $NetBSD: majors.next68k,v 1.21 2008/11/12 12:36:04 ad Exp $ # # Device majors for next68k # @@ -24,7 +24,6 @@ device-major filedesc char 21 device-major bpf char 22 bpfilter device-major tun char 24 tun -device-major lkm char 25 lkm device-major md char 32 block 13 md device-major ss char 33 ss diff --git a/sys/arch/next68k/next68k/machdep.c b/sys/arch/next68k/next68k/machdep.c index f29e7e3438e..263c799b49c 100644 --- a/sys/arch/next68k/next68k/machdep.c +++ b/sys/arch/next68k/next68k/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.86 2008/11/11 06:46:43 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.87 2008/11/12 12:36:05 ad Exp $ */ /* * Copyright (c) 1998 Darrin B. Jewell @@ -79,7 +79,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.86 2008/11/11 06:46:43 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.87 2008/11/12 12:36:05 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -286,7 +286,7 @@ consinit(void) #if defined(KGDB) && (NZSC > 0) zs_kgdb_init(); #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* Initialize kernel symbol table, if compiled in. */ ksyms_init(nsym, ssym, esym); #endif diff --git a/sys/arch/ofppc/conf/GENERIC b/sys/arch/ofppc/conf/GENERIC index 2dc033f64dd..7e7ee833920 100644 --- a/sys/arch/ofppc/conf/GENERIC +++ b/sys/arch/ofppc/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.118 2008/08/10 15:31:21 tls Exp $ +# $NetBSD: GENERIC,v 1.119 2008/11/12 12:36:05 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/ofppc/conf/std.ofppc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.118 $" +#ident "GENERIC-$Revision: 1.119 $" maxusers 32 @@ -44,7 +44,6 @@ options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/ofppc/conf/GENERIC.MP b/sys/arch/ofppc/conf/GENERIC.MP index 9bf30c63014..1eacd5a211a 100644 --- a/sys/arch/ofppc/conf/GENERIC.MP +++ b/sys/arch/ofppc/conf/GENERIC.MP @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC.MP,v 1.2 2008/07/31 07:41:03 simonb Exp $ +# $NetBSD: GENERIC.MP,v 1.3 2008/11/12 12:36:05 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/ofppc/conf/std.ofppc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.2 $" +#ident "GENERIC-$Revision: 1.3 $" maxusers 32 @@ -49,7 +49,6 @@ options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/playstation2/conf/majors.playstation2 b/sys/arch/playstation2/conf/majors.playstation2 index 3d4662223c0..8466ed80624 100644 --- a/sys/arch/playstation2/conf/majors.playstation2 +++ b/sys/arch/playstation2/conf/majors.playstation2 @@ -1,4 +1,4 @@ -# $NetBSD: majors.playstation2,v 1.19 2007/12/31 15:32:03 ad Exp $ +# $NetBSD: majors.playstation2,v 1.20 2008/11/12 12:36:05 ad Exp $ # # Device majors for playstation2 # @@ -11,7 +11,6 @@ device-major filedesc char 4 device-major log char 5 device-major ptc char 6 pty device-major pts char 7 pty -device-major lkm char 8 lkm device-major wd char 10 block 1 wd diff --git a/sys/arch/pmax/conf/GENERIC b/sys/arch/pmax/conf/GENERIC index da15d6c7e20..6217b06e7f5 100644 --- a/sys/arch/pmax/conf/GENERIC +++ b/sys/arch/pmax/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.158 2008/08/10 15:31:21 tls Exp $ +# $NetBSD: GENERIC,v 1.159 2008/11/12 12:36:05 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/pmax/conf/std.pmax" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.158 $" +#ident "GENERIC-$Revision: 1.159 $" maxusers 64 @@ -56,7 +56,6 @@ options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/pmax/conf/INSTALL b/sys/arch/pmax/conf/INSTALL index 4e8eb12dbc5..2de216b1262 100644 --- a/sys/arch/pmax/conf/INSTALL +++ b/sys/arch/pmax/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.64 2008/07/31 07:41:03 simonb Exp $ +# $NetBSD: INSTALL,v 1.65 2008/11/12 12:36:05 ad Exp $ # # Distribution install kernel (any model) # netbsd: cut-down kernel for miniroots. @@ -37,7 +37,6 @@ options DEC_3MAXPLUS # 5000/240 (kn03), 5000/260 (kn05) #options DIAGNOSTIC # extra kernel debugging checks #options DEBUG # extra kernel debugging support #options KTRACE # system call tracing support -#options LKM # loadable kernel modules options USERCONF # userconf(4) support options PIPE_SOCKETPAIR # smaller, but slower pipe(2) #options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel diff --git a/sys/arch/pmax/conf/majors.pmax b/sys/arch/pmax/conf/majors.pmax index e385659a8ad..2cef5076137 100644 --- a/sys/arch/pmax/conf/majors.pmax +++ b/sys/arch/pmax/conf/majors.pmax @@ -1,4 +1,4 @@ -# $NetBSD: majors.pmax,v 1.19 2007/12/31 15:32:03 ad Exp $ +# $NetBSD: majors.pmax,v 1.20 2008/11/12 12:36:05 ad Exp $ # # Device majors for pmax # @@ -40,7 +40,6 @@ device-major wsmouse char 90 wsmouse device-major ipl char 91 ipfilter device-major rnd char 92 rnd device-major tun char 93 tun -device-major lkm char 94 lkm device-major scsibus char 95 scsibus device-major raid char 96 block 32 raid device-major md char 97 block 17 md diff --git a/sys/arch/pmax/pmax/machdep.c b/sys/arch/pmax/pmax/machdep.c index a0986e7fc2e..decd683d51f 100644 --- a/sys/arch/pmax/pmax/machdep.c +++ b/sys/arch/pmax/pmax/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.224 2008/11/11 06:46:43 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.225 2008/11/12 12:36:05 ad Exp $ */ /* * Copyright (c) 1992, 1993 @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.224 2008/11/11 06:46:43 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.225 2008/11/12 12:36:05 ad Exp $"); #include "fs_mfs.h" #include "opt_ddb.h" @@ -113,7 +113,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.224 2008/11/11 06:46:43 dyoung Exp $") #define _PMAX_BUS_DMA_PRIVATE #include <machine/bus.h> -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) #include <sys/exec_aout.h> /* XXX backwards compatilbity for DDB */ #include <machine/db_machdep.h> #include <ddb/db_extern.h> @@ -202,7 +202,7 @@ mach_init(argc, argv, code, cv, bim, bip) u_long first, last; int i; char *kernend; -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) void *ssym = 0; struct btinfo_symtab *bi_syms; struct exec *aout; /* XXX backwards compatilbity for DDB */ @@ -225,7 +225,7 @@ mach_init(argc, argv, code, cv, bim, bip) bootinfo_msg = "invalid bootinfo pointer (old bootblocks?)\n"; /* clear the BSS segment */ -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) bi_syms = lookup_bootinfo(BTINFO_SYMTAB); aout = (struct exec *)edata; @@ -330,7 +330,7 @@ mach_init(argc, argv, code, cv, bim, bip) kernend += round_page(mfs_initminiroot(kernend)); #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* init symbols if present */ if (esym) ksyms_init((char *)esym - (char *)ssym, ssym, esym); diff --git a/sys/arch/powerpc/conf/majors.powerpc b/sys/arch/powerpc/conf/majors.powerpc index dbb8a62661f..dabd08ebcd5 100644 --- a/sys/arch/powerpc/conf/majors.powerpc +++ b/sys/arch/powerpc/conf/majors.powerpc @@ -1,4 +1,4 @@ -# $NetBSD: majors.powerpc,v 1.2 2007/12/31 15:32:04 ad Exp $ +# $NetBSD: majors.powerpc,v 1.3 2008/11/12 12:36:05 ad Exp $ # # Device majors for shared PowerPC # @@ -35,7 +35,6 @@ device-major aed char 28 aed device-major vcoda char 29 vcoda device-major wd char 30 block 10 wd -device-major lkm char 31 lkm device-major filedesc char 32 device-major nvram char 33 nvram device-major scsibus char 34 scsibus diff --git a/sys/arch/powerpc/oea/ofwoea_machdep.c b/sys/arch/powerpc/oea/ofwoea_machdep.c index ad01c7ce2d3..4d5a40dd0df 100644 --- a/sys/arch/powerpc/oea/ofwoea_machdep.c +++ b/sys/arch/powerpc/oea/ofwoea_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: ofwoea_machdep.c,v 1.14 2008/04/28 20:23:32 martin Exp $ */ +/* $NetBSD: ofwoea_machdep.c,v 1.15 2008/11/12 12:36:05 ad Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.14 2008/04/28 20:23:32 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.15 2008/11/12 12:36:05 ad Exp $"); #include "opt_ppcarch.h" #include "opt_compat_netbsd.h" @@ -110,7 +110,7 @@ struct pmap ofw_pmap; struct ofw_translations ofmap[32]; char bootpath[256]; char model_name[64]; -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) void *startsym, *endsym; #endif #ifdef TIMEBASE_FREQ @@ -147,7 +147,7 @@ ofwoea_initppc(u_int startkernel, u_int endkernel, char *args) if ((oeacpufeat & OEACPU_NOBAT) == 0) ofwoea_batinit(); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* get info of kernel symbol table from bootloader */ memcpy(&startsym, args + strlen(args) + 1, sizeof(startsym)); memcpy(&endsym, args + strlen(args) + 1 + sizeof(startsym), @@ -238,7 +238,7 @@ ofwoea_initppc(u_int startkernel, u_int endkernel, char *args) restore_ofmap(ofmap, ofmaplen); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init((int)((u_int)endsym - (u_int)startsym), startsym, endsym); #endif diff --git a/sys/arch/powerpc/oea/prep_machdep.c b/sys/arch/powerpc/oea/prep_machdep.c index f2f457cbfa6..eeab08686c9 100644 --- a/sys/arch/powerpc/oea/prep_machdep.c +++ b/sys/arch/powerpc/oea/prep_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: prep_machdep.c,v 1.3 2008/04/28 20:23:32 martin Exp $ */ +/* $NetBSD: prep_machdep.c,v 1.4 2008/11/12 12:36:05 ad Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: prep_machdep.c,v 1.3 2008/04/28 20:23:32 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: prep_machdep.c,v 1.4 2008/11/12 12:36:05 ad Exp $"); #include <sys/param.h> #include <sys/extent.h> @@ -60,7 +60,7 @@ __KERNEL_RCSID(0, "$NetBSD: prep_machdep.c,v 1.3 2008/04/28 20:23:32 martin Exp #include "ksyms.h" -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) extern void *endsym, *startsym; #endif extern struct mem_region physmemr[2], availmemr[2]; @@ -165,7 +165,7 @@ prep_initppc(u_long startkernel, u_long endkernel, u_int args) /* Initialize pmap module */ pmap_bootstrap(startkernel, endkernel); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init((int)((u_long)endsym - (u_long)startsym), startsym, endsym); #endif diff --git a/sys/arch/prep/conf/GENERIC b/sys/arch/prep/conf/GENERIC index 1aefc937e9b..f3bc32a23b8 100644 --- a/sys/arch/prep/conf/GENERIC +++ b/sys/arch/prep/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.145 2008/08/10 15:31:21 tls Exp $ +# $NetBSD: GENERIC,v 1.146 2008/11/12 12:36:05 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/prep/conf/std.prep" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.145 $" +#ident "GENERIC-$Revision: 1.146 $" maxusers 32 @@ -44,7 +44,6 @@ options SYSVSEM # System V-like semaphores options SYSVSHM # System V-like memory sharing options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/prep/conf/majors.prep b/sys/arch/prep/conf/majors.prep index 0ac3571296a..08d6e0d139d 100644 --- a/sys/arch/prep/conf/majors.prep +++ b/sys/arch/prep/conf/majors.prep @@ -1,4 +1,4 @@ -# $NetBSD: majors.prep,v 1.20 2007/12/31 15:32:04 ad Exp $ +# $NetBSD: majors.prep,v 1.21 2008/11/12 12:36:05 ad Exp $ # # Device majors for prep # @@ -31,7 +31,6 @@ device-major md char 24 block 17 md device-major joy char 26 joy device-major spkr char 27 spkr -device-major lkm char 28 prep device-major nvram char 33 nvram diff --git a/sys/arch/rs6000/conf/GENERIC b/sys/arch/rs6000/conf/GENERIC index 8d1639238a0..237e93cca73 100644 --- a/sys/arch/rs6000/conf/GENERIC +++ b/sys/arch/rs6000/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.6 2008/08/10 15:31:21 tls Exp $ +# $NetBSD: GENERIC,v 1.7 2008/11/12 12:36:05 ad Exp $ # # GENERIC machine description file # @@ -24,7 +24,7 @@ options INCLUDE_CONFIG_FILE # embed config file in kernel binary #makeoptions COPTS="-O2 -mno-powerpc -mno-power" # wheeee -#ident "GENERIC-$Revision: 1.6 $" +#ident "GENERIC-$Revision: 1.7 $" maxusers 32 @@ -49,7 +49,6 @@ options SYSVSHM # System V-like memory sharing #options SHMMAXPGS=1024 # 1024 pages is the default options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/rs6000/rs6000/machdep.c b/sys/arch/rs6000/rs6000/machdep.c index 0be296ec746..11a28347453 100644 --- a/sys/arch/rs6000/rs6000/machdep.c +++ b/sys/arch/rs6000/rs6000/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.3 2008/11/11 06:46:43 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.4 2008/11/12 12:36:05 ad Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.3 2008/11/11 06:46:43 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.4 2008/11/12 12:36:05 ad Exp $"); #include "opt_compat_netbsd.h" #include "opt_ddb.h" @@ -118,7 +118,7 @@ struct mem_region physmemr[OFMEMREGIONS], availmemr[OFMEMREGIONS]; paddr_t avail_end; /* XXX temporary */ extern register_t iosrtable[16]; -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) extern void *endsym, *startsym; #endif @@ -380,7 +380,7 @@ initppc(u_long startkernel, u_long endkernel, u_int args, void *btinfo) consinit(); setled(0x41000000); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init((int)((u_long)endsym - (u_long)startsym), startsym, endsym); #endif diff --git a/sys/arch/sandpoint/sandpoint/machdep.c b/sys/arch/sandpoint/sandpoint/machdep.c index 48a438d6409..f825d35a64f 100644 --- a/sys/arch/sandpoint/sandpoint/machdep.c +++ b/sys/arch/sandpoint/sandpoint/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.43 2008/11/11 06:46:43 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.44 2008/11/12 12:36:05 ad Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.43 2008/11/11 06:46:43 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.44 2008/11/12 12:36:05 ad Exp $"); #include "opt_compat_netbsd.h" #include "opt_ddb.h" @@ -110,7 +110,7 @@ paddr_t avail_end; struct pic_ops *isa_pic = NULL; extern int primary_pic; -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) extern void *startsym, *endsym; #endif @@ -196,7 +196,7 @@ initppc(u_int startkernel, u_int endkernel, u_int args, void *btinfo) /* Initialize pmap module */ pmap_bootstrap(startkernel, endkernel); -#if 0 /* NKSYMS || defined(DDB) || defined(LKM) */ +#if 0 /* NKSYMS || defined(DDB) || defined(MODULAR) */ ksyms_init((int)((u_int)endsym - (u_int)startsym), startsym, endsym); #endif #ifdef IPKDB diff --git a/sys/arch/sbmips/conf/GENERIC b/sys/arch/sbmips/conf/GENERIC index 55e9e935a1e..26a535b2514 100644 --- a/sys/arch/sbmips/conf/GENERIC +++ b/sys/arch/sbmips/conf/GENERIC @@ -1,10 +1,10 @@ -# $NetBSD: GENERIC,v 1.70 2008/10/25 10:08:25 he Exp $ +# $NetBSD: GENERIC,v 1.71 2008/11/12 12:36:05 ad Exp $ include "arch/sbmips/conf/std.sbmips" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.70 $" +#ident "GENERIC-$Revision: 1.71 $" #options LOCKDEBUG # XXX XXX XXX XXX #options DEBUG # extra kernel debugging support @@ -23,7 +23,6 @@ options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules #options NTP # network time protocol # Debugging options diff --git a/sys/arch/sbmips/sbmips/machdep.c b/sys/arch/sbmips/sbmips/machdep.c index ec5c331fee5..ab6d2b3ed18 100644 --- a/sys/arch/sbmips/sbmips/machdep.c +++ b/sys/arch/sbmips/sbmips/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.39 2008/11/11 06:46:43 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.40 2008/11/12 12:36:05 ad Exp $ */ /* * Copyright 2000, 2001 @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.39 2008/11/11 06:46:43 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.40 2008/11/12 12:36:05 ad Exp $"); #include "opt_ddb.h" #include "opt_execfmt.h" @@ -102,7 +102,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.39 2008/11/11 06:46:43 dyoung Exp $"); #include "ksyms.h" -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) #include <machine/db_machdep.h> #include <ddb/db_access.h> #include <ddb/db_sym.h> @@ -116,7 +116,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.39 2008/11/11 06:46:43 dyoung Exp $"); #include <dev/cons.h> -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* start and end of kernel symbol table */ void *ksym_start, *ksym_end; #endif @@ -192,7 +192,7 @@ mach_init(long fwhandle, long magic, long bootdata, long reserved) } kernend = (void *)mips_round_page(end); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) if (magic == BOOTINFO_MAGIC) { ksym_start = (void *)bootinfo.ssym; ksym_end = (void *)bootinfo.esym; @@ -330,7 +330,7 @@ mach_init(long fwhandle, long magic, long bootdata, long reserved) /* * Initialize debuggers, and break into them, if appropriate. */ -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init(((uintptr_t)ksym_end - (uintptr_t)ksym_start), ksym_start, ksym_end); #endif diff --git a/sys/arch/sgimips/conf/GENERIC32_IP2x b/sys/arch/sgimips/conf/GENERIC32_IP2x index 15e60313421..1d021aa77c0 100644 --- a/sys/arch/sgimips/conf/GENERIC32_IP2x +++ b/sys/arch/sgimips/conf/GENERIC32_IP2x @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC32_IP2x,v 1.75 2008/08/15 15:17:18 tsutsui Exp $ +# $NetBSD: GENERIC32_IP2x,v 1.76 2008/11/12 12:36:05 ad Exp $ # # GENERIC32_IP2x machine description file # @@ -29,7 +29,7 @@ makeoptions TEXTADDR=0x88069000 # entry point options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC32-IP2x-$Revision: 1.75 $" +#ident "GENERIC32-IP2x-$Revision: 1.76 $" maxusers 32 @@ -56,7 +56,6 @@ options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory options P1003_1B_SEMAPHORE # p1003.1b semaphore support -#options LKM # loadable kernel modules (XXX: working?) options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/sgimips/conf/GENERIC32_IP3x b/sys/arch/sgimips/conf/GENERIC32_IP3x index 07d9881b1a2..c8e347b42b5 100644 --- a/sys/arch/sgimips/conf/GENERIC32_IP3x +++ b/sys/arch/sgimips/conf/GENERIC32_IP3x @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC32_IP3x,v 1.76 2008/08/23 15:13:47 tsutsui Exp $ +# $NetBSD: GENERIC32_IP3x,v 1.77 2008/11/12 12:36:05 ad Exp $ # # GENERIC32_IP3x machine description file # @@ -28,7 +28,7 @@ makeoptions TEXTADDR="0x80069000" # entry point options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC32_IP3x-$Revision: 1.76 $" +#ident "GENERIC32_IP3x-$Revision: 1.77 $" maxusers 32 @@ -49,7 +49,6 @@ options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory options P1003_1B_SEMAPHORE # p1003.1b semaphore support -#options LKM # loadable kernel modules (XXX: working?) options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/sgimips/conf/majors.sgimips b/sys/arch/sgimips/conf/majors.sgimips index f980d8eecf3..a1d4d96ef16 100644 --- a/sys/arch/sgimips/conf/majors.sgimips +++ b/sys/arch/sgimips/conf/majors.sgimips @@ -1,4 +1,4 @@ -# $NetBSD: majors.sgimips,v 1.20 2007/12/31 15:32:05 ad Exp $ +# $NetBSD: majors.sgimips,v 1.21 2008/11/12 12:36:06 ad Exp $ # # Device majors for sgimips # @@ -22,7 +22,6 @@ device-major ctty char 21 device-major pts char 22 pty device-major ptc char 23 pty device-major log char 24 -device-major lkm char 25 lkm device-major filedesc char 26 device-major bpf char 27 bpfilter device-major tun char 28 tun diff --git a/sys/arch/sgimips/sgimips/machdep.c b/sys/arch/sgimips/sgimips/machdep.c index aed857417c7..49dc45c6933 100644 --- a/sys/arch/sgimips/sgimips/machdep.c +++ b/sys/arch/sgimips/sgimips/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.122 2008/11/11 06:46:43 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.123 2008/11/12 12:36:06 ad Exp $ */ /* * Copyright (c) 2000 Soren S. Jorvang @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.122 2008/11/11 06:46:43 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.123 2008/11/12 12:36:06 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -91,7 +91,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.122 2008/11/11 06:46:43 dyoung Exp $") #include "ksyms.h" -#if NKSYMS || defined(DDB) || defined(LKM) || defined(KGDB) +#if NKSYMS || defined(DDB) || defined(MODULAR) || defined(KGDB) #include <machine/db_machdep.h> #include <ddb/db_access.h> #include <ddb/db_sym.h> @@ -255,7 +255,7 @@ mach_init(int argc, char *argv[], u_int magic, void *bip) vaddr_t kernend; int kernstartpfn, kernendpfn; int i, rv; -#if NKSYMS > 0 || defined(DDB) || defined(LKM) +#if NKSYMS > 0 || defined(DDB) || defined(MODULAR) int nsym = 0; char *ssym = NULL; char *esym = NULL; @@ -302,7 +302,7 @@ mach_init(int argc, char *argv[], u_int magic, void *bip) } else bootinfo_msg = "no bootinfo found. (old bootblocks?)\n"; -#if NKSYM > 0 || defined(DDB) || defined(LKM) +#if NKSYM > 0 || defined(DDB) || defined(MODULAR) bi_syms = lookup_bootinfo(BTINFO_SYMTAB); /* check whether there is valid bootinfo symtab info */ @@ -482,7 +482,7 @@ mach_init(int argc, char *argv[], u_int magic, void *bip) for (i = 0; i < argc; i++) aprint_debug("argv[%d] = %s\n", i, argv[i]); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* init symbols if present */ if (esym) ksyms_init(nsym, ssym, esym); @@ -490,7 +490,7 @@ mach_init(int argc, char *argv[], u_int magic, void *bip) else ksyms_init(0, NULL, NULL); #endif /* SYMTAB_SPACE */ -#endif /* NKSYMS || defined(DDB) || defined(LKM) */ +#endif /* NKSYMS || defined(DDB) || defined(MODULAR) */ #if defined(KGDB) || defined(DDB) /* Set up DDB hook to turn off watchdog on entry */ diff --git a/sys/arch/shark/conf/GENERIC b/sys/arch/shark/conf/GENERIC index 982398959ee..fa7c4b62b49 100644 --- a/sys/arch/shark/conf/GENERIC +++ b/sys/arch/shark/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.81 2008/08/10 15:31:22 tls Exp $ +# $NetBSD: GENERIC,v 1.82 2008/11/12 12:36:06 ad Exp $ # # Generic Shark configuration. # @@ -7,7 +7,7 @@ include "arch/shark/conf/std.shark" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.81 $" +#ident "GENERIC-$Revision: 1.82 $" # estimated number of users maxusers 32 @@ -150,7 +150,6 @@ options INSECURE # disable kernel securelevel # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics, XXX temp required -options LKM # loadable kernel modules options KMEMSTATS # kernel memory statistics, XXX temp required options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/shark/conf/INSTALL b/sys/arch/shark/conf/INSTALL index 96f5a7f7018..a69ad912e61 100644 --- a/sys/arch/shark/conf/INSTALL +++ b/sys/arch/shark/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.38 2008/07/31 07:41:07 simonb Exp $ +# $NetBSD: INSTALL,v 1.39 2008/11/12 12:36:06 ad Exp $ # # Shark installation kernel # @@ -123,7 +123,6 @@ options INSECURE # disable kernel securelevel # Miscellaneous kernel options #options KTRACE # system call tracing, a la ktrace(1) #options IRQSTATS # manage IRQ statistics, XXX temp required -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics, XXX temp required options USERCONF # userconf(4) support options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/shark/conf/OFWGENCFG b/sys/arch/shark/conf/OFWGENCFG index 34db62a085d..93c976593b0 100644 --- a/sys/arch/shark/conf/OFWGENCFG +++ b/sys/arch/shark/conf/OFWGENCFG @@ -1,4 +1,4 @@ -# $NetBSD: OFWGENCFG,v 1.31 2008/05/30 20:10:03 tsutsui Exp $ +# $NetBSD: OFWGENCFG,v 1.32 2008/11/12 12:36:06 ad Exp $ # # OFWGENCFG: 'generic' configuration for Open Firmware boards. # @@ -101,7 +101,6 @@ options SHMMAXPGS=1024 # 1024 pages is the default # Miscellaneous kernel options options KTRACE # system call tracing, a la ktrace(1) options IRQSTATS # manage IRQ statistics -#options LKM # loadable kernel modules options KMEMSTATS # kernel memory statistics options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/shark/conf/majors.shark b/sys/arch/shark/conf/majors.shark index 5605a4bb92e..a9fe87bc2c1 100644 --- a/sys/arch/shark/conf/majors.shark +++ b/sys/arch/shark/conf/majors.shark @@ -1,4 +1,4 @@ -# $NetBSD: majors.shark,v 1.25 2007/12/31 15:32:05 ad Exp $ +# $NetBSD: majors.shark,v 1.26 2008/11/12 12:36:06 ad Exp $ # # Device majors for shark # @@ -31,7 +31,6 @@ device-major cd char 26 block 26 cd device-major bpf char 32 bpfilter device-major tun char 33 tun device-major filedesc char 34 -device-major lkm char 35 lkm device-major audio char 36 audio device-major opms char 40 opms diff --git a/sys/arch/shark/shark/shark_machdep.c b/sys/arch/shark/shark/shark_machdep.c index 615dac1a40e..06e81962293 100644 --- a/sys/arch/shark/shark/shark_machdep.c +++ b/sys/arch/shark/shark/shark_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: shark_machdep.c,v 1.30 2008/04/17 00:03:36 macallan Exp $ */ +/* $NetBSD: shark_machdep.c,v 1.31 2008/11/12 12:36:06 ad Exp $ */ /* * Copyright 1997 @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: shark_machdep.c,v 1.30 2008/04/17 00:03:36 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: shark_machdep.c,v 1.31 2008/11/12 12:36:06 ad Exp $"); #include "opt_ddb.h" @@ -299,7 +299,7 @@ initarm(void *arg) if (fiq_claim(&shark_fiqhandler)) panic("Cannot claim FIQ vector."); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) #ifdef __ELF__ ksyms_init(0, NULL, NULL); /* XXX */ #else @@ -311,7 +311,7 @@ initarm(void *arg) ksyms_init(kernexec->a_syms, &end, esym); } #endif /* __ELF__ */ -#endif /* NKSYMS || defined(DDB) || defined(LKM) */ +#endif /* NKSYMS || defined(DDB) || defined(MODULAR) */ #ifdef DDB db_machine_init(); diff --git a/sys/arch/sparc/conf/BILL-THE-CAT b/sys/arch/sparc/conf/BILL-THE-CAT index 68fd722e8c4..9230e774d53 100644 --- a/sys/arch/sparc/conf/BILL-THE-CAT +++ b/sys/arch/sparc/conf/BILL-THE-CAT @@ -1,4 +1,4 @@ -# $NetBSD: BILL-THE-CAT,v 1.42 2007/10/17 19:57:10 garbled Exp $ +# $NetBSD: BILL-THE-CAT,v 1.43 2008/11/12 12:36:06 ad Exp $ # From: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp include "arch/sparc/conf/std.sparc" @@ -55,7 +55,6 @@ options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default ## Loadable kernel module support; still under development. -options LKM options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC index 23b2f135753..18a72cdeae7 100644 --- a/sys/arch/sparc/conf/GENERIC +++ b/sys/arch/sparc/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.205 2008/08/10 15:31:22 tls Exp $ +# $NetBSD: GENERIC,v 1.206 2008/11/12 12:36:06 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/sparc/conf/std.sparc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.205 $" +#ident "GENERIC-$Revision: 1.206 $" maxusers 32 @@ -77,7 +77,6 @@ options SYSVSHM # System V shared memory options P1003_1B_SEMAPHORE # p1003.1b semaphore support ## Loadable kernel module support; still under development. -options LKM options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/sparc/conf/INSTALL b/sys/arch/sparc/conf/INSTALL index 83401ab25f5..0c3f9f33008 100644 --- a/sys/arch/sparc/conf/INSTALL +++ b/sys/arch/sparc/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.62 2008/07/31 07:41:07 simonb Exp $ +# $NetBSD: INSTALL,v 1.63 2008/11/12 12:36:06 ad Exp $ # # from: NetBSD: GENERIC,v 1.84 1999/06/06 13:00:03 mrg Exp # @@ -71,7 +71,6 @@ config netbsd root on ? type ? #options SHMMAXPGS=1024 # 1024 pages is the default ## Loadable kernel module support; still under development. -#options LKM options USERCONF # userconf(4) support options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/sparc/conf/KRUPS b/sys/arch/sparc/conf/KRUPS index 5a72a8139e0..fb6d06599a6 100644 --- a/sys/arch/sparc/conf/KRUPS +++ b/sys/arch/sparc/conf/KRUPS @@ -1,4 +1,4 @@ -# $NetBSD: KRUPS,v 1.45 2007/12/31 15:32:06 ad Exp $ +# $NetBSD: KRUPS,v 1.46 2008/11/12 12:36:06 ad Exp $ # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp # # Krups (JavaStation-NC) machine description file @@ -8,7 +8,7 @@ include "arch/sparc/conf/std.sparc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "KRUPS-$Revision: 1.45 $" +#ident "KRUPS-$Revision: 1.46 $" maxusers 32 @@ -64,7 +64,6 @@ options SYSVSHM # System V shared memory options P1003_1B_SEMAPHORE # p1003.1b semaphore support ## Loadable kernel module support; still under development. -#options LKM #options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/sparc/conf/MRCOFFEE b/sys/arch/sparc/conf/MRCOFFEE index e8237af9dab..b9040204b47 100644 --- a/sys/arch/sparc/conf/MRCOFFEE +++ b/sys/arch/sparc/conf/MRCOFFEE @@ -1,4 +1,4 @@ -# $NetBSD: MRCOFFEE,v 1.23 2007/12/31 15:32:06 ad Exp $ +# $NetBSD: MRCOFFEE,v 1.24 2008/11/12 12:36:06 ad Exp $ # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp # # Mr.Coffee (JavaStation 1) machine description file @@ -12,7 +12,7 @@ include "arch/sparc/conf/std.sparc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "MRCOFFEE-$Revision: 1.23 $" +#ident "MRCOFFEE-$Revision: 1.24 $" maxusers 32 @@ -69,7 +69,6 @@ options SYSVSHM # System V shared memory options P1003_1B_SEMAPHORE # p1003.1b semaphore support ## Loadable kernel module support; still under development. -options LKM options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/sparc/conf/TADPOLE3GX b/sys/arch/sparc/conf/TADPOLE3GX index 381719b561d..fb9de7aad74 100644 --- a/sys/arch/sparc/conf/TADPOLE3GX +++ b/sys/arch/sparc/conf/TADPOLE3GX @@ -1,4 +1,4 @@ -# $NetBSD: TADPOLE3GX,v 1.42 2007/10/17 19:57:11 garbled Exp $ +# $NetBSD: TADPOLE3GX,v 1.43 2008/11/12 12:36:06 ad Exp $ include "arch/sparc/conf/std.sparc" @@ -67,7 +67,6 @@ options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default ## Loadable kernel module support; still under development. -options LKM options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/sparc/conf/majors.sparc b/sys/arch/sparc/conf/majors.sparc index c76765ca6c4..ca8b1a0fab0 100644 --- a/sys/arch/sparc/conf/majors.sparc +++ b/sys/arch/sparc/conf/majors.sparc @@ -1,4 +1,4 @@ -# $NetBSD: majors.sparc,v 1.29 2007/12/31 15:32:06 ad Exp $ +# $NetBSD: majors.sparc,v 1.30 2008/11/12 12:36:06 ad Exp $ # # Device majors for sparc # @@ -97,7 +97,6 @@ device-major bpp char 107 bpp device-major tcx char 109 tcx device-major vnd char 110 block 8 vnd device-major tun char 111 tun -device-major lkm char 112 lkm device-major rnd char 119 rnd device-major scsibus char 120 scsibus diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c index 58ac606a5ae..3ecee12a813 100644 --- a/sys/arch/sparc/sparc/autoconf.c +++ b/sys/arch/sparc/sparc/autoconf.c @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.229 2008/07/17 14:39:26 cegger Exp $ */ +/* $NetBSD: autoconf.c,v 1.230 2008/11/12 12:36:06 ad Exp $ */ /* * Copyright (c) 1996 @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.229 2008/07/17 14:39:26 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.230 2008/11/12 12:36:06 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -119,7 +119,7 @@ extern int kgdb_debug_panic; #endif extern void *bootinfo; -#if !NKSYMS && !defined(DDB) && !defined(LKM) +#if !NKSYMS && !defined(DDB) && !defined(MODULAR) void bootinfo_relocate(void *); #endif @@ -263,7 +263,7 @@ void bootstrap(void) { extern struct user *proc0paddr; -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) struct btinfo_symtab *bi_sym; #else extern int end[]; @@ -288,7 +288,7 @@ bootstrap(void) } #endif /* SUN4M || SUN4D */ -#if !NKSYMS && !defined(DDB) && !defined(LKM) +#if !NKSYMS && !defined(DDB) && !defined(MODULAR) /* * We want to reuse the memory where the symbols were stored * by the loader. Relocate the bootinfo array which is loaded @@ -314,7 +314,7 @@ bootstrap(void) initmsgbuf((void *)KERNBASE, 8192); #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) if ((bi_sym = lookup_bootinfo(BTINFO_SYMTAB)) != NULL) { if (bi_sym->ssym < KERNBASE) { /* Assume low-loading boot loader */ @@ -1867,7 +1867,7 @@ lookup_bootinfo(int type) return (NULL); } -#if !NKSYMS && !defined(DDB) && !defined(LKM) +#if !NKSYMS && !defined(DDB) && !defined(MODULAR) /* * Move bootinfo from the current kernel top to the proposed * location. As a side-effect, `kernel_top' is adjusted to point @@ -1929,4 +1929,4 @@ bootinfo_relocate(void *newloc) bootinfo = newloc; kernel_top = (char *)newloc + ALIGN(bi_size); } -#endif /* !NKSYMS && !defined(DDB) && !defined(LKM) */ +#endif /* !NKSYMS && !defined(DDB) && !defined(MODULAR) */ diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC index ab1b4b83a6f..2b0008b7a6c 100644 --- a/sys/arch/sparc64/conf/GENERIC +++ b/sys/arch/sparc64/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.104 2008/10/29 17:29:45 jkunz Exp $ +# $NetBSD: GENERIC,v 1.105 2008/11/12 12:36:06 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/sparc64/conf/std.sparc64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.104 $" +#ident "GENERIC-$Revision: 1.105 $" maxusers 64 @@ -65,7 +65,6 @@ options P1003_1B_SEMAPHORE # p1003.1b semaphore support ## Loadable kernel module support; still under development. -options LKM options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/sparc64/conf/NONPLUS64 b/sys/arch/sparc64/conf/NONPLUS64 index eaea689daac..5f55f0ffac5 100644 --- a/sys/arch/sparc64/conf/NONPLUS64 +++ b/sys/arch/sparc64/conf/NONPLUS64 @@ -1,8 +1,8 @@ -# $NetBSD: NONPLUS64,v 1.25 2008/05/30 20:10:03 tsutsui Exp $ +# $NetBSD: NONPLUS64,v 1.26 2008/11/12 12:36:06 ad Exp $ include "arch/sparc64/conf/std.sparc64" -#ident "NONPLUS64-$Revision: 1.25 $" +#ident "NONPLUS64-$Revision: 1.26 $" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary @@ -48,7 +48,6 @@ options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default ## Loadable kernel module support; still under development. -options LKM options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/sparc64/conf/majors.sparc64 b/sys/arch/sparc64/conf/majors.sparc64 index 419594934bd..fc83506ccb2 100644 --- a/sys/arch/sparc64/conf/majors.sparc64 +++ b/sys/arch/sparc64/conf/majors.sparc64 @@ -1,4 +1,4 @@ -# $NetBSD: majors.sparc64,v 1.28 2007/12/31 15:32:06 ad Exp $ +# $NetBSD: majors.sparc64,v 1.29 2008/11/12 12:36:06 ad Exp $ # # Device majors for sparc64 # @@ -94,7 +94,6 @@ device-major bpp char 107 bpp device-major tcx char 109 tcx device-major vnd char 110 block 8 vnd device-major tun char 111 tun -device-major lkm char 112 lkm device-major rnd char 119 rnd device-major scsibus char 120 scsibus diff --git a/sys/arch/sparc64/sparc64/autoconf.c b/sys/arch/sparc64/sparc64/autoconf.c index 84017a5efe9..f089f380d7c 100644 --- a/sys/arch/sparc64/sparc64/autoconf.c +++ b/sys/arch/sparc64/sparc64/autoconf.c @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.156 2008/10/21 06:07:14 macallan Exp $ */ +/* $NetBSD: autoconf.c,v 1.157 2008/11/12 12:36:06 ad Exp $ */ /* * Copyright (c) 1996 @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.156 2008/10/21 06:07:14 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.157 2008/11/12 12:36:06 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -251,7 +251,7 @@ bootstrap(void *o0, void *bootargs, void *bootsize, void *o3, void *ofw) void *bi; long bmagic; -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) struct btinfo_symtab *bi_sym; #endif struct btinfo_count *bi_count; @@ -311,7 +311,7 @@ die_old_boot_loader: panic("Kernel end address is not found in bootinfo.\n"); } -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) LOOKUP_BOOTINFO(bi_sym, BTINFO_SYMTAB); ksyms_init(bi_sym->nsym, (int *)(u_long)bi_sym->ssym, (int *)(u_long)bi_sym->esym); diff --git a/sys/arch/sparc64/sparc64/netbsd32_machdep.c b/sys/arch/sparc64/sparc64/netbsd32_machdep.c index 8c434954db6..2487b1f9af4 100644 --- a/sys/arch/sparc64/sparc64/netbsd32_machdep.c +++ b/sys/arch/sparc64/sparc64/netbsd32_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_machdep.c,v 1.85 2008/10/15 06:51:19 wrstuden Exp $ */ +/* $NetBSD: netbsd32_machdep.c,v 1.86 2008/11/12 12:36:06 ad Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.85 2008/10/15 06:51:19 wrstuden Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.86 2008/11/12 12:36:06 ad Exp $"); #ifdef _KERNEL_OPT #include "opt_compat_netbsd.h" @@ -215,7 +215,7 @@ netbsd32_sendsig_sigcontext(const ksiginfo_t *ksi, const sigset_t *mask) */ sf.sf_signo = sig; sf.sf_code = (u_int)ksi->ksi_trap; -#if defined(COMPAT_SUNOS) || defined(LKM) +#if defined(COMPAT_SUNOS) || defined(MODULAR) sf.sf_scp = (u_long)&fp->sf_sc; #endif sf.sf_addr = 0; /* XXX */ diff --git a/sys/arch/sparc64/sparc64/svr4_32_machdep.c b/sys/arch/sparc64/sparc64/svr4_32_machdep.c index fda59f88fad..0f6500b23b4 100644 --- a/sys/arch/sparc64/sparc64/svr4_32_machdep.c +++ b/sys/arch/sparc64/sparc64/svr4_32_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_32_machdep.c,v 1.34 2008/04/28 20:23:37 martin Exp $ */ +/* $NetBSD: svr4_32_machdep.c,v 1.35 2008/11/12 12:36:06 ad Exp $ */ /*- * Copyright (c) 1994 The NetBSD Foundation, Inc. @@ -30,9 +30,9 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_32_machdep.c,v 1.34 2008/04/28 20:23:37 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_32_machdep.c,v 1.35 2008/11/12 12:36:06 ad Exp $"); -#ifndef _LKM +#ifdef _KERNEL_OPT #include "opt_ddb.h" #endif diff --git a/sys/arch/sparc64/sparc64/svr4_machdep.c b/sys/arch/sparc64/sparc64/svr4_machdep.c index 1d1aa547eec..13b41a2505d 100644 --- a/sys/arch/sparc64/sparc64/svr4_machdep.c +++ b/sys/arch/sparc64/sparc64/svr4_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: svr4_machdep.c,v 1.50 2008/04/28 20:23:37 martin Exp $ */ +/* $NetBSD: svr4_machdep.c,v 1.51 2008/11/12 12:36:06 ad Exp $ */ /*- * Copyright (c) 1994 The NetBSD Foundation, Inc. @@ -30,9 +30,9 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: svr4_machdep.c,v 1.50 2008/04/28 20:23:37 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: svr4_machdep.c,v 1.51 2008/11/12 12:36:06 ad Exp $"); -#ifndef _LKM +#ifdef _KERNEL_OPT #include "opt_ddb.h" #endif diff --git a/sys/arch/sun2/conf/DISKLESS b/sys/arch/sun2/conf/DISKLESS index 5cdf943e6d0..d3ce6419635 100644 --- a/sys/arch/sun2/conf/DISKLESS +++ b/sys/arch/sun2/conf/DISKLESS @@ -1,4 +1,4 @@ -# $NetBSD: DISKLESS,v 1.38 2008/04/26 02:43:07 tsutsui Exp $ +# $NetBSD: DISKLESS,v 1.39 2008/11/12 12:36:06 ad Exp $ # DISKLESS Sun2 (2/120, 2/170, 2/50, ...) # Supports root on: ie0, ec0 @@ -7,7 +7,7 @@ include "arch/sun2/conf/std.sun2" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "DISKLESS-$Revision: 1.38 $" +#ident "DISKLESS-$Revision: 1.39 $" makeoptions COPTS="-Os" # optimize for size @@ -22,7 +22,6 @@ options KTRACE # system call tracing options SYSVMSG # System V message queues options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory -#options LKM # loadable kernel modules #options INSECURE # disable kernel security level options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/sun2/conf/FOURMEG b/sys/arch/sun2/conf/FOURMEG index 44a46042083..c6185bf7a5c 100644 --- a/sys/arch/sun2/conf/FOURMEG +++ b/sys/arch/sun2/conf/FOURMEG @@ -1,4 +1,4 @@ -# $NetBSD: FOURMEG,v 1.42 2008/04/26 02:43:07 tsutsui Exp $ +# $NetBSD: FOURMEG,v 1.43 2008/11/12 12:36:07 ad Exp $ # FOURMEG Sun2 (2/120, 2/170, 2/50, ...) # Supports root on: ie0, sd*, ... @@ -7,7 +7,7 @@ include "arch/sun2/conf/std.sun2" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "FOURMEG-$Revision: 1.42 $" +#ident "FOURMEG-$Revision: 1.43 $" makeoptions COPTS="-Os" # optimize for size @@ -22,7 +22,6 @@ options KTRACE # system call tracing #options SYSVMSG # System V message queues #options SYSVSEM # System V semaphores #options SYSVSHM # System V shared memory -#options LKM # loadable kernel modules #options INSECURE # disable kernel security level options USERCONF # userconf(4) support options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/sun2/conf/GENERIC b/sys/arch/sun2/conf/GENERIC index 3674516b571..e2b3fc8c34c 100644 --- a/sys/arch/sun2/conf/GENERIC +++ b/sys/arch/sun2/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.70 2008/08/10 15:31:22 tls Exp $ +# $NetBSD: GENERIC,v 1.71 2008/11/12 12:36:07 ad Exp $ # # GENERIC machine description file # @@ -25,7 +25,7 @@ include "arch/sun2/conf/std.sun2" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.70 $" +#ident "GENERIC-$Revision: 1.71 $" makeoptions COPTS="-Os" # optimize for size @@ -41,7 +41,6 @@ options SYSVMSG # System V message queues options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules #options INSECURE # disable kernel security level #options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/sun2/conf/INSTALL b/sys/arch/sun2/conf/INSTALL index 04ed52fafde..c1e226d8d0c 100644 --- a/sys/arch/sun2/conf/INSTALL +++ b/sys/arch/sun2/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.35 2008/04/26 03:08:59 tsutsui Exp $ +# $NetBSD: INSTALL,v 1.36 2008/11/12 12:36:07 ad Exp $ # INSTALL Sun2 (2/120, 2/170, 2/50, ...) @@ -6,7 +6,7 @@ include "arch/sun2/conf/std.sun2" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "INSTALL-$Revision: 1.35 $" +#ident "INSTALL-$Revision: 1.36 $" makeoptions COPTS="-Os" # optimize for size @@ -21,7 +21,6 @@ maxusers 2 #options SYSVMSG # System V message queues #options SYSVSEM # System V semaphores #options SYSVSHM # System V shared memory -#options LKM # loadable kernel modules #options INSECURE # disable kernel security level options PIPE_SOCKETPAIR # smaller, but slower pipe(2) #options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel diff --git a/sys/arch/sun2/conf/RAMDISK b/sys/arch/sun2/conf/RAMDISK index 9b4c3c28449..97486648606 100644 --- a/sys/arch/sun2/conf/RAMDISK +++ b/sys/arch/sun2/conf/RAMDISK @@ -1,4 +1,4 @@ -# $NetBSD: RAMDISK,v 1.41 2008/06/02 09:04:50 he Exp $ +# $NetBSD: RAMDISK,v 1.42 2008/11/12 12:36:07 ad Exp $ # RAMDISK: Root/swap on ramdisk # This kernel is used to: @@ -26,7 +26,6 @@ maxusers 2 #options SYSVMSG # System V message queues #options SYSVSEM # System V semaphores #options SYSVSHM # System V shared memory -#options LKM # loadable kernel modules #options INSECURE # disable kernel security level options USERCONF # userconf(4) support options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/sun2/conf/VME b/sys/arch/sun2/conf/VME index 69882375a27..140a06fa751 100644 --- a/sys/arch/sun2/conf/VME +++ b/sys/arch/sun2/conf/VME @@ -1,4 +1,4 @@ -# $NetBSD: VME,v 1.32 2008/01/11 11:45:24 tsutsui Exp $ +# $NetBSD: VME,v 1.33 2008/11/12 12:36:07 ad Exp $ # VME Sun2 (2/50, 2/130, 2/160...) # Supports root on: ie0, sd*, ... @@ -7,7 +7,7 @@ include "arch/sun2/conf/std.sun2" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "VME-$Revision: 1.32 $" +#ident "VME-$Revision: 1.33 $" # Machines to be supported by this kernel #options FPU_EMULATE @@ -25,7 +25,6 @@ options SYSVSEM # System V semaphores #options SEMMNU=30 # number of undo structures in system options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default -options LKM # loadable kernel modules #options INSECURE # disable kernel security level options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/sun2/conf/majors.sun2 b/sys/arch/sun2/conf/majors.sun2 index 8bb51d5e1cf..15d898a8036 100644 --- a/sys/arch/sun2/conf/majors.sun2 +++ b/sys/arch/sun2/conf/majors.sun2 @@ -1,4 +1,4 @@ -# $NetBSD: majors.sun2,v 1.18 2007/12/31 15:32:07 ad Exp $ +# $NetBSD: majors.sun2,v 1.19 2008/11/12 12:36:07 ad Exp $ # # Device majors for sun2 # @@ -44,7 +44,6 @@ device-major ch char 59 ch device-major ss char 60 ss device-major uk char 61 uk -device-major lkm char 72 lkm device-major rnd char 80 rnd device-major scsibus char 81 scsibus diff --git a/sys/arch/sun2/sun2/locore2.c b/sys/arch/sun2/sun2/locore2.c index 9b65086505a..831c4df5ade 100644 --- a/sys/arch/sun2/sun2/locore2.c +++ b/sys/arch/sun2/sun2/locore2.c @@ -1,4 +1,4 @@ -/* $NetBSD: locore2.c,v 1.18 2008/04/28 20:23:37 martin Exp $ */ +/* $NetBSD: locore2.c,v 1.19 2008/11/12 12:36:08 ad Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: locore2.c,v 1.18 2008/04/28 20:23:37 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: locore2.c,v 1.19 2008/11/12 12:36:08 ad Exp $"); #include "opt_ddb.h" @@ -104,7 +104,7 @@ void _bootstrap(void); static void _verify_hardware(void); static void _vm_init(void); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) static void _save_symtab(void); /* @@ -172,7 +172,7 @@ _vm_init(void) * if DDB is not part of this kernel, ignore the symbols. */ esym = end + 4; -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* This will advance esym past the symbols. */ _save_symtab(); #endif diff --git a/sys/arch/sun2/sun2/machdep.c b/sys/arch/sun2/sun2/machdep.c index dc7e9416d3c..3dbf68a9b04 100644 --- a/sys/arch/sun2/sun2/machdep.c +++ b/sys/arch/sun2/sun2/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.54 2008/11/11 06:46:44 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.55 2008/11/12 12:36:08 ad Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993 @@ -153,7 +153,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.54 2008/11/11 06:46:44 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.55 2008/11/12 12:36:08 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -296,7 +296,7 @@ cpu_startup(void) msgbufaddr = (void *)((char *)v + MSGBUFOFF); initmsgbuf(msgbufaddr, MSGBUFSIZE); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) { extern int nsym; extern char *ssym, *esym; diff --git a/sys/arch/sun3/conf/DISKLESS b/sys/arch/sun3/conf/DISKLESS index fe9849d75e9..e9cb3cd4bf2 100644 --- a/sys/arch/sun3/conf/DISKLESS +++ b/sys/arch/sun3/conf/DISKLESS @@ -1,4 +1,4 @@ -# $NetBSD: DISKLESS,v 1.58 2008/04/05 22:08:41 tsutsui Exp $ +# $NetBSD: DISKLESS,v 1.59 2008/11/12 12:36:08 ad Exp $ # DISKLESS - Root and swap on NFS # Desktop machines only (3/50, 3/60, 3/110) @@ -24,7 +24,6 @@ maxusers 2 #options SYSVSEM # System V semaphores #options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default -#options LKM # loadable kernel modules #options INSECURE # disable kernel security level options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/sun3/conf/DISKLESS3X b/sys/arch/sun3/conf/DISKLESS3X index 1bdb017cb99..aec3bc848fa 100644 --- a/sys/arch/sun3/conf/DISKLESS3X +++ b/sys/arch/sun3/conf/DISKLESS3X @@ -1,4 +1,4 @@ -# $NetBSD: DISKLESS3X,v 1.45 2008/04/05 22:08:41 tsutsui Exp $ +# $NetBSD: DISKLESS3X,v 1.46 2008/11/12 12:36:08 ad Exp $ # DISKLESS - Root and swap on NFS # Desktop machines only (3/80) @@ -24,7 +24,6 @@ maxusers 2 #options SYSVSEM # System V semaphores #options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default -#options LKM # loadable kernel modules #options INSECURE # disable kernel security level options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/sun3/conf/GENERIC b/sys/arch/sun3/conf/GENERIC index 79e32014b1a..86faea2bcc9 100644 --- a/sys/arch/sun3/conf/GENERIC +++ b/sys/arch/sun3/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.145 2008/08/10 15:31:22 tls Exp $ +# $NetBSD: GENERIC,v 1.146 2008/11/12 12:36:08 ad Exp $ # # GENERIC machine description file # @@ -25,7 +25,7 @@ include "arch/sun3/conf/std.sun3" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.145 $" +#ident "GENERIC-$Revision: 1.146 $" makeoptions COPTS="-Os" # bootloader has size limit (~2MB) @@ -42,7 +42,6 @@ options SYSVMSG # System V message queues options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules #options INSECURE # disable kernel security level #options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/sun3/conf/GENERIC3X b/sys/arch/sun3/conf/GENERIC3X index d681dcc4873..2fb6003bd14 100644 --- a/sys/arch/sun3/conf/GENERIC3X +++ b/sys/arch/sun3/conf/GENERIC3X @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC3X,v 1.102 2008/08/15 15:02:25 tsutsui Exp $ +# $NetBSD: GENERIC3X,v 1.103 2008/11/12 12:36:08 ad Exp $ # GENERIC Sun3X (3/80, 3/470) # Supports root on: ie0, le0, sd*, ... @@ -7,7 +7,7 @@ include "arch/sun3/conf/std.sun3x" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC3X-$Revision: 1.102 $" +#ident "GENERIC3X-$Revision: 1.103 $" makeoptions COPTS="-Os" # bootloader has size limit (~2MB) @@ -24,7 +24,6 @@ options SYSVMSG # System V message queues options SYSVSEM # System V semaphores options SYSVSHM # System V shared memory options P1003_1B_SEMAPHORE # p1003.1b semaphore support -options LKM # loadable kernel modules #options INSECURE # disable kernel security level #options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/sun3/conf/INSTALL b/sys/arch/sun3/conf/INSTALL index 832393fb234..c1f8059677d 100644 --- a/sys/arch/sun3/conf/INSTALL +++ b/sys/arch/sun3/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.42 2008/07/31 07:41:07 simonb Exp $ +# $NetBSD: INSTALL,v 1.43 2008/11/12 12:36:08 ad Exp $ # # INSTALL - Installation kernel for the Sun3 # @@ -26,7 +26,6 @@ maxusers 2 #options SYSVSEM # System V semaphores #options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default -#options LKM # loadable kernel modules #options INSECURE # disable kernel security level options USERCONF # userconf(4) support options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/sun3/conf/INSTALL3X b/sys/arch/sun3/conf/INSTALL3X index 1004703c3f7..ab7530dd39c 100644 --- a/sys/arch/sun3/conf/INSTALL3X +++ b/sys/arch/sun3/conf/INSTALL3X @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL3X,v 1.41 2008/07/31 07:41:07 simonb Exp $ +# $NetBSD: INSTALL3X,v 1.42 2008/11/12 12:36:08 ad Exp $ # # INSTALL3X - Installation kernel for the Sun3X # @@ -26,7 +26,6 @@ maxusers 2 #options SYSVSEM # System V semaphores #options SYSVSHM # System V shared memory #options SHMMAXPGS=1024 # 1024 pages is the default -#options LKM # loadable kernel modules #options INSECURE # disable kernel security level options USERCONF # userconf(4) support options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/sun3/conf/majors.sun3 b/sys/arch/sun3/conf/majors.sun3 index a2d6e734606..29158d0b1e9 100644 --- a/sys/arch/sun3/conf/majors.sun3 +++ b/sys/arch/sun3/conf/majors.sun3 @@ -1,4 +1,4 @@ -# $NetBSD: majors.sun3,v 1.18 2007/12/31 15:32:07 ad Exp $ +# $NetBSD: majors.sun3,v 1.19 2008/11/12 12:36:08 ad Exp $ # # Device majors for sun3/sun3x # @@ -52,7 +52,6 @@ device-major ch char 59 ch device-major ss char 60 ss device-major uk char 61 uk -device-major lkm char 72 lkm device-major rnd char 80 rnd device-major scsibus char 81 scsibus diff --git a/sys/arch/sun3/sun3/locore2.c b/sys/arch/sun3/sun3/locore2.c index d398f5410c4..4ea78b320fe 100644 --- a/sys/arch/sun3/sun3/locore2.c +++ b/sys/arch/sun3/sun3/locore2.c @@ -1,4 +1,4 @@ -/* $NetBSD: locore2.c,v 1.91 2008/04/28 20:23:38 martin Exp $ */ +/* $NetBSD: locore2.c,v 1.92 2008/11/12 12:36:08 ad Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: locore2.c,v 1.91 2008/04/28 20:23:38 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: locore2.c,v 1.92 2008/11/12 12:36:08 ad Exp $"); #include "opt_ddb.h" @@ -106,7 +106,7 @@ void _bootstrap(void); static void _verify_hardware(void); static void _vm_init(void); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) static void _save_symtab(void); /* @@ -187,7 +187,7 @@ _vm_init(void) * if DDB is not part of this kernel, ignore the symbols. */ esym = end + 4; -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) /* This will advance esym past the symbols. */ _save_symtab(); #endif diff --git a/sys/arch/sun3/sun3/machdep.c b/sys/arch/sun3/sun3/machdep.c index 23605ecfd3a..e87ea0985eb 100644 --- a/sys/arch/sun3/sun3/machdep.c +++ b/sys/arch/sun3/sun3/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.186 2008/11/11 06:46:44 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.187 2008/11/12 12:36:08 ad Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993 @@ -78,7 +78,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.186 2008/11/11 06:46:44 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.187 2008/11/12 12:36:08 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -179,7 +179,7 @@ consinit(void) */ cninit(); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) { extern int nsym; extern char *ssym, *esym; diff --git a/sys/arch/sun3/sun3x/machdep.c b/sys/arch/sun3/sun3x/machdep.c index 38b4c2c32af..658895fc3c3 100644 --- a/sys/arch/sun3/sun3x/machdep.c +++ b/sys/arch/sun3/sun3x/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.112 2008/11/11 06:46:44 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.113 2008/11/12 12:36:08 ad Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993 @@ -75,7 +75,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.112 2008/11/11 06:46:44 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.113 2008/11/12 12:36:08 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -180,7 +180,7 @@ consinit(void) */ cninit(); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) { extern int nsym; extern char *ssym, *esym; diff --git a/sys/arch/vax/conf/GENERIC b/sys/arch/vax/conf/GENERIC index 8465a8634be..61cf6217a59 100644 --- a/sys/arch/vax/conf/GENERIC +++ b/sys/arch/vax/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.167 2008/08/12 17:54:47 hans Exp $ +# $NetBSD: GENERIC,v 1.168 2008/11/12 12:36:09 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/vax/conf/std.vax" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.167 $" +#ident "GENERIC-$Revision: 1.168 $" # Here are all different supported CPU types listed. #options VAX8800 # VAX 8500, 8530, 8550, 8700, 8800 @@ -157,7 +157,6 @@ options COMPAT_IBCS2 # DEC SVR.3 compatilibity #options NO_INSN_EMULATE # CPU does not lack some hardware instructions. options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. -options LKM options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/vax/conf/INSTALL b/sys/arch/vax/conf/INSTALL index aff2d1f8c92..d780db5dc88 100644 --- a/sys/arch/vax/conf/INSTALL +++ b/sys/arch/vax/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.50 2008/07/31 07:41:07 simonb Exp $ +# $NetBSD: INSTALL,v 1.51 2008/11/12 12:36:09 ad Exp $ # # INSTALL kernel; all supported devices but nothing fancy. # @@ -101,7 +101,6 @@ options COMPAT_40 # NetBSD 4.0 compatibility. #options COMPAT_ULTRIX options COMPAT_BSDPTY # /dev/[pt]ty?? ptys. -#options LKM options USERCONF # userconf(4) support options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/vax/conf/majors.vax b/sys/arch/vax/conf/majors.vax index ab5aa699776..801bee31f47 100644 --- a/sys/arch/vax/conf/majors.vax +++ b/sys/arch/vax/conf/majors.vax @@ -1,4 +1,4 @@ -# $NetBSD: majors.vax,v 1.21 2007/12/31 15:32:08 ad Exp $ +# $NetBSD: majors.vax,v 1.22 2008/11/12 12:36:09 ad Exp $ # # Device majors for vax # @@ -36,7 +36,6 @@ device-major gen char 25 vax8600 | vax8200 | vaxany device-major lpa char 26 lpa device-major ps char 27 ps -device-major lkm char 28 lkm device-major ad char 29 ad device-major rx char 30 block 12 rx device-major ik char 31 ik diff --git a/sys/arch/vax/vax/machdep.c b/sys/arch/vax/vax/machdep.c index c67a0f1ac14..799682bcedd 100644 --- a/sys/arch/vax/vax/machdep.c +++ b/sys/arch/vax/vax/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.168 2008/11/11 06:46:44 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.169 2008/11/12 12:36:09 ad Exp $ */ /* * Copyright (c) 1982, 1986, 1990 The Regents of the University of California. @@ -83,7 +83,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.168 2008/11/11 06:46:44 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.169 2008/11/12 12:36:09 ad Exp $"); #include "opt_ddb.h" #include "opt_compat_netbsd.h" @@ -320,7 +320,7 @@ consinit(void) iospace_inited = 1; #endif cninit(); -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) if (symtab_start != NULL && symtab_nsyms != 0 && symtab_end != NULL) { ksyms_init(symtab_nsyms, symtab_start, symtab_end); } diff --git a/sys/arch/vax/vax/pmap.c b/sys/arch/vax/vax/pmap.c index f882aa8bc0b..d3b7d0bf4fd 100644 --- a/sys/arch/vax/vax/pmap.c +++ b/sys/arch/vax/vax/pmap.c @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.160 2008/04/24 15:35:27 ad Exp $ */ +/* $NetBSD: pmap.c,v 1.161 2008/11/12 12:36:09 ad Exp $ */ /* * Copyright (c) 1994, 1998, 1999, 2003 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.160 2008/04/24 15:35:27 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.161 2008/11/12 12:36:09 ad Exp $"); #include "opt_ddb.h" #include "opt_cputype.h" @@ -237,8 +237,8 @@ calc_kvmsize(vsize_t usrptsize) #if VAX46 || VAX49 kvmsize += 0x800000; /* 8 MB framebuffer */ #endif -#ifdef LKM - /* LKMs are allocated out of kernel_map */ +#ifdef MODULAR + /* Modules are allocated out of kernel_map */ #define MAXLKMSIZ 0x100000 /* XXX */ kvmsize += MAXLKMSIZ; #endif diff --git a/sys/arch/x68k/conf/GENERIC b/sys/arch/x68k/conf/GENERIC index 75f543e010b..9819c5cb1f0 100644 --- a/sys/arch/x68k/conf/GENERIC +++ b/sys/arch/x68k/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.141 2008/08/10 15:31:22 tls Exp $ +# $NetBSD: GENERIC,v 1.142 2008/11/12 12:36:09 ad Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/x68k/conf/std.x68k" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.141 $" +#ident "GENERIC-$Revision: 1.142 $" maxusers 8 @@ -79,7 +79,6 @@ options SYSVSHM # System V shared memory options P1003_1B_SEMAPHORE # p1003.1b semaphore support ## Loadable kernel module support -#options LKM options USERCONF # userconf(4) support #options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/x68k/conf/INSTALL b/sys/arch/x68k/conf/INSTALL index 2ce788d48b5..4098c5e29fb 100644 --- a/sys/arch/x68k/conf/INSTALL +++ b/sys/arch/x68k/conf/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.80 2008/07/31 07:41:08 simonb Exp $ +# $NetBSD: INSTALL,v 1.81 2008/11/12 12:36:09 ad Exp $ # # INSTALL -- installation kernel. @@ -8,7 +8,7 @@ include "arch/x68k/conf/std.x68k" #options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "INSTALL-$Revision: 1.80 $" +#ident "INSTALL-$Revision: 1.81 $" makeoptions COPTS="-Os" # Optimise for space. Implies -O2 @@ -73,7 +73,6 @@ options RTC_OFFSET=-540 # hardware clock is this many mins. west of GMT #options SHMMAXPGS=1024 # 1024 pages is the default ## Loadable kernel module support -#options LKM options USERCONF # userconf(4) support options PIPE_SOCKETPAIR # smaller, but slower pipe(2) diff --git a/sys/arch/x68k/conf/majors.x68k b/sys/arch/x68k/conf/majors.x68k index cc5af2194e9..bb884e97b8d 100644 --- a/sys/arch/x68k/conf/majors.x68k +++ b/sys/arch/x68k/conf/majors.x68k @@ -1,4 +1,4 @@ -# $NetBSD: majors.x68k,v 1.19 2007/12/31 15:32:08 ad Exp $ +# $NetBSD: majors.x68k,v 1.20 2008/11/12 12:36:09 ad Exp $ # # Device majors for x68k # @@ -27,7 +27,6 @@ device-major st char 20 block 5 st device-major filedesc char 21 device-major bpf char 22 bpfilter device-major sram char 23 sram -device-major lkm char 24 lkm device-major tun char 31 tun device-major pow char 32 pow diff --git a/sys/arch/x68k/x68k/machdep.c b/sys/arch/x68k/x68k/machdep.c index a1255225dc7..41952db75f7 100644 --- a/sys/arch/x68k/x68k/machdep.c +++ b/sys/arch/x68k/x68k/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.151 2008/11/11 06:46:44 dyoung Exp $ */ +/* $NetBSD: machdep.c,v 1.152 2008/11/12 12:36:09 ad Exp $ */ /* * Copyright (c) 1982, 1986, 1990, 1993 @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.151 2008/11/11 06:46:44 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.152 2008/11/12 12:36:09 ad Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -115,7 +115,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.151 2008/11/11 06:46:44 dyoung Exp $") #include "ksyms.h" -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) #include <sys/exec_elf.h> #endif @@ -227,7 +227,7 @@ consinit(void) #ifdef KGDB zs_kgdb_init(); /* XXX */ #endif -#if NKSYMS || defined(DDB) || defined(LKM) +#if NKSYMS || defined(DDB) || defined(MODULAR) ksyms_init((int)esym - (int)&end - sizeof(Elf32_Ehdr), (void *)&end, esym); #endif diff --git a/sys/arch/x86/x86/powernow_k8.c b/sys/arch/x86/x86/powernow_k8.c index bd1a7a5902a..946a3f8c96c 100644 --- a/sys/arch/x86/x86/powernow_k8.c +++ b/sys/arch/x86/x86/powernow_k8.c @@ -1,4 +1,4 @@ -/* $NetBSD: powernow_k8.c,v 1.23 2008/05/11 23:05:45 cegger Exp $ */ +/* $NetBSD: powernow_k8.c,v 1.24 2008/11/12 12:36:09 ad Exp $ */ /* $OpenBSD: powernow-k8.c,v 1.8 2006/06/16 05:58:50 gwk Exp $ */ /*- @@ -59,7 +59,7 @@ /* AMD POWERNOW K8 driver */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: powernow_k8.c,v 1.23 2008/05/11 23:05:45 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: powernow_k8.c,v 1.24 2008/11/12 12:36:09 ad Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -84,7 +84,7 @@ __KERNEL_RCSID(0, "$NetBSD: powernow_k8.c,v 1.23 2008/05/11 23:05:45 cegger Exp mcb.msr_type = MSR_AMDK7_FIDVID_CTL; \ msr_cpu_broadcast(&mcb); -#ifdef _LKM +#ifdef _MODULE static struct sysctllog *sysctllog; #define SYSCTLLOG &sysctllog #else @@ -485,7 +485,7 @@ k8_powernow_init_main(void) void k8_powernow_destroy(void) { -#ifdef _LKM +#ifdef _MODULE sysctl_teardown(SYSCTLLOG); if (k8pnow_current_state) diff --git a/sys/arch/x86/x86/x86_machdep.c b/sys/arch/x86/x86/x86_machdep.c index 856dfe75997..e2032a1b9d9 100644 --- a/sys/arch/x86/x86/x86_machdep.c +++ b/sys/arch/x86/x86/x86_machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: x86_machdep.c,v 1.23 2008/05/09 21:25:43 joerg Exp $ */ +/* $NetBSD: x86_machdep.c,v 1.24 2008/11/12 12:36:09 ad Exp $ */ /*- * Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi, @@ -30,10 +30,8 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "opt_modular.h" - #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.23 2008/05/09 21:25:43 joerg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: x86_machdep.c,v 1.24 2008/11/12 12:36:09 ad Exp $"); #include <sys/types.h> #include <sys/param.h> diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC index 51d94d6bfbd..31f6e4fac22 100644 --- a/sys/arch/zaurus/conf/GENERIC +++ b/sys/arch/zaurus/conf/GENERIC @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.13 2008/08/10 15:31:22 tls Exp $ +# $NetBSD: GENERIC,v 1.14 2008/11/12 12:36:09 ad Exp $ # # GENERIC machine description file # @@ -109,7 +109,6 @@ options P1003_1B_SEMAPHORE # p1003.1b semaphore support # Miscellaneous kernel options #options KTRACE # system call tracing via ktrace(1) -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors #options MIIVERBOSE # Verbose MII autoconfuration messages diff --git a/sys/arch/zaurus/conf/GENERIC.HOSTUSB b/sys/arch/zaurus/conf/GENERIC.HOSTUSB index 91e6f897e36..4dcd25f8538 100644 --- a/sys/arch/zaurus/conf/GENERIC.HOSTUSB +++ b/sys/arch/zaurus/conf/GENERIC.HOSTUSB @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC.HOSTUSB,v 1.2 2008/07/31 07:41:08 simonb Exp $ +# $NetBSD: GENERIC.HOSTUSB,v 1.3 2008/11/12 12:36:09 ad Exp $ # # GENERIC machine description file # @@ -109,7 +109,6 @@ options P1003_1B_SEMAPHORE # p1003.1b semaphore support # Miscellaneous kernel options #options KTRACE # system call tracing via ktrace(1) -#options LKM # loadable kernel modules #options KMEMSTATS # kernel memory statistics #options SCSIVERBOSE # Verbose SCSI errors #options MIIVERBOSE # Verbose MII autoconfuration messages diff --git a/sys/arch/zaurus/conf/majors.zaurus b/sys/arch/zaurus/conf/majors.zaurus index bc852272450..3d3579ac4c4 100644 --- a/sys/arch/zaurus/conf/majors.zaurus +++ b/sys/arch/zaurus/conf/majors.zaurus @@ -1,4 +1,4 @@ -# $NetBSD: majors.zaurus,v 1.2 2007/12/31 15:32:09 ad Exp $ +# $NetBSD: majors.zaurus,v 1.3 2008/11/12 12:36:09 ad Exp $ # # Device majors for zaurus # @@ -37,7 +37,6 @@ device-major ses char 30 ses device-major bpf char 32 bpfilter device-major tun char 33 tun device-major filedesc char 34 -device-major lkm char 35 lkm device-major audio char 36 audio device-major vidcconsole char 37 vidcconsole diff --git a/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c b/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c index d2f8e782e40..a66041a8116 100644 --- a/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c +++ b/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c @@ -1,4 +1,4 @@ -/* $NetBSD: zbsdmod.c,v 1.2 2008/04/11 16:43:49 nonaka Exp $ */ +/* $NetBSD: zbsdmod.c,v 1.3 2008/11/12 12:36:09 ad Exp $ */ /* $OpenBSD: zbsdmod.c,v 1.7 2005/05/02 02:45:29 uwe Exp $ */ /* @@ -264,7 +264,7 @@ elf32bsdboot(void) } /* - * Initialize the LKM. + * Initialize the module. */ int init_module(void) |
