Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-7]: src Pull up following revision(s) (requested by jnemeth in ti...
details: https://anonhg.NetBSD.org/src/rev/af227e40cbaa
branches: netbsd-7
changeset: 799326:af227e40cbaa
user: snj <snj%NetBSD.org@localhost>
date: Fri May 15 03:44:17 2015 +0000
description:
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/)
diffstat:
share/man/man4/options.4 | 10 ++++++++--
sys/arch/amd64/conf/ALL | 5 +++--
sys/arch/amd64/conf/GENERIC | 5 +++--
sys/arch/dreamcast/conf/GENERIC | 3 ++-
sys/arch/epoc32/conf/GENERIC | 5 +++--
sys/arch/evbarm/conf/BCM5301X | 3 ++-
sys/arch/evbarm/conf/BCM56340 | 3 ++-
sys/arch/evbarm/conf/IMX23_OLINUXINO | 3 ++-
sys/arch/evbarm/conf/std.beagle | 3 ++-
sys/arch/evbarm/conf/std.kobo | 3 ++-
sys/arch/evbarm/conf/std.netwalker | 3 ++-
sys/arch/evbppc/conf/P2020DS | 5 +++--
sys/arch/evbppc/conf/RB800 | 5 +++--
sys/arch/evbppc/conf/TWRP1025 | 5 +++--
sys/arch/hp300/conf/GENERIC | 5 +++--
sys/arch/hpcsh/conf/GENERIC | 3 ++-
sys/arch/i386/conf/GENERIC | 5 +++--
sys/arch/i386/conf/MONOLITHIC | 3 ++-
sys/arch/landisk/conf/GENERIC | 5 +++--
sys/arch/luna68k/conf/GENERIC | 5 +++--
sys/arch/macppc/conf/GENERIC | 5 +++--
sys/arch/macppc/conf/GENERIC_601 | 5 +++--
sys/arch/mmeye/conf/MMEYE_WLF | 5 +++--
sys/arch/news68k/conf/GENERIC | 5 +++--
sys/arch/sandpoint/conf/GENERIC | 5 +++--
sys/arch/shark/conf/GENERIC | 5 +++--
sys/arch/sparc/conf/GENERIC | 5 +++--
sys/arch/sparc64/conf/GENERIC | 5 +++--
sys/arch/sun3/conf/GENERIC | 5 +++--
sys/arch/sun3/conf/GENERIC3X | 5 +++--
sys/arch/x68k/conf/GENERIC | 5 +++--
sys/arch/zaurus/conf/GENERIC | 3 ++-
sys/conf/files | 5 +++--
sys/kern/kern_module.c | 8 ++++++--
34 files changed, 100 insertions(+), 58 deletions(-)
diffs (truncated from 794 to 300 lines):
diff -r b088a6868e66 -r af227e40cbaa share/man/man4/options.4
--- a/share/man/man4/options.4 Thu May 14 08:18:58 2015 +0000
+++ b/share/man/man4/options.4 Fri May 15 03:44:17 2015 +0000
@@ -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 @@
.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
diff -r b088a6868e66 -r af227e40cbaa sys/arch/amd64/conf/ALL
--- a/sys/arch/amd64/conf/ALL Thu May 14 08:18:58 2015 +0000
+++ b/sys/arch/amd64/conf/ALL Fri May 15 03:44:17 2015 +0000
@@ -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 @@
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 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)
diff -r b088a6868e66 -r af227e40cbaa sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC Thu May 14 08:18:58 2015 +0000
+++ b/sys/arch/amd64/conf/GENERIC Fri May 15 03:44:17 2015 +0000
@@ -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 @@
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 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
diff -r b088a6868e66 -r af227e40cbaa sys/arch/dreamcast/conf/GENERIC
--- a/sys/arch/dreamcast/conf/GENERIC Thu May 14 08:18:58 2015 +0000
+++ b/sys/arch/dreamcast/conf/GENERIC Fri May 15 03:44:17 2015 +0000
@@ -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 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
diff -r b088a6868e66 -r af227e40cbaa sys/arch/epoc32/conf/GENERIC
--- a/sys/arch/epoc32/conf/GENERIC Thu May 14 08:18:58 2015 +0000
+++ b/sys/arch/epoc32/conf/GENERIC Fri May 15 03:44:17 2015 +0000
@@ -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 @@
#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 @@
# Loadable kernel module support
#options MODULAR # new style module(7) framework
+#options MODULAR_DEFAULT_AUTOLOAD
#
# wscons options
diff -r b088a6868e66 -r af227e40cbaa sys/arch/evbarm/conf/BCM5301X
--- a/sys/arch/evbarm/conf/BCM5301X Thu May 14 08:18:58 2015 +0000
+++ b/sys/arch/evbarm/conf/BCM5301X Fri May 15 03:44:17 2015 +0000
@@ -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 @@
# 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
diff -r b088a6868e66 -r af227e40cbaa sys/arch/evbarm/conf/BCM56340
--- a/sys/arch/evbarm/conf/BCM56340 Thu May 14 08:18:58 2015 +0000
+++ b/sys/arch/evbarm/conf/BCM56340 Fri May 15 03:44:17 2015 +0000
@@ -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 @@
# 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
diff -r b088a6868e66 -r af227e40cbaa sys/arch/evbarm/conf/IMX23_OLINUXINO
--- a/sys/arch/evbarm/conf/IMX23_OLINUXINO Thu May 14 08:18:58 2015 +0000
+++ b/sys/arch/evbarm/conf/IMX23_OLINUXINO Fri May 15 03:44:17 2015 +0000
@@ -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 SYSVSHM # System V-like memory sharing
#options MODULAR
+#options MODULAR_DEFAULT_AUTOLOAD
options KTRACE
#options DEBUG
#options DIAGNOSTIC
diff -r b088a6868e66 -r af227e40cbaa sys/arch/evbarm/conf/std.beagle
--- a/sys/arch/evbarm/conf/std.beagle Thu May 14 08:18:58 2015 +0000
+++ b/sys/arch/evbarm/conf/std.beagle Fri May 15 03:44:17 2015 +0000
@@ -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 @@
# 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
diff -r b088a6868e66 -r af227e40cbaa sys/arch/evbarm/conf/std.kobo
--- a/sys/arch/evbarm/conf/std.kobo Thu May 14 08:18:58 2015 +0000
+++ b/sys/arch/evbarm/conf/std.kobo Fri May 15 03:44:17 2015 +0000
@@ -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/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
diff -r b088a6868e66 -r af227e40cbaa sys/arch/evbarm/conf/std.netwalker
--- a/sys/arch/evbarm/conf/std.netwalker Thu May 14 08:18:58 2015 +0000
+++ b/sys/arch/evbarm/conf/std.netwalker Fri May 15 03:44:17 2015 +0000
@@ -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/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
diff -r b088a6868e66 -r af227e40cbaa sys/arch/evbppc/conf/P2020DS
--- a/sys/arch/evbppc/conf/P2020DS Thu May 14 08:18:58 2015 +0000
+++ b/sys/arch/evbppc/conf/P2020DS Fri May 15 03:44:17 2015 +0000
@@ -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 @@
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 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
diff -r b088a6868e66 -r af227e40cbaa sys/arch/evbppc/conf/RB800
--- a/sys/arch/evbppc/conf/RB800 Thu May 14 08:18:58 2015 +0000
+++ b/sys/arch/evbppc/conf/RB800 Fri May 15 03:44:17 2015 +0000
@@ -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 @@
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 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)
diff -r b088a6868e66 -r af227e40cbaa sys/arch/evbppc/conf/TWRP1025
--- a/sys/arch/evbppc/conf/TWRP1025 Thu May 14 08:18:58 2015 +0000
+++ b/sys/arch/evbppc/conf/TWRP1025 Fri May 15 03:44:17 2015 +0000
@@ -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 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "TWRP1025-$Revision: 1.14 $"
+ident "TWRP1025-$Revision: 1.14.4.1 $"
maxusers 32
Home |
Main Index |
Thread Index |
Old Index