Module Name: src
Committed By: jnemeth
Date: Sun Aug 24 07:59:23 UTC 2014
Modified Files:
src/share/man/man4: options.4
src/sys/arch/amd64/conf: ALL GENERIC
src/sys/arch/dreamcast/conf: GENERIC
src/sys/arch/epoc32/conf: GENERIC
src/sys/arch/evbarm/conf: BCM5301X BCM56340 IMX23_OLINUXINO std.beagle
std.cubie std.kobo std.netwalker std.odroid std.rpi
src/sys/arch/evbppc/conf: P2020DS RB800 TWRP1025
src/sys/arch/hp300/conf: GENERIC
src/sys/arch/hpcsh/conf: GENERIC
src/sys/arch/i386/conf: GENERIC MONOLITHIC
src/sys/arch/landisk/conf: GENERIC
src/sys/arch/luna68k/conf: GENERIC
src/sys/arch/macppc/conf: GENERIC GENERIC_601
src/sys/arch/mmeye/conf: MMEYE_WLF
src/sys/arch/news68k/conf: GENERIC
src/sys/arch/sandpoint/conf: GENERIC
src/sys/arch/shark/conf: GENERIC
src/sys/arch/sparc/conf: GENERIC
src/sys/arch/sparc64/conf: GENERIC
src/sys/arch/sun3/conf: GENERIC GENERIC3X
src/sys/arch/x68k/conf: GENERIC
src/sys/arch/zaurus/conf: GENERIC
src/sys/conf: files
src/sys/kern: kern_module.c
Log Message:
Create an "options MODULAR_DEFAULT_AUTOLOAD" config option and add
it to all kernel configs that contain "options MODULAR". This
option turns on module autoloading by default (which is the current
default). This allows people who don't want module autoloading on
by default to disable it by simply removing/commentting this line.
To generate a diff of this commit:
cvs rdiff -u -r1.441 -r1.442 src/share/man/man4/options.4
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.395 -r1.396 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/dreamcast/conf/GENERIC
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/epoc32/conf/GENERIC
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/conf/BCM5301X
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/BCM56340 \
src/sys/arch/evbarm/conf/IMX23_OLINUXINO
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/std.beagle
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/std.cubie \
src/sys/arch/evbarm/conf/std.odroid
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/std.kobo
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/std.netwalker
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbarm/conf/std.rpi
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/evbppc/conf/P2020DS
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbppc/conf/RB800
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbppc/conf/TWRP1025
cvs rdiff -u -r1.186 -r1.187 src/sys/arch/hp300/conf/GENERIC
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/hpcsh/conf/GENERIC
cvs rdiff -u -r1.1110 -r1.1111 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/i386/conf/MONOLITHIC
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/landisk/conf/GENERIC
cvs rdiff -u -r1.116 -r1.117 src/sys/arch/luna68k/conf/GENERIC
cvs rdiff -u -r1.315 -r1.316 src/sys/arch/macppc/conf/GENERIC
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/macppc/conf/GENERIC_601
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/mmeye/conf/MMEYE_WLF
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/news68k/conf/GENERIC
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/sandpoint/conf/GENERIC
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/shark/conf/GENERIC
cvs rdiff -u -r1.245 -r1.246 src/sys/arch/sparc/conf/GENERIC
cvs rdiff -u -r1.173 -r1.174 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.168 -r1.169 src/sys/arch/sun3/conf/GENERIC
cvs rdiff -u -r1.124 -r1.125 src/sys/arch/sun3/conf/GENERIC3X
cvs rdiff -u -r1.176 -r1.177 src/sys/arch/x68k/conf/GENERIC
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/zaurus/conf/GENERIC
cvs rdiff -u -r1.1098 -r1.1099 src/sys/conf/files
cvs rdiff -u -r1.97 -r1.98 src/sys/kern/kern_module.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/options.4
diff -u src/share/man/man4/options.4:1.441 src/share/man/man4/options.4:1.442
--- src/share/man/man4/options.4:1.441 Thu Aug 21 07:51:32 2014
+++ src/share/man/man4/options.4 Sun Aug 24 07:59:22 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: options.4,v 1.441 2014/08/21 07:51:32 apb Exp $
+.\" $NetBSD: options.4,v 1.442 2014/08/24 07:59:22 jnemeth Exp $
.\"
.\" Copyright (c) 1996
.\" Perry E. Metzger. All rights reserved.
@@ -30,7 +30,7 @@
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
.\"
-.Dd August 16, 2014
+.Dd August 23, 2014
.Dt OPTIONS 4
.Os
.Sh NAME
@@ -1231,6 +1231,12 @@ Possible values include
.It Cd options MODULAR
Enables the framework for kernel modules (see
.Xr module 7 ) .
+.It Cd options MODULAR_DEFAULT_AUTOLOAD
+Enables the autoloading of kernel modules by default.
+This sets the default value of the
+.Em kern.module.autoload
+.Xr sysctl 3
+variable which may be changed at run time.
.It Cd options VND_COMPRESSION
Enables the
.Xr vnd 4
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.17 src/sys/arch/amd64/conf/ALL:1.18
--- src/sys/arch/amd64/conf/ALL:1.17 Sat Aug 23 21:05:39 2014
+++ src/sys/arch/amd64/conf/ALL Sun Aug 24 07:59:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.17 2014/08/23 21:05:39 dholland Exp $
+# $NetBSD: ALL,v 1.18 2014/08/24 07:59:22 jnemeth 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/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.17 $"
+#ident "ALL-$Revision: 1.18 $"
maxusers 64 # estimated number of users
@@ -90,6 +90,7 @@ options SEMMNU=30 # number of undo stru
options SYSVSHM # System V-like memory sharing
options MODULAR # new style module(7) framework
+options MODULAR_DEFAULT_AUTOLOAD
options USERCONF # userconf(4) support
options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.395 src/sys/arch/amd64/conf/GENERIC:1.396
--- src/sys/arch/amd64/conf/GENERIC:1.395 Sat Aug 23 20:26:56 2014
+++ src/sys/arch/amd64/conf/GENERIC Sun Aug 24 07:59:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.395 2014/08/23 20:26:56 dholland Exp $
+# $NetBSD: GENERIC,v 1.396 2014/08/24 07:59:22 jnemeth 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.395 $"
+#ident "GENERIC-$Revision: 1.396 $"
maxusers 64 # estimated number of users
@@ -68,6 +68,7 @@ options SYSVSEM # System V-like semaph
options SYSVSHM # System V-like memory sharing
options MODULAR # new style module(7) framework
+options MODULAR_DEFAULT_AUTOLOAD
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
Index: src/sys/arch/dreamcast/conf/GENERIC
diff -u src/sys/arch/dreamcast/conf/GENERIC:1.118 src/sys/arch/dreamcast/conf/GENERIC:1.119
--- src/sys/arch/dreamcast/conf/GENERIC:1.118 Sat Aug 23 20:26:57 2014
+++ src/sys/arch/dreamcast/conf/GENERIC Sun Aug 24 07:59:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.118 2014/08/23 20:26:57 dholland Exp $
+# $NetBSD: GENERIC,v 1.119 2014/08/24 07:59:22 jnemeth Exp $
#
# GENERIC machine description file
#
@@ -42,6 +42,7 @@ options SYSVSEM # System V-like semaph
options SYSVSHM # System V-like memory sharing
#options MODULAR # new style module(7) framework
+#options MODULAR_DEFAULT_AUTOLOAD
# Diagnostic/debugging support options
#options DIAGNOSTIC # cheap kernel consistency checks
Index: src/sys/arch/epoc32/conf/GENERIC
diff -u src/sys/arch/epoc32/conf/GENERIC:1.5 src/sys/arch/epoc32/conf/GENERIC:1.6
--- src/sys/arch/epoc32/conf/GENERIC:1.5 Sat Aug 23 20:26:57 2014
+++ src/sys/arch/epoc32/conf/GENERIC Sun Aug 24 07:59:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.5 2014/08/23 20:26:57 dholland Exp $
+# $NetBSD: GENERIC,v 1.6 2014/08/24 07:59:22 jnemeth Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@ include "arch/epoc32/conf/std.epoc32"
#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
@@ -91,6 +91,7 @@ options COMPAT_BSDPTY # /dev/[pt]ty?? p
# Loadable kernel module support
#options MODULAR # new style module(7) framework
+#options MODULAR_DEFAULT_AUTOLOAD
#
# wscons options
Index: src/sys/arch/evbarm/conf/BCM5301X
diff -u src/sys/arch/evbarm/conf/BCM5301X:1.23 src/sys/arch/evbarm/conf/BCM5301X:1.24
--- src/sys/arch/evbarm/conf/BCM5301X:1.23 Sat Aug 23 20:26:57 2014
+++ src/sys/arch/evbarm/conf/BCM5301X Sun Aug 24 07:59:22 2014
@@ -1,5 +1,5 @@
#
-# $NetBSD: BCM5301X,v 1.23 2014/08/23 20:26:57 dholland Exp $
+# $NetBSD: BCM5301X,v 1.24 2014/08/24 07:59:22 jnemeth Exp $
#
# BCM5301X -- Broadcom BCM5301X Eval Board Kernel
#
@@ -127,6 +127,7 @@ options DKWEDGE_METHOD_GPT # Supports G
# Miscellaneous kernel options
options MODULAR # support dynamically loaded kernel modules
+options MODULAR_DEFAULT_AUTOLOAD
options KTRACE # system call tracing, a la ktrace(1)
#options KMEMSTATS # kernel memory statistics
options PCIVERBOSE # Verbose PCI autoconfiguration messages
Index: src/sys/arch/evbarm/conf/BCM56340
diff -u src/sys/arch/evbarm/conf/BCM56340:1.8 src/sys/arch/evbarm/conf/BCM56340:1.9
--- src/sys/arch/evbarm/conf/BCM56340:1.8 Sat Aug 23 20:26:57 2014
+++ src/sys/arch/evbarm/conf/BCM56340 Sun Aug 24 07:59:22 2014
@@ -1,5 +1,5 @@
#
-# $NetBSD: BCM56340,v 1.8 2014/08/23 20:26:57 dholland Exp $
+# $NetBSD: BCM56340,v 1.9 2014/08/24 07:59:22 jnemeth Exp $
#
# BCM5301X -- Broadcom BCM5301X Eval Board Kernel
#
@@ -127,6 +127,7 @@ options DKWEDGE_METHOD_GPT # Supports G
# Miscellaneous kernel options
options MODULAR # support dynamically loaded kernel modules
+options MODULAR_DEFAULT_AUTOLOAD
options KTRACE # system call tracing, a la ktrace(1)
#options KMEMSTATS # kernel memory statistics
options PCIVERBOSE # Verbose PCI autoconfiguration messages
Index: src/sys/arch/evbarm/conf/IMX23_OLINUXINO
diff -u src/sys/arch/evbarm/conf/IMX23_OLINUXINO:1.8 src/sys/arch/evbarm/conf/IMX23_OLINUXINO:1.9
--- src/sys/arch/evbarm/conf/IMX23_OLINUXINO:1.8 Sat Aug 23 20:26:57 2014
+++ src/sys/arch/evbarm/conf/IMX23_OLINUXINO Sun Aug 24 07:59:22 2014
@@ -1,4 +1,4 @@
-# $Id: IMX23_OLINUXINO,v 1.8 2014/08/23 20:26:57 dholland Exp $
+# $Id: IMX23_OLINUXINO,v 1.9 2014/08/24 07:59:22 jnemeth Exp $
#
# IMX23_OLINUXINO -- Olimex i.MX23 OLinuXino kernel configuration file.
#
@@ -97,6 +97,7 @@ options SYSVSEM # System V-like semaph
options SYSVSHM # System V-like memory sharing
#options MODULAR
+#options MODULAR_DEFAULT_AUTOLOAD
options KTRACE
#options DEBUG
#options DIAGNOSTIC
Index: src/sys/arch/evbarm/conf/std.beagle
diff -u src/sys/arch/evbarm/conf/std.beagle:1.12 src/sys/arch/evbarm/conf/std.beagle:1.13
--- src/sys/arch/evbarm/conf/std.beagle:1.12 Fri Nov 1 18:41:06 2013
+++ src/sys/arch/evbarm/conf/std.beagle Sun Aug 24 07:59:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: std.beagle,v 1.12 2013/11/01 18:41:06 skrll Exp $
+# $NetBSD: std.beagle,v 1.13 2014/08/24 07:59:22 jnemeth Exp $
#
# standard NetBSD/evbarm for BEAGLEBOARD options
@@ -10,6 +10,7 @@ include "arch/evbarm/conf/files.beagle"
# To support easy transit to ../arch/arm/arm32
options MODULAR
+options MODULAR_DEFAULT_AUTOLOAD
options __HAVE_CPU_COUNTER
options CORTEX_PMC
options __HAVE_FAST_SOFTINTS # should be in types.h
Index: src/sys/arch/evbarm/conf/std.cubie
diff -u src/sys/arch/evbarm/conf/std.cubie:1.3 src/sys/arch/evbarm/conf/std.cubie:1.4
--- src/sys/arch/evbarm/conf/std.cubie:1.3 Thu Feb 27 16:00:32 2014
+++ src/sys/arch/evbarm/conf/std.cubie Sun Aug 24 07:59:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: std.cubie,v 1.3 2014/02/27 16:00:32 reinoud Exp $
+# $NetBSD: std.cubie,v 1.4 2014/08/24 07:59:22 jnemeth Exp $
#
# standard NetBSD/evbarm for CUBIEBOARD options
@@ -10,6 +10,7 @@ include "arch/evbarm/conf/files.cubie"
# To support easy transit to ../arch/arm/arm32
options MODULAR
+options MODULAR_DEFAULT_AUTOLOAD
options __HAVE_CPU_COUNTER
options CORTEX_PMC
options __HAVE_FAST_SOFTINTS # should be in types.h
Index: src/sys/arch/evbarm/conf/std.odroid
diff -u src/sys/arch/evbarm/conf/std.odroid:1.3 src/sys/arch/evbarm/conf/std.odroid:1.4
--- src/sys/arch/evbarm/conf/std.odroid:1.3 Thu Aug 14 12:48:52 2014
+++ src/sys/arch/evbarm/conf/std.odroid Sun Aug 24 07:59:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: std.odroid,v 1.3 2014/08/14 12:48:52 reinoud Exp $
+# $NetBSD: std.odroid,v 1.4 2014/08/24 07:59:22 jnemeth Exp $
#
# standard NetBSD/evbarm for ODROID options
@@ -12,6 +12,7 @@ include "arch/evbarm/conf/files.odroid"
# To support easy transit to ../arch/arm/arm32
options MODULAR
+options MODULAR_DEFAULT_AUTOLOAD
options ARM_HAS_VBAR
options CORTEX_PMC
options __HAVE_CPU_COUNTER
Index: src/sys/arch/evbarm/conf/std.kobo
diff -u src/sys/arch/evbarm/conf/std.kobo:1.1 src/sys/arch/evbarm/conf/std.kobo:1.2
--- src/sys/arch/evbarm/conf/std.kobo:1.1 Fri Jul 25 11:22:50 2014
+++ src/sys/arch/evbarm/conf/std.kobo Sun Aug 24 07:59:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: std.kobo,v 1.1 2014/07/25 11:22:50 hkenken Exp $
+# $NetBSD: std.kobo,v 1.2 2014/08/24 07:59:22 jnemeth Exp $
#
# standard NetBSD/evbarm options for Kobo
@@ -9,6 +9,7 @@ include "arch/evbarm/conf/std.evbarm"
include "arch/evbarm/conf/files.kobo"
options MODULAR
+options MODULAR_DEFAULT_AUTOLOAD
options __HAVE_FAST_SOFTINTS # should be in types.h
options __HAVE_CPU_COUNTER
options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
Index: src/sys/arch/evbarm/conf/std.netwalker
diff -u src/sys/arch/evbarm/conf/std.netwalker:1.9 src/sys/arch/evbarm/conf/std.netwalker:1.10
--- src/sys/arch/evbarm/conf/std.netwalker:1.9 Wed Apr 9 04:00:50 2014
+++ src/sys/arch/evbarm/conf/std.netwalker Sun Aug 24 07:59:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: std.netwalker,v 1.9 2014/04/09 04:00:50 hkenken Exp $
+# $NetBSD: std.netwalker,v 1.10 2014/08/24 07:59:22 jnemeth Exp $
#
# standard NetBSD/evbarm options for Sharp NetWalker
@@ -9,6 +9,7 @@ include "arch/evbarm/conf/std.evbarm"
include "arch/evbarm/conf/files.netwalker"
options MODULAR
+options MODULAR_DEFAULT_AUTOLOAD
options __HAVE_FAST_SOFTINTS # should be in types.h
options __HAVE_CPU_COUNTER
options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
Index: src/sys/arch/evbarm/conf/std.rpi
diff -u src/sys/arch/evbarm/conf/std.rpi:1.14 src/sys/arch/evbarm/conf/std.rpi:1.15
--- src/sys/arch/evbarm/conf/std.rpi:1.14 Sun Apr 6 12:43:18 2014
+++ src/sys/arch/evbarm/conf/std.rpi Sun Aug 24 07:59:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: std.rpi,v 1.14 2014/04/06 12:43:18 skrll Exp $
+# $NetBSD: std.rpi,v 1.15 2014/08/24 07:59:22 jnemeth Exp $
#
# standard NetBSD/evbarm for Raspberry Pi options
@@ -9,6 +9,7 @@ include "arch/evbarm/conf/std.evbarm"
include "arch/evbarm/conf/files.rpi"
options MODULAR
+options MODULAR_DEFAULT_AUTOLOAD
options ARM11_COMPAT_MMU
options __HAVE_CPU_COUNTER
options __HAVE_FAST_SOFTINTS # should be in types.h
Index: src/sys/arch/evbppc/conf/P2020DS
diff -u src/sys/arch/evbppc/conf/P2020DS:1.24 src/sys/arch/evbppc/conf/P2020DS:1.25
--- src/sys/arch/evbppc/conf/P2020DS:1.24 Sat Aug 23 20:26:57 2014
+++ src/sys/arch/evbppc/conf/P2020DS Sun Aug 24 07:59:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: P2020DS,v 1.24 2014/08/23 20:26:57 dholland Exp $
+# $NetBSD: P2020DS,v 1.25 2014/08/24 07:59:22 jnemeth Exp $
#
# P2020DS -- everything that's currently supported
#
@@ -8,7 +8,7 @@ include "arch/evbppc/conf/std.mpc85xx"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "P2020DS-$Revision: 1.24 $"
+ident "P2020DS-$Revision: 1.25 $"
maxusers 32
@@ -30,6 +30,7 @@ options INSECURE # disable kernel secur
#options NTP # NTP phase/frequency locked loop
options KTRACE # system call tracing via ktrace(1)
options MODULAR # new style module(7) framework
+options MODULAR_DEFAULT_AUTOLOAD
options SYSVMSG # System V message queues
options SYSVSEM # System V semaphores
Index: src/sys/arch/evbppc/conf/RB800
diff -u src/sys/arch/evbppc/conf/RB800:1.29 src/sys/arch/evbppc/conf/RB800:1.30
--- src/sys/arch/evbppc/conf/RB800:1.29 Sat Aug 23 20:26:57 2014
+++ src/sys/arch/evbppc/conf/RB800 Sun Aug 24 07:59:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: RB800,v 1.29 2014/08/23 20:26:57 dholland Exp $
+# $NetBSD: RB800,v 1.30 2014/08/24 07:59:22 jnemeth Exp $
#
# RB800 -- everything that's currently supported
#
@@ -7,7 +7,7 @@ include "arch/evbppc/conf/std.mpc85xx"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "RB800-$Revision: 1.29 $"
+ident "RB800-$Revision: 1.30 $"
maxusers 32
@@ -30,6 +30,7 @@ options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
options MODULAR # new style module(7) framework
+options MODULAR_DEFAULT_AUTOLOAD
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: src/sys/arch/evbppc/conf/TWRP1025
diff -u src/sys/arch/evbppc/conf/TWRP1025:1.17 src/sys/arch/evbppc/conf/TWRP1025:1.18
--- src/sys/arch/evbppc/conf/TWRP1025:1.17 Sat Aug 23 20:26:57 2014
+++ src/sys/arch/evbppc/conf/TWRP1025 Sun Aug 24 07:59:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: TWRP1025,v 1.17 2014/08/23 20:26:57 dholland Exp $
+# $NetBSD: TWRP1025,v 1.18 2014/08/24 07:59:22 jnemeth Exp $
#
# TWRP1025 -- everything that's currently supported
#
@@ -7,7 +7,7 @@ include "arch/evbppc/conf/std.mpc85xx"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "TWRP1025-$Revision: 1.17 $"
+ident "TWRP1025-$Revision: 1.18 $"
maxusers 32
@@ -25,6 +25,7 @@ options SYS_CLK=66666667
#options NTP # NTP phase/frequency locked loop
options KTRACE # system call tracing via ktrace(1)
options MODULAR # new style module(7) framework
+options MODULAR_DEFAULT_AUTOLOAD
options SYSVMSG # System V message queues
options SYSVSEM # System V semaphores
Index: src/sys/arch/hp300/conf/GENERIC
diff -u src/sys/arch/hp300/conf/GENERIC:1.186 src/sys/arch/hp300/conf/GENERIC:1.187
--- src/sys/arch/hp300/conf/GENERIC:1.186 Sat Aug 23 20:26:58 2014
+++ src/sys/arch/hp300/conf/GENERIC Sun Aug 24 07:59:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.186 2014/08/23 20:26:58 dholland Exp $
+# $NetBSD: GENERIC,v 1.187 2014/08/24 07:59:22 jnemeth 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.186 $"
+#ident "GENERIC-$Revision: 1.187 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -60,6 +60,7 @@ options SYSVMSG # System V-style messa
options SYSVSEM # System V-style semaphores
options MODULAR # new style module(7) framework
+options MODULAR_DEFAULT_AUTOLOAD
# 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.
Index: src/sys/arch/hpcsh/conf/GENERIC
diff -u src/sys/arch/hpcsh/conf/GENERIC:1.103 src/sys/arch/hpcsh/conf/GENERIC:1.104
--- src/sys/arch/hpcsh/conf/GENERIC:1.103 Sat Aug 23 20:26:58 2014
+++ src/sys/arch/hpcsh/conf/GENERIC Sun Aug 24 07:59:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.103 2014/08/23 20:26:58 dholland Exp $
+# $NetBSD: GENERIC,v 1.104 2014/08/24 07:59:22 jnemeth Exp $
#
# GENERIC machine description file
#
@@ -73,6 +73,7 @@ options SYSVSEM # System V-like semaph
options SYSVSHM # System V-like memory sharing
#options MODULAR # new style module(7) framework
+#options MODULAR_DEFAULT_AUTOLOAD
options USERCONF # userconf(4) support
options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1110 src/sys/arch/i386/conf/GENERIC:1.1111
--- src/sys/arch/i386/conf/GENERIC:1.1110 Sat Aug 23 20:26:58 2014
+++ src/sys/arch/i386/conf/GENERIC Sun Aug 24 07:59:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1110 2014/08/23 20:26:58 dholland Exp $
+# $NetBSD: GENERIC,v 1.1111 2014/08/24 07:59:22 jnemeth 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.1110 $"
+#ident "GENERIC-$Revision: 1.1111 $"
maxusers 64 # estimated number of users
@@ -89,6 +89,7 @@ options SYSVSEM # System V-like semaph
options SYSVSHM # System V-like memory sharing
options MODULAR # new style module(7) framework
+options MODULAR_DEFAULT_AUTOLOAD
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: src/sys/arch/i386/conf/MONOLITHIC
diff -u src/sys/arch/i386/conf/MONOLITHIC:1.16 src/sys/arch/i386/conf/MONOLITHIC:1.17
--- src/sys/arch/i386/conf/MONOLITHIC:1.16 Tue Aug 9 14:18:17 2011
+++ src/sys/arch/i386/conf/MONOLITHIC Sun Aug 24 07:59:22 2014
@@ -1,7 +1,8 @@
-# $NetBSD: MONOLITHIC,v 1.16 2011/08/09 14:18:17 jakllsch Exp $
+# $NetBSD: MONOLITHIC,v 1.17 2014/08/24 07:59:22 jnemeth Exp $
#
# Non MODULAR
#
include "arch/i386/conf/GENERIC"
no options MODULAR
+no options MODULAR_DEFAULT_AUTOLOAD
Index: src/sys/arch/landisk/conf/GENERIC
diff -u src/sys/arch/landisk/conf/GENERIC:1.42 src/sys/arch/landisk/conf/GENERIC:1.43
--- src/sys/arch/landisk/conf/GENERIC:1.42 Sat Aug 23 20:26:58 2014
+++ src/sys/arch/landisk/conf/GENERIC Sun Aug 24 07:59:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.42 2014/08/23 20:26:58 dholland Exp $
+# $NetBSD: GENERIC,v 1.43 2014/08/24 07:59:22 jnemeth 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.42 $"
+#ident "GENERIC-$Revision: 1.43 $"
maxusers 16 # estimated number of users
@@ -59,6 +59,7 @@ options SYSVSEM # System V-like semaph
options SYSVSHM # System V-like memory sharing
#options MODULAR # new style module(7) framework
+#options MODULAR_DEFAULT_AUTOLOAD
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: src/sys/arch/luna68k/conf/GENERIC
diff -u src/sys/arch/luna68k/conf/GENERIC:1.116 src/sys/arch/luna68k/conf/GENERIC:1.117
--- src/sys/arch/luna68k/conf/GENERIC:1.116 Sat Aug 23 20:26:58 2014
+++ src/sys/arch/luna68k/conf/GENERIC Sun Aug 24 07:59:22 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.116 2014/08/23 20:26:58 dholland Exp $
+# $NetBSD: GENERIC,v 1.117 2014/08/24 07:59:22 jnemeth 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.116 $"
+#ident "GENERIC-$Revision: 1.117 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -42,6 +42,7 @@ options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
options MODULAR # new style module(7) framework
+options MODULAR_DEFAULT_AUTOLOAD
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: src/sys/arch/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.315 src/sys/arch/macppc/conf/GENERIC:1.316
--- src/sys/arch/macppc/conf/GENERIC:1.315 Sat Aug 23 20:26:58 2014
+++ src/sys/arch/macppc/conf/GENERIC Sun Aug 24 07:59:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.315 2014/08/23 20:26:58 dholland Exp $
+# $NetBSD: GENERIC,v 1.316 2014/08/24 07:59:23 jnemeth 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.315 $"
+#ident "GENERIC-$Revision: 1.316 $"
maxusers 32
@@ -40,6 +40,7 @@ options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
options MODULAR # new style module(7) framework
+options MODULAR_DEFAULT_AUTOLOAD
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: src/sys/arch/macppc/conf/GENERIC_601
diff -u src/sys/arch/macppc/conf/GENERIC_601:1.4 src/sys/arch/macppc/conf/GENERIC_601:1.5
--- src/sys/arch/macppc/conf/GENERIC_601:1.4 Sat Aug 23 20:26:58 2014
+++ src/sys/arch/macppc/conf/GENERIC_601 Sun Aug 24 07:59:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_601,v 1.4 2014/08/23 20:26:58 dholland Exp $
+# $NetBSD: GENERIC_601,v 1.5 2014/08/24 07:59:23 jnemeth Exp $
#
# GENERIC machine description file
#
@@ -28,7 +28,7 @@ include "arch/macppc/conf/std.macppc.60
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "GENERIC-$Revision: 1.4 $"
+ident "GENERIC-$Revision: 1.5 $"
maxusers 32
@@ -44,6 +44,7 @@ options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
options MODULAR # new style module(7) framework
+options MODULAR_DEFAULT_AUTOLOAD
#options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: src/sys/arch/mmeye/conf/MMEYE_WLF
diff -u src/sys/arch/mmeye/conf/MMEYE_WLF:1.15 src/sys/arch/mmeye/conf/MMEYE_WLF:1.16
--- src/sys/arch/mmeye/conf/MMEYE_WLF:1.15 Sat Aug 23 20:26:58 2014
+++ src/sys/arch/mmeye/conf/MMEYE_WLF Sun Aug 24 07:59:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: MMEYE_WLF,v 1.15 2014/08/23 20:26:58 dholland Exp $
+# $NetBSD: MMEYE_WLF,v 1.16 2014/08/24 07:59:23 jnemeth Exp $
#
# MMEYE_WLF -- Brains Inc. MMEYE-WLF platforms kernel
#
@@ -22,7 +22,7 @@ include "arch/mmeye/conf/std.mmeye"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.15 $"
+#ident "GENERIC-$Revision: 1.16 $"
maxusers 16 # estimated number of users
@@ -50,6 +50,7 @@ options SYSVSEM # System V-like semaph
options SYSVSHM # System V-like memory sharing
options MODULAR # new style module(7) framework
+options MODULAR_DEFAULT_AUTOLOAD
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: src/sys/arch/news68k/conf/GENERIC
diff -u src/sys/arch/news68k/conf/GENERIC:1.122 src/sys/arch/news68k/conf/GENERIC:1.123
--- src/sys/arch/news68k/conf/GENERIC:1.122 Sat Aug 23 20:26:59 2014
+++ src/sys/arch/news68k/conf/GENERIC Sun Aug 24 07:59:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.122 2014/08/23 20:26:59 dholland Exp $
+# $NetBSD: GENERIC,v 1.123 2014/08/24 07:59:23 jnemeth 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.122 $"
+#ident "GENERIC-$Revision: 1.123 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -41,6 +41,7 @@ options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
options MODULAR # new style module(7) framework
+options MODULAR_DEFAULT_AUTOLOAD
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: src/sys/arch/sandpoint/conf/GENERIC
diff -u src/sys/arch/sandpoint/conf/GENERIC:1.84 src/sys/arch/sandpoint/conf/GENERIC:1.85
--- src/sys/arch/sandpoint/conf/GENERIC:1.84 Sat Aug 23 20:26:59 2014
+++ src/sys/arch/sandpoint/conf/GENERIC Sun Aug 24 07:59:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.84 2014/08/23 20:26:59 dholland Exp $
+# $NetBSD: GENERIC,v 1.85 2014/08/24 07:59:23 jnemeth Exp $
#
# machine description file for GENERIC NAS
#
@@ -22,7 +22,7 @@ include "arch/sandpoint/conf/std.sandpo
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.84 $"
+#ident "GENERIC-$Revision: 1.85 $"
maxusers 32
@@ -39,6 +39,7 @@ options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
#options MODULAR # module(7) support
+#options MODULAR_DEFAULT_AUTOLOAD
#options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: src/sys/arch/shark/conf/GENERIC
diff -u src/sys/arch/shark/conf/GENERIC:1.118 src/sys/arch/shark/conf/GENERIC:1.119
--- src/sys/arch/shark/conf/GENERIC:1.118 Sat Aug 23 20:26:59 2014
+++ src/sys/arch/shark/conf/GENERIC Sun Aug 24 07:59:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.118 2014/08/23 20:26:59 dholland Exp $
+# $NetBSD: GENERIC,v 1.119 2014/08/24 07:59:23 jnemeth 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.118 $"
+#ident "GENERIC-$Revision: 1.119 $"
# estimated number of users
maxusers 32
@@ -147,6 +147,7 @@ options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
options SYSCTL_INCLUDE_DESCR # Include sysctl descriptions in kernel
options MODULAR # new style module(7) framework
+options MODULAR_DEFAULT_AUTOLOAD
# Development and Debugging options
Index: src/sys/arch/sparc/conf/GENERIC
diff -u src/sys/arch/sparc/conf/GENERIC:1.245 src/sys/arch/sparc/conf/GENERIC:1.246
--- src/sys/arch/sparc/conf/GENERIC:1.245 Sat Aug 23 20:26:59 2014
+++ src/sys/arch/sparc/conf/GENERIC Sun Aug 24 07:59:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.245 2014/08/23 20:26:59 dholland Exp $
+# $NetBSD: GENERIC,v 1.246 2014/08/24 07:59:23 jnemeth 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.245 $"
+#ident "GENERIC-$Revision: 1.246 $"
maxusers 32
@@ -92,6 +92,7 @@ options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
options MODULAR # new style module(7) framework
+options MODULAR_DEFAULT_AUTOLOAD
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.173 src/sys/arch/sparc64/conf/GENERIC:1.174
--- src/sys/arch/sparc64/conf/GENERIC:1.173 Sat Aug 23 20:27:00 2014
+++ src/sys/arch/sparc64/conf/GENERIC Sun Aug 24 07:59:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.173 2014/08/23 20:27:00 dholland Exp $
+# $NetBSD: GENERIC,v 1.174 2014/08/24 07:59:23 jnemeth 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.173 $"
+#ident "GENERIC-$Revision: 1.174 $"
maxusers 64
@@ -62,6 +62,7 @@ options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
options MODULAR # new style module(7) framework
+options MODULAR_DEFAULT_AUTOLOAD
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: src/sys/arch/sun3/conf/GENERIC
diff -u src/sys/arch/sun3/conf/GENERIC:1.168 src/sys/arch/sun3/conf/GENERIC:1.169
--- src/sys/arch/sun3/conf/GENERIC:1.168 Sat Aug 23 20:27:00 2014
+++ src/sys/arch/sun3/conf/GENERIC Sun Aug 24 07:59:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.168 2014/08/23 20:27:00 dholland Exp $
+# $NetBSD: GENERIC,v 1.169 2014/08/24 07:59:23 jnemeth 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.168 $"
+#ident "GENERIC-$Revision: 1.169 $"
makeoptions COPTS="-Os" # bootloader has size limit (~2MB)
@@ -43,6 +43,7 @@ options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
#options MODULAR # new style module(7) framework
+#options MODULAR_DEFAULT_AUTOLOAD
#options INSECURE # disable kernel security level
#options USERCONF # userconf(4) support
Index: src/sys/arch/sun3/conf/GENERIC3X
diff -u src/sys/arch/sun3/conf/GENERIC3X:1.124 src/sys/arch/sun3/conf/GENERIC3X:1.125
--- src/sys/arch/sun3/conf/GENERIC3X:1.124 Sat Aug 23 20:27:00 2014
+++ src/sys/arch/sun3/conf/GENERIC3X Sun Aug 24 07:59:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC3X,v 1.124 2014/08/23 20:27:00 dholland Exp $
+# $NetBSD: GENERIC3X,v 1.125 2014/08/24 07:59:23 jnemeth 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.124 $"
+#ident "GENERIC3X-$Revision: 1.125 $"
makeoptions COPTS="-Os" # bootloader has size limit (~2MB)
@@ -25,6 +25,7 @@ options SYSVSEM # System V semaphores
options SYSVSHM # System V shared memory
#options MODULAR # new style module(7) framework
+#options MODULAR_DEFAULT_AUTOLOAD
#options INSECURE # disable kernel security level
#options USERCONF # userconf(4) support
Index: src/sys/arch/x68k/conf/GENERIC
diff -u src/sys/arch/x68k/conf/GENERIC:1.176 src/sys/arch/x68k/conf/GENERIC:1.177
--- src/sys/arch/x68k/conf/GENERIC:1.176 Sat Aug 23 20:27:00 2014
+++ src/sys/arch/x68k/conf/GENERIC Sun Aug 24 07:59:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.176 2014/08/23 20:27:00 dholland Exp $
+# $NetBSD: GENERIC,v 1.177 2014/08/24 07:59:23 jnemeth 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.176 $"
+#ident "GENERIC-$Revision: 1.177 $"
makeoptions COPTS="-O2 -fno-reorder-blocks" # see share/mk/sys.mk
@@ -81,6 +81,7 @@ options SYSVSHM # System V shared memo
## Loadable kernel module support
options MODULAR # new style module(7) framework
+options MODULAR_DEFAULT_AUTOLOAD
options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
Index: src/sys/arch/zaurus/conf/GENERIC
diff -u src/sys/arch/zaurus/conf/GENERIC:1.61 src/sys/arch/zaurus/conf/GENERIC:1.62
--- src/sys/arch/zaurus/conf/GENERIC:1.61 Sat Aug 23 20:27:00 2014
+++ src/sys/arch/zaurus/conf/GENERIC Sun Aug 24 07:59:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.61 2014/08/23 20:27:00 dholland Exp $
+# $NetBSD: GENERIC,v 1.62 2014/08/24 07:59:23 jnemeth Exp $
#
# GENERIC machine description file
#
@@ -121,6 +121,7 @@ options SYSVSHM # System V-like memory
# Loadable kernel module support
#options MODULAR # new style module(7) framework
+#options MODULAR_DEFAULT_AUTOLOAD
# Device options
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1098 src/sys/conf/files:1.1099
--- src/sys/conf/files:1.1098 Sun Aug 17 21:17:44 2014
+++ src/sys/conf/files Sun Aug 24 07:59:23 2014
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1098 2014/08/17 21:17:44 joerg Exp $
+# $NetBSD: files,v 1.1099 2014/08/24 07:59:23 jnemeth Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20100430
@@ -23,7 +23,8 @@ defflag KTRACE
defflag MBUFTRACE
defflag PTRACE
defflag COREDUMP
-defflag MODULAR
+defflag opt_modular.h MODULAR
+defflag opt_modular.h MODULAR_DEFAULT_AUTOLOAD
defflag KEYLOCK
defparam DEFCORENAME
Index: src/sys/kern/kern_module.c
diff -u src/sys/kern/kern_module.c:1.97 src/sys/kern/kern_module.c:1.98
--- src/sys/kern/kern_module.c:1.97 Mon Aug 11 03:43:25 2014
+++ src/sys/kern/kern_module.c Sun Aug 24 07:59:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_module.c,v 1.97 2014/08/11 03:43:25 jnemeth Exp $ */
+/* $NetBSD: kern_module.c,v 1.98 2014/08/24 07:59:23 jnemeth Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.97 2014/08/11 03:43:25 jnemeth Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_module.c,v 1.98 2014/08/24 07:59:23 jnemeth Exp $");
#define _MODULE_INTERNAL
@@ -67,7 +67,11 @@ static struct modlist module_bootlist =
static module_t *module_active;
static bool module_verbose_on;
+#ifdef MODULE_DEFAULT_AUTOLOAD
static bool module_autoload_on = true;
+#else
+static bool module_autoload_on = false;
+#endif
u_int module_count;
u_int module_builtinlist;
u_int module_autotime = 10;
