[src/netbsd-2-0]: src/sys/arch Pull up revision 1.22 (requested by atatat in ...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a7562980bb4f
branches:  netbsd-2-0
changeset: 562054:a7562980bb4f
user:      he <he%NetBSD.org@localhost>
date:      Thu Jul 15 20:20:32 2004 +0000

description:
Pull up revision 1.22 (requested by atatat in ticket #663):
        Add "options SYSCTL_INCLUDE_DESCR" to a lot of configurations,
        but commented out in most of them.

diffstat:

 sys/arch/acorn26/conf/GENERIC |  3 ++-
 sys/arch/algor/conf/P6032     |  5 +++--
 sys/arch/pc532/conf/DUMMY     |  3 ++-
 sys/arch/sparc/conf/KRUPS     |  5 +++--
 sys/arch/sun3/conf/INSTALL3X  |  3 ++-
 5 files changed, 12 insertions(+), 7 deletions(-)

diffs (103 lines):

diff -r 1ea4c2ca8c07 -r a7562980bb4f sys/arch/acorn26/conf/GENERIC
--- a/sys/arch/acorn26/conf/GENERIC     Thu Jul 15 20:20:26 2004 +0000
+++ b/sys/arch/acorn26/conf/GENERIC     Thu Jul 15 20:20:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.16.2.2 2004/07/02 17:40:29 he Exp $
+# $NetBSD: GENERIC,v 1.16.2.3 2004/07/15 20:20:32 he Exp $
 #
 # GENERIC machine description file
 # 
@@ -132,6 +132,7 @@
 options        NTP             # Kernel PLL for ntpd(8).
 options        USERCONF        # userconf(4) support
 #options       PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+options        SYSCTL_INCLUDE_DESCR    # Include sysctl descriptions in kernel
 
 # Enable experimental buffer queue strategy for better responsiveness under 
 # high disk I/O load. Use it with caution - it's not proven to be stable yet.
diff -r 1ea4c2ca8c07 -r a7562980bb4f sys/arch/algor/conf/P6032
--- a/sys/arch/algor/conf/P6032 Thu Jul 15 20:20:26 2004 +0000
+++ b/sys/arch/algor/conf/P6032 Thu Jul 15 20:20:32 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: P6032,v 1.21 2004/02/13 10:05:49 wiz Exp $
+#      $NetBSD: P6032,v 1.21.2.1 2004/07/15 20:20:32 he Exp $
 #
 # Algorithmics P-6032 kernel.
 #
@@ -7,7 +7,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "P6032-$Revision: 1.21 $"
+#ident                 "P6032-$Revision: 1.21.2.1 $"
 
 maxusers 32
 
@@ -85,6 +85,7 @@
 options        SCSIVERBOSE             # Verbose SCSI errors
 #options       PCMCIAVERBOSE
 #options       PIPE_SOCKETPAIR         # smaller, but slower pipe(2)
+#options       SYSCTL_INCLUDE_DESCR    # Include sysctl descriptions in kernel
 
 # The Alpha console firmware network boots using the BOOTP
 # protocol, so we ask the NFS code to use BOOTP/DHCP as well,
diff -r 1ea4c2ca8c07 -r a7562980bb4f sys/arch/pc532/conf/DUMMY
--- a/sys/arch/pc532/conf/DUMMY Thu Jul 15 20:20:26 2004 +0000
+++ b/sys/arch/pc532/conf/DUMMY Thu Jul 15 20:20:32 2004 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: DUMMY,v 1.21 2002/09/18 02:44:06 lukem Exp $
+#      $NetBSD: DUMMY,v 1.21.8.1 2004/07/15 20:20:32 he Exp $
 #
 # DUMMY: Matthias Pfaller's second pc532
 #
@@ -30,6 +30,7 @@
 options        PFIL_HOOKS              # pfil(9) packet filter hooks
 options        USERCONF                # userconf(4) support
 #options       PIPE_SOCKETPAIR         # smaller, but slower pipe(2)
+#options       SYSCTL_INCLUDE_DESCR    # Include sysctl descriptions in kernel
 
 # compatibility options
 options        COMPAT_10               # NetBSD 1.0,
diff -r 1ea4c2ca8c07 -r a7562980bb4f sys/arch/sparc/conf/KRUPS
--- a/sys/arch/sparc/conf/KRUPS Thu Jul 15 20:20:26 2004 +0000
+++ b/sys/arch/sparc/conf/KRUPS Thu Jul 15 20:20:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: KRUPS,v 1.20 2003/12/14 17:26:58 martin Exp $
+# $NetBSD: KRUPS,v 1.20.2.1 2004/07/15 20:20:33 he Exp $
 # From: NetBSD: GENERIC,v 1.148 2003/10/07 09:43:58 tron Exp
 #
 # Krups (JavaStation-NC) machine description file
@@ -8,7 +8,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "KRUPS-$Revision: 1.20 $"
+#ident                 "KRUPS-$Revision: 1.20.2.1 $"
 
 maxusers       32
 
@@ -69,6 +69,7 @@
 
 #options       USERCONF        # userconf(4) support
 #options       PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+options        SYSCTL_INCLUDE_DESCR    # Include sysctl descriptions in kernel
 
 ## NFS boot options; tries DHCP/BOOTP then BOOTPARAM
 options        NFS_BOOT_BOOTPARAM
diff -r 1ea4c2ca8c07 -r a7562980bb4f sys/arch/sun3/conf/INSTALL3X
--- a/sys/arch/sun3/conf/INSTALL3X      Thu Jul 15 20:20:26 2004 +0000
+++ b/sys/arch/sun3/conf/INSTALL3X      Thu Jul 15 20:20:32 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL3X,v 1.21 2003/09/22 14:11:30 cl Exp $
+# $NetBSD: INSTALL3X,v 1.21.2.1 2004/07/15 20:20:33 he Exp $
 #
 # INSTALL3X - Installation kernel for the Sun3X
 #
@@ -30,6 +30,7 @@
 #options       INSECURE        # disable kernel security level
 options        USERCONF        # userconf(4) support
 options                PIPE_SOCKETPAIR         # smaller, but slower pipe(2)
+#options       SYSCTL_INCLUDE_DESCR    # Include sysctl descriptions in kernel
 options        MALLOC_NOINLINE         # Not inlining MALLOC saves memory
 
 # Which kernel debugger?  Uncomment either this: