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/sun2 | |
| parent | 0f81d3e0a26c2833cd085c472a4a77c325486b75 (diff) | |
Remove LKMs and switch to the module framework, pass 1.
Proposed on tech-kern@.
Diffstat (limited to 'sys/arch/sun2')
| -rw-r--r-- | sys/arch/sun2/conf/DISKLESS | 5 | ||||
| -rw-r--r-- | sys/arch/sun2/conf/FOURMEG | 5 | ||||
| -rw-r--r-- | sys/arch/sun2/conf/GENERIC | 5 | ||||
| -rw-r--r-- | sys/arch/sun2/conf/INSTALL | 5 | ||||
| -rw-r--r-- | sys/arch/sun2/conf/RAMDISK | 3 | ||||
| -rw-r--r-- | sys/arch/sun2/conf/VME | 5 | ||||
| -rw-r--r-- | sys/arch/sun2/conf/majors.sun2 | 3 | ||||
| -rw-r--r-- | sys/arch/sun2/sun2/locore2.c | 8 | ||||
| -rw-r--r-- | sys/arch/sun2/sun2/machdep.c | 6 |
9 files changed, 19 insertions, 26 deletions
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; |
