Module Name: src
Committed By: snj
Date: Fri May 15 03:44:19 UTC 2015
Modified Files:
src/share/man/man4 [netbsd-7]: options.4
src/sys/arch/amd64/conf [netbsd-7]: ALL GENERIC
src/sys/arch/dreamcast/conf [netbsd-7]: GENERIC
src/sys/arch/epoc32/conf [netbsd-7]: GENERIC
src/sys/arch/evbarm/conf [netbsd-7]: BCM5301X BCM56340 IMX23_OLINUXINO
std.beagle std.kobo std.netwalker
src/sys/arch/evbppc/conf [netbsd-7]: P2020DS RB800 TWRP1025
src/sys/arch/hp300/conf [netbsd-7]: GENERIC
src/sys/arch/hpcsh/conf [netbsd-7]: GENERIC
src/sys/arch/i386/conf [netbsd-7]: GENERIC MONOLITHIC
src/sys/arch/landisk/conf [netbsd-7]: GENERIC
src/sys/arch/luna68k/conf [netbsd-7]: GENERIC
src/sys/arch/macppc/conf [netbsd-7]: GENERIC GENERIC_601
src/sys/arch/mmeye/conf [netbsd-7]: MMEYE_WLF
src/sys/arch/news68k/conf [netbsd-7]: GENERIC
src/sys/arch/sandpoint/conf [netbsd-7]: GENERIC
src/sys/arch/shark/conf [netbsd-7]: GENERIC
src/sys/arch/sparc/conf [netbsd-7]: GENERIC
src/sys/arch/sparc64/conf [netbsd-7]: GENERIC
src/sys/arch/sun3/conf [netbsd-7]: GENERIC GENERIC3X
src/sys/arch/x68k/conf [netbsd-7]: GENERIC
src/sys/arch/zaurus/conf [netbsd-7]: GENERIC
src/sys/conf [netbsd-7]: files
src/sys/kern [netbsd-7]: kern_module.c
Log Message:
Pull up following revision(s) (requested by jnemeth in ticket #762):
share/man/man4/options.4: revision 1.442
sys/arch/amd64/conf/ALL: revision 1.18
sys/arch/amd64/conf/GENERIC: revision 1.396
sys/arch/dreamcast/conf/GENERIC: revision 1.119
sys/arch/epoc32/conf/GENERIC: revision 1.6
sys/arch/evbarm/conf/BCM5301X: revision 1.24
sys/arch/evbarm/conf/BCM56340: revision 1.9
sys/arch/evbarm/conf/IMX23_OLINUXINO: revision 1.9
sys/arch/evbarm/conf/std.beagle: revision 1.13
sys/arch/evbarm/conf/std.kobo: revision 1.2
sys/arch/evbarm/conf/std.netwalker: revision 1.10
sys/arch/evbppc/conf/P2020DS: revision 1.25
sys/arch/evbppc/conf/RB800: revision 1.30
sys/arch/evbppc/conf/TWRP1025: revision 1.18
sys/arch/hp300/conf/GENERIC: revision 1.187
sys/arch/hpcsh/conf/GENERIC: revision 1.104
sys/arch/i386/conf/GENERIC: revision 1.1111
sys/arch/i386/conf/MONOLITHIC: revision 1.17
sys/arch/landisk/conf/GENERIC: revision 1.43
sys/arch/luna68k/conf/GENERIC: revision 1.117
sys/arch/macppc/conf/GENERIC: revision 1.316
sys/arch/macppc/conf/GENERIC_601: revision 1.5
sys/arch/mmeye/conf/MMEYE_WLF: revision 1.16
sys/arch/news68k/conf/GENERIC: revision 1.123
sys/arch/sandpoint/conf/GENERIC: revision 1.85
sys/arch/shark/conf/GENERIC: revision 1.119
sys/arch/sparc/conf/GENERIC: revision 1.246
sys/arch/sparc64/conf/GENERIC: revision 1.174
sys/arch/sun3/conf/GENERIC3X: revision 1.125
sys/arch/sun3/conf/GENERIC: revision 1.169
sys/arch/x68k/conf/GENERIC: revision 1.177
sys/arch/zaurus/conf/GENERIC: revision 1.62
sys/conf/files: revision 1.1099
sys/kern/kern_module.c: revisions 1.98, 1.99
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.
--
fix typo. (s/MODULE_DEFAULT_AUTOLOAD/MODULAR_DEFAULT_AUTOLOAD/)
To generate a diff of this commit:
cvs rdiff -u -r1.439.2.1 -r1.439.2.2 src/share/man/man4/options.4
cvs rdiff -u -r1.13.2.2 -r1.13.2.3 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.392.2.6 -r1.392.2.7 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.115.6.2 -r1.115.6.3 src/sys/arch/dreamcast/conf/GENERIC
cvs rdiff -u -r1.3.2.2 -r1.3.2.3 src/sys/arch/epoc32/conf/GENERIC
cvs rdiff -u -r1.19 -r1.19.2.1 src/sys/arch/evbarm/conf/BCM5301X
cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/arch/evbarm/conf/BCM56340
cvs rdiff -u -r1.5 -r1.5.2.1 src/sys/arch/evbarm/conf/IMX23_OLINUXINO
cvs rdiff -u -r1.12 -r1.12.4.1 src/sys/arch/evbarm/conf/std.beagle
cvs rdiff -u -r1.1 -r1.1.4.1 src/sys/arch/evbarm/conf/std.kobo
cvs rdiff -u -r1.9 -r1.9.2.1 src/sys/arch/evbarm/conf/std.netwalker
cvs rdiff -u -r1.21 -r1.21.2.1 src/sys/arch/evbppc/conf/P2020DS
cvs rdiff -u -r1.26 -r1.26.6.1 src/sys/arch/evbppc/conf/RB800
cvs rdiff -u -r1.14 -r1.14.4.1 src/sys/arch/evbppc/conf/TWRP1025
cvs rdiff -u -r1.184.2.3 -r1.184.2.4 src/sys/arch/hp300/conf/GENERIC
cvs rdiff -u -r1.101.4.2 -r1.101.4.3 src/sys/arch/hpcsh/conf/GENERIC
cvs rdiff -u -r1.1107.2.6 -r1.1107.2.7 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.16 -r1.16.28.1 src/sys/arch/i386/conf/MONOLITHIC
cvs rdiff -u -r1.40.4.2 -r1.40.4.3 src/sys/arch/landisk/conf/GENERIC
cvs rdiff -u -r1.113.2.2 -r1.113.2.3 src/sys/arch/luna68k/conf/GENERIC
cvs rdiff -u -r1.312.4.2 -r1.312.4.3 src/sys/arch/macppc/conf/GENERIC
cvs rdiff -u -r1.1 -r1.1.8.1 src/sys/arch/macppc/conf/GENERIC_601
cvs rdiff -u -r1.13 -r1.13.6.1 src/sys/arch/mmeye/conf/MMEYE_WLF
cvs rdiff -u -r1.120.2.2 -r1.120.2.3 src/sys/arch/news68k/conf/GENERIC
cvs rdiff -u -r1.81.4.2 -r1.81.4.3 src/sys/arch/sandpoint/conf/GENERIC
cvs rdiff -u -r1.115.2.3 -r1.115.2.4 src/sys/arch/shark/conf/GENERIC
cvs rdiff -u -r1.243.4.2 -r1.243.4.3 src/sys/arch/sparc/conf/GENERIC
cvs rdiff -u -r1.171.4.3 -r1.171.4.4 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.166.6.2 -r1.166.6.3 src/sys/arch/sun3/conf/GENERIC
cvs rdiff -u -r1.122 -r1.122.6.1 src/sys/arch/sun3/conf/GENERIC3X
cvs rdiff -u -r1.174.2.2 -r1.174.2.3 src/sys/arch/x68k/conf/GENERIC
cvs rdiff -u -r1.57.2.3 -r1.57.2.4 src/sys/arch/zaurus/conf/GENERIC
cvs rdiff -u -r1.1096.2.4 -r1.1096.2.5 src/sys/conf/files
cvs rdiff -u -r1.97 -r1.97.2.1 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.439.2.1 src/share/man/man4/options.4:1.439.2.2
--- src/share/man/man4/options.4:1.439.2.1 Thu Aug 21 07:43:04 2014
+++ src/share/man/man4/options.4 Fri May 15 03:44:17 2015
@@ -1,4 +1,4 @@
-.\" $NetBSD: options.4,v 1.439.2.1 2014/08/21 07:43:04 martin Exp $
+.\" $NetBSD: options.4,v 1.439.2.2 2015/05/15 03:44:17 snj 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
@@ -1228,6 +1228,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.13.2.2 src/sys/arch/amd64/conf/ALL:1.13.2.3
--- src/sys/arch/amd64/conf/ALL:1.13.2.2 Wed Mar 18 03:57:15 2015
+++ src/sys/arch/amd64/conf/ALL Fri May 15 03:44:17 2015
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.13.2.2 2015/03/18 03:57:15 snj Exp $
+# $NetBSD: ALL,v 1.13.2.3 2015/05/15 03:44:17 snj 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.13.2.2 $"
+#ident "ALL-$Revision: 1.13.2.3 $"
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.392.2.6 src/sys/arch/amd64/conf/GENERIC:1.392.2.7
--- src/sys/arch/amd64/conf/GENERIC:1.392.2.6 Wed Mar 18 03:57:15 2015
+++ src/sys/arch/amd64/conf/GENERIC Fri May 15 03:44:17 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.392.2.6 2015/03/18 03:57:15 snj Exp $
+# $NetBSD: GENERIC,v 1.392.2.7 2015/05/15 03:44:17 snj 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.392.2.6 $"
+#ident "GENERIC-$Revision: 1.392.2.7 $"
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.115.6.2 src/sys/arch/dreamcast/conf/GENERIC:1.115.6.3
--- src/sys/arch/dreamcast/conf/GENERIC:1.115.6.2 Tue Nov 18 19:05:29 2014
+++ src/sys/arch/dreamcast/conf/GENERIC Fri May 15 03:44:17 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.115.6.2 2014/11/18 19:05:29 snj Exp $
+# $NetBSD: GENERIC,v 1.115.6.3 2015/05/15 03:44:17 snj 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.3.2.2 src/sys/arch/epoc32/conf/GENERIC:1.3.2.3
--- src/sys/arch/epoc32/conf/GENERIC:1.3.2.2 Tue Nov 18 19:05:29 2014
+++ src/sys/arch/epoc32/conf/GENERIC Fri May 15 03:44:17 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.3.2.2 2014/11/18 19:05:29 snj Exp $
+# $NetBSD: GENERIC,v 1.3.2.3 2015/05/15 03:44:17 snj 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.3.2.2 $"
+#ident "GENERIC-$Revision: 1.3.2.3 $"
maxusers 32 # estimated number of users
@@ -92,6 +92,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.19 src/sys/arch/evbarm/conf/BCM5301X:1.19.2.1
--- src/sys/arch/evbarm/conf/BCM5301X:1.19 Sun Aug 3 08:53:56 2014
+++ src/sys/arch/evbarm/conf/BCM5301X Fri May 15 03:44:18 2015
@@ -1,5 +1,5 @@
#
-# $NetBSD: BCM5301X,v 1.19 2014/08/03 08:53:56 martin Exp $
+# $NetBSD: BCM5301X,v 1.19.2.1 2015/05/15 03:44:18 snj Exp $
#
# BCM5301X -- Broadcom BCM5301X Eval Board Kernel
#
@@ -125,6 +125,7 @@ options DKWEDGE_METHOD_GPT
# 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.4 src/sys/arch/evbarm/conf/BCM56340:1.4.2.1
--- src/sys/arch/evbarm/conf/BCM56340:1.4 Sun Aug 3 08:53:56 2014
+++ src/sys/arch/evbarm/conf/BCM56340 Fri May 15 03:44:18 2015
@@ -1,5 +1,5 @@
#
-# $NetBSD: BCM56340,v 1.4 2014/08/03 08:53:56 martin Exp $
+# $NetBSD: BCM56340,v 1.4.2.1 2015/05/15 03:44:18 snj Exp $
#
# BCM5301X -- Broadcom BCM5301X Eval Board Kernel
#
@@ -125,6 +125,7 @@ options DKWEDGE_METHOD_GPT
# 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.5 src/sys/arch/evbarm/conf/IMX23_OLINUXINO:1.5.2.1
--- src/sys/arch/evbarm/conf/IMX23_OLINUXINO:1.5 Sun Aug 3 09:18:16 2014
+++ src/sys/arch/evbarm/conf/IMX23_OLINUXINO Fri May 15 03:44:18 2015
@@ -1,4 +1,4 @@
-# $Id: IMX23_OLINUXINO,v 1.5 2014/08/03 09:18:16 martin Exp $
+# $Id: IMX23_OLINUXINO,v 1.5.2.1 2015/05/15 03:44:18 snj Exp $
#
# IMX23_OLINUXINO -- Olimex i.MX23 OLinuXino kernel configuration file.
#
@@ -96,6 +96,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.12.4.1
--- src/sys/arch/evbarm/conf/std.beagle:1.12 Fri Nov 1 18:41:06 2013
+++ src/sys/arch/evbarm/conf/std.beagle Fri May 15 03:44:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: std.beagle,v 1.12 2013/11/01 18:41:06 skrll Exp $
+# $NetBSD: std.beagle,v 1.12.4.1 2015/05/15 03:44:18 snj 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.kobo
diff -u src/sys/arch/evbarm/conf/std.kobo:1.1 src/sys/arch/evbarm/conf/std.kobo:1.1.4.1
--- src/sys/arch/evbarm/conf/std.kobo:1.1 Fri Jul 25 11:22:50 2014
+++ src/sys/arch/evbarm/conf/std.kobo Fri May 15 03:44:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: std.kobo,v 1.1 2014/07/25 11:22:50 hkenken Exp $
+# $NetBSD: std.kobo,v 1.1.4.1 2015/05/15 03:44:18 snj 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.9.2.1
--- src/sys/arch/evbarm/conf/std.netwalker:1.9 Wed Apr 9 04:00:50 2014
+++ src/sys/arch/evbarm/conf/std.netwalker Fri May 15 03:44:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: std.netwalker,v 1.9 2014/04/09 04:00:50 hkenken Exp $
+# $NetBSD: std.netwalker,v 1.9.2.1 2015/05/15 03:44:18 snj 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/evbppc/conf/P2020DS
diff -u src/sys/arch/evbppc/conf/P2020DS:1.21 src/sys/arch/evbppc/conf/P2020DS:1.21.2.1
--- src/sys/arch/evbppc/conf/P2020DS:1.21 Sun Aug 10 17:56:23 2014
+++ src/sys/arch/evbppc/conf/P2020DS Fri May 15 03:44:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: P2020DS,v 1.21 2014/08/10 17:56:23 joerg Exp $
+# $NetBSD: P2020DS,v 1.21.2.1 2015/05/15 03:44:18 snj 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.21 $"
+ident "P2020DS-$Revision: 1.21.2.1 $"
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.26 src/sys/arch/evbppc/conf/RB800:1.26.6.1
--- src/sys/arch/evbppc/conf/RB800:1.26 Sun Jun 30 21:38:56 2013
+++ src/sys/arch/evbppc/conf/RB800 Fri May 15 03:44:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: RB800,v 1.26 2013/06/30 21:38:56 rmind Exp $
+# $NetBSD: RB800,v 1.26.6.1 2015/05/15 03:44:18 snj 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.26 $"
+ident "RB800-$Revision: 1.26.6.1 $"
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.14 src/sys/arch/evbppc/conf/TWRP1025:1.14.4.1
--- src/sys/arch/evbppc/conf/TWRP1025:1.14 Thu Mar 6 23:30:28 2014
+++ src/sys/arch/evbppc/conf/TWRP1025 Fri May 15 03:44:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: TWRP1025,v 1.14 2014/03/06 23:30:28 joerg Exp $
+# $NetBSD: TWRP1025,v 1.14.4.1 2015/05/15 03:44:18 snj 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.14 $"
+ident "TWRP1025-$Revision: 1.14.4.1 $"
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.184.2.3 src/sys/arch/hp300/conf/GENERIC:1.184.2.4
--- src/sys/arch/hp300/conf/GENERIC:1.184.2.3 Tue Nov 18 19:05:29 2014
+++ src/sys/arch/hp300/conf/GENERIC Fri May 15 03:44:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.184.2.3 2014/11/18 19:05:29 snj Exp $
+# $NetBSD: GENERIC,v 1.184.2.4 2015/05/15 03:44:18 snj 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.184.2.3 $"
+#ident "GENERIC-$Revision: 1.184.2.4 $"
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.101.4.2 src/sys/arch/hpcsh/conf/GENERIC:1.101.4.3
--- src/sys/arch/hpcsh/conf/GENERIC:1.101.4.2 Tue Nov 18 19:05:29 2014
+++ src/sys/arch/hpcsh/conf/GENERIC Fri May 15 03:44:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.101.4.2 2014/11/18 19:05:29 snj Exp $
+# $NetBSD: GENERIC,v 1.101.4.3 2015/05/15 03:44:18 snj 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.1107.2.6 src/sys/arch/i386/conf/GENERIC:1.1107.2.7
--- src/sys/arch/i386/conf/GENERIC:1.1107.2.6 Wed Mar 18 03:57:15 2015
+++ src/sys/arch/i386/conf/GENERIC Fri May 15 03:44:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1107.2.6 2015/03/18 03:57:15 snj Exp $
+# $NetBSD: GENERIC,v 1.1107.2.7 2015/05/15 03:44:18 snj 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.1107.2.6 $"
+#ident "GENERIC-$Revision: 1.1107.2.7 $"
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.16.28.1
--- src/sys/arch/i386/conf/MONOLITHIC:1.16 Tue Aug 9 14:18:17 2011
+++ src/sys/arch/i386/conf/MONOLITHIC Fri May 15 03:44:18 2015
@@ -1,7 +1,8 @@
-# $NetBSD: MONOLITHIC,v 1.16 2011/08/09 14:18:17 jakllsch Exp $
+# $NetBSD: MONOLITHIC,v 1.16.28.1 2015/05/15 03:44:18 snj 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.40.4.2 src/sys/arch/landisk/conf/GENERIC:1.40.4.3
--- src/sys/arch/landisk/conf/GENERIC:1.40.4.2 Tue Nov 18 19:05:30 2014
+++ src/sys/arch/landisk/conf/GENERIC Fri May 15 03:44:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.40.4.2 2014/11/18 19:05:30 snj Exp $
+# $NetBSD: GENERIC,v 1.40.4.3 2015/05/15 03:44:18 snj 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.40.4.2 $"
+#ident "GENERIC-$Revision: 1.40.4.3 $"
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.113.2.2 src/sys/arch/luna68k/conf/GENERIC:1.113.2.3
--- src/sys/arch/luna68k/conf/GENERIC:1.113.2.2 Tue Nov 18 19:05:30 2014
+++ src/sys/arch/luna68k/conf/GENERIC Fri May 15 03:44:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.113.2.2 2014/11/18 19:05:30 snj Exp $
+# $NetBSD: GENERIC,v 1.113.2.3 2015/05/15 03:44:18 snj 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.113.2.2 $"
+#ident "GENERIC-$Revision: 1.113.2.3 $"
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.312.4.2 src/sys/arch/macppc/conf/GENERIC:1.312.4.3
--- src/sys/arch/macppc/conf/GENERIC:1.312.4.2 Tue Nov 18 19:05:30 2014
+++ src/sys/arch/macppc/conf/GENERIC Fri May 15 03:44:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.312.4.2 2014/11/18 19:05:30 snj Exp $
+# $NetBSD: GENERIC,v 1.312.4.3 2015/05/15 03:44:18 snj 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.312.4.2 $"
+#ident "GENERIC-$Revision: 1.312.4.3 $"
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.1 src/sys/arch/macppc/conf/GENERIC_601:1.1.8.1
--- src/sys/arch/macppc/conf/GENERIC_601:1.1 Mon Mar 3 16:09:43 2014
+++ src/sys/arch/macppc/conf/GENERIC_601 Fri May 15 03:44:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_601,v 1.1 2014/03/03 16:09:43 macallan Exp $
+# $NetBSD: GENERIC_601,v 1.1.8.1 2015/05/15 03:44:18 snj 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.1 $"
+ident "GENERIC-$Revision: 1.1.8.1 $"
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.13 src/sys/arch/mmeye/conf/MMEYE_WLF:1.13.6.1
--- src/sys/arch/mmeye/conf/MMEYE_WLF:1.13 Sun Jun 30 21:38:57 2013
+++ src/sys/arch/mmeye/conf/MMEYE_WLF Fri May 15 03:44:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: MMEYE_WLF,v 1.13 2013/06/30 21:38:57 rmind Exp $
+# $NetBSD: MMEYE_WLF,v 1.13.6.1 2015/05/15 03:44:18 snj 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.13 $"
+#ident "GENERIC-$Revision: 1.13.6.1 $"
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.120.2.2 src/sys/arch/news68k/conf/GENERIC:1.120.2.3
--- src/sys/arch/news68k/conf/GENERIC:1.120.2.2 Tue Nov 18 19:05:31 2014
+++ src/sys/arch/news68k/conf/GENERIC Fri May 15 03:44:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.120.2.2 2014/11/18 19:05:31 snj Exp $
+# $NetBSD: GENERIC,v 1.120.2.3 2015/05/15 03:44:18 snj 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.120.2.2 $"
+#ident "GENERIC-$Revision: 1.120.2.3 $"
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.81.4.2 src/sys/arch/sandpoint/conf/GENERIC:1.81.4.3
--- src/sys/arch/sandpoint/conf/GENERIC:1.81.4.2 Tue Nov 18 19:05:31 2014
+++ src/sys/arch/sandpoint/conf/GENERIC Fri May 15 03:44:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.81.4.2 2014/11/18 19:05:31 snj Exp $
+# $NetBSD: GENERIC,v 1.81.4.3 2015/05/15 03:44:18 snj 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.81.4.2 $"
+#ident "GENERIC-$Revision: 1.81.4.3 $"
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.115.2.3 src/sys/arch/shark/conf/GENERIC:1.115.2.4
--- src/sys/arch/shark/conf/GENERIC:1.115.2.3 Tue Nov 18 19:05:31 2014
+++ src/sys/arch/shark/conf/GENERIC Fri May 15 03:44:18 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.115.2.3 2014/11/18 19:05:31 snj Exp $
+# $NetBSD: GENERIC,v 1.115.2.4 2015/05/15 03:44:18 snj 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.115.2.3 $"
+#ident "GENERIC-$Revision: 1.115.2.4 $"
# 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.243.4.2 src/sys/arch/sparc/conf/GENERIC:1.243.4.3
--- src/sys/arch/sparc/conf/GENERIC:1.243.4.2 Tue Nov 18 19:05:31 2014
+++ src/sys/arch/sparc/conf/GENERIC Fri May 15 03:44:19 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.243.4.2 2014/11/18 19:05:31 snj Exp $
+# $NetBSD: GENERIC,v 1.243.4.3 2015/05/15 03:44:19 snj 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.243.4.2 $"
+#ident "GENERIC-$Revision: 1.243.4.3 $"
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.171.4.3 src/sys/arch/sparc64/conf/GENERIC:1.171.4.4
--- src/sys/arch/sparc64/conf/GENERIC:1.171.4.3 Tue Nov 18 19:05:32 2014
+++ src/sys/arch/sparc64/conf/GENERIC Fri May 15 03:44:19 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.171.4.3 2014/11/18 19:05:32 snj Exp $
+# $NetBSD: GENERIC,v 1.171.4.4 2015/05/15 03:44:19 snj 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.171.4.3 $"
+#ident "GENERIC-$Revision: 1.171.4.4 $"
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.166.6.2 src/sys/arch/sun3/conf/GENERIC:1.166.6.3
--- src/sys/arch/sun3/conf/GENERIC:1.166.6.2 Tue Nov 18 19:05:32 2014
+++ src/sys/arch/sun3/conf/GENERIC Fri May 15 03:44:19 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.166.6.2 2014/11/18 19:05:32 snj Exp $
+# $NetBSD: GENERIC,v 1.166.6.3 2015/05/15 03:44:19 snj 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.166.6.2 $"
+#ident "GENERIC-$Revision: 1.166.6.3 $"
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.122 src/sys/arch/sun3/conf/GENERIC3X:1.122.6.1
--- src/sys/arch/sun3/conf/GENERIC3X:1.122 Sun Jun 30 21:38:59 2013
+++ src/sys/arch/sun3/conf/GENERIC3X Fri May 15 03:44:19 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC3X,v 1.122 2013/06/30 21:38:59 rmind Exp $
+# $NetBSD: GENERIC3X,v 1.122.6.1 2015/05/15 03:44:19 snj 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.122 $"
+#ident "GENERIC3X-$Revision: 1.122.6.1 $"
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.174.2.2 src/sys/arch/x68k/conf/GENERIC:1.174.2.3
--- src/sys/arch/x68k/conf/GENERIC:1.174.2.2 Tue Nov 18 19:05:32 2014
+++ src/sys/arch/x68k/conf/GENERIC Fri May 15 03:44:19 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.174.2.2 2014/11/18 19:05:32 snj Exp $
+# $NetBSD: GENERIC,v 1.174.2.3 2015/05/15 03:44:19 snj 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.174.2.2 $"
+#ident "GENERIC-$Revision: 1.174.2.3 $"
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.57.2.3 src/sys/arch/zaurus/conf/GENERIC:1.57.2.4
--- src/sys/arch/zaurus/conf/GENERIC:1.57.2.3 Tue Nov 18 19:05:32 2014
+++ src/sys/arch/zaurus/conf/GENERIC Fri May 15 03:44:19 2015
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.57.2.3 2014/11/18 19:05:32 snj Exp $
+# $NetBSD: GENERIC,v 1.57.2.4 2015/05/15 03:44:19 snj 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.1096.2.4 src/sys/conf/files:1.1096.2.5
--- src/sys/conf/files:1.1096.2.4 Sun Nov 23 13:07:05 2014
+++ src/sys/conf/files Fri May 15 03:44:19 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1096.2.4 2014/11/23 13:07:05 martin Exp $
+# $NetBSD: files,v 1.1096.2.5 2015/05/15 03:44:19 snj 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.97.2.1
--- src/sys/kern/kern_module.c:1.97 Mon Aug 11 03:43:25 2014
+++ src/sys/kern/kern_module.c Fri May 15 03:44:19 2015
@@ -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.97.2.1 2015/05/15 03:44:19 snj 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.97.2.1 2015/05/15 03:44:19 snj Exp $");
#define _MODULE_INTERNAL
@@ -67,7 +67,11 @@ static struct modlist module_bootlist =
static module_t *module_active;
static bool module_verbose_on;
+#ifdef MODULAR_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;
