Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-2-1]: src/sys/arch Pull up following revision(s) (requested by ad...



details:   https://anonhg.NetBSD.org/src/rev/b1000c314493
branches:  netbsd-2-1
changeset: 564271:b1000c314493
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Sat Aug 11 14:40:02 2007 +0000

description:
Pull up following revision(s) (requested by adrianp in ticket #11356):
        sys/arch/acorn32/conf/GENERIC                   1.80 via patch
        sys/arch/amd64/conf/GENERIC                     1.154 via patch
        sys/arch/amiga/conf/GENERIC.in                  1.61 via patch
        sys/arch/arc/conf/GENERIC                       1.148 via patch
        sys/arch/atari/conf/GENERIC.in                  1.68 via patch
        sys/arch/cats/conf/GENERIC                      1.116 via patch
        sys/arch/hp300/conf/GENERIC                     1.141 via patch
        sys/arch/hp700/conf/GENERIC                     patch
        sys/arch/i386/conf/GENERIC                      1.840 via patch
        sys/arch/i386/conf/GENERIC_LAPTOP               1.239 via patch
        sys/arch/i386/conf/GENERIC.MPACPI               patch
        sys/arch/mac68k/conf/GENERIC                    1.182 via patch
        sys/arch/sgimips/conf/GENERIC32_IP2x            1.68 via patch
        sys/arch/sgimips/conf/GENERIC32_IP3x            1.66 via patch
        sys/arch/sparc/conf/GENERIC                     1.200 via patch
        sys/arch/sparc64/conf/GENERIC32                 patch
        sys/arch/xen/conf/GENERIC                       patch
Remove iso(4) from GENERIC kernels, as discussed on tech-net@
Ok'ed by core@

diffstat:

 sys/arch/acorn32/conf/GENERIC        |  6 +++---
 sys/arch/amd64/conf/GENERIC          |  6 +++---
 sys/arch/amiga/conf/GENERIC          |  6 +++---
 sys/arch/amiga/conf/GENERIC.in       |  6 +++---
 sys/arch/arc/conf/GENERIC            |  6 +++---
 sys/arch/atari/conf/GENERIC.in       |  4 ++--
 sys/arch/cats/conf/GENERIC           |  4 ++--
 sys/arch/hp300/conf/GENERIC          |  6 +++---
 sys/arch/hp700/conf/GENERIC          |  6 +++---
 sys/arch/i386/conf/GENERIC           |  6 +++---
 sys/arch/i386/conf/GENERIC.MPACPI    |  6 +++---
 sys/arch/i386/conf/GENERIC_LAPTOP    |  6 +++---
 sys/arch/mac68k/conf/GENERIC         |  6 +++---
 sys/arch/sgimips/conf/GENERIC32_IP2x |  6 +++---
 sys/arch/sgimips/conf/GENERIC32_IP3x |  6 +++---
 sys/arch/sparc/conf/GENERIC          |  6 +++---
 sys/arch/sparc64/conf/GENERIC32      |  8 ++++----
 sys/arch/xen/conf/GENERIC            |  6 +++---
 18 files changed, 53 insertions(+), 53 deletions(-)

diffs (truncated from 469 to 300 lines):

diff -r 9c7272f42467 -r b1000c314493 sys/arch/acorn32/conf/GENERIC
--- a/sys/arch/acorn32/conf/GENERIC     Sat Aug 11 14:25:43 2007 +0000
+++ b/sys/arch/acorn32/conf/GENERIC     Sat Aug 11 14:40:02 2007 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC,v 1.37.2.3 2004/07/15 20:15:32 he Exp $
+#      $NetBSD: GENERIC,v 1.37.2.3.4.1 2007/08/11 14:40:02 bouyer Exp $
 #
 #      GENERIC --- NetBSD/acorn32 complete configuration
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.37.2.3 $"
+#ident         "GENERIC-$Revision: 1.37.2.3.4.1 $"
 
 # estimated number of users
 maxusers       32
@@ -82,7 +82,7 @@
 #options       MROUTING        # IP multicast routing
 options        NS              # XNS
 #options       NSIP            # XNS tunneling over IP
-options        ISO,TPIP        # OSI
+#options       ISO,TPIP        # OSI
 #options       EON             # OSI tunneling over IP
 options        CCITT,LLC,HDLC  # X.25
 options        NETATALK        # AppleTalk networking
diff -r 9c7272f42467 -r b1000c314493 sys/arch/amd64/conf/GENERIC
--- a/sys/arch/amd64/conf/GENERIC       Sat Aug 11 14:25:43 2007 +0000
+++ b/sys/arch/amd64/conf/GENERIC       Sat Aug 11 14:40:02 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.21.2.4.2.2 2005/07/21 19:27:09 riz Exp $
+# $NetBSD: GENERIC,v 1.21.2.4.2.2.2.1 2007/08/11 14:40:03 bouyer Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.21.2.4.2.2 $"
+#ident                 "GENERIC-$Revision: 1.21.2.4.2.2.2.1 $"
 
 maxusers       32              # estimated number of users
 
@@ -136,7 +136,7 @@
 #options       MROUTING        # IP multicast routing
 options        NS              # XNS
 #options       NSIP            # XNS tunneling over IP
-options        ISO,TPIP        # OSI
+#options       ISO,TPIP        # OSI
 #options       EON             # OSI tunneling over IP
 options        CCITT,LLC,HDLC  # X.25
 options        NETATALK        # AppleTalk networking protocols
diff -r 9c7272f42467 -r b1000c314493 sys/arch/amiga/conf/GENERIC
--- a/sys/arch/amiga/conf/GENERIC       Sat Aug 11 14:25:43 2007 +0000
+++ b/sys/arch/amiga/conf/GENERIC       Sat Aug 11 14:40:02 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.200.2.3 2004/07/15 20:41:32 he Exp $
+# $NetBSD: GENERIC,v 1.200.2.3.4.1 2007/08/11 14:40:03 bouyer Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
@@ -28,7 +28,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.200.2.3 $"
+#ident                 "GENERIC-$Revision: 1.200.2.3.4.1 $"
 
 
 maxusers       8
@@ -70,7 +70,7 @@
 #options       MROUTING        # Multicast routing
 options        NS              # XNS
 #options       NSIP            # XNS tunneling over IP
-options        ISO,TPIP        # OSI
+#options       ISO,TPIP        # OSI
 #options       EON             # OSI tunneling over IP
 options        CCITT,LLC,HDLC  # X.25
 options        NETATALK        # AppleTalk networking protocols
diff -r 9c7272f42467 -r b1000c314493 sys/arch/amiga/conf/GENERIC.in
--- a/sys/arch/amiga/conf/GENERIC.in    Sat Aug 11 14:25:43 2007 +0000
+++ b/sys/arch/amiga/conf/GENERIC.in    Sat Aug 11 14:40:02 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.18.2.3 2004/07/15 20:22:46 he Exp $
+# $NetBSD: GENERIC.in,v 1.18.2.3.4.1 2007/08/11 14:40:04 bouyer Exp $
 #
 # GENERIC machine description file
 #
@@ -56,7 +56,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.18.2.3 $"
+#ident                 "GENERIC-$Revision: 1.18.2.3.4.1 $"
 
 m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
 makeoptions    COPTS="-Os"
@@ -108,7 +108,7 @@
 #options       MROUTING        # Multicast routing
 options        NS              # XNS
 #options       NSIP            # XNS tunneling over IP
-options        ISO,TPIP        # OSI
+#options       ISO,TPIP        # OSI
 #options       EON             # OSI tunneling over IP
 options        CCITT,LLC,HDLC  # X.25
 options        NETATALK        # AppleTalk networking protocols
diff -r 9c7272f42467 -r b1000c314493 sys/arch/arc/conf/GENERIC
--- a/sys/arch/arc/conf/GENERIC Sat Aug 11 14:25:43 2007 +0000
+++ b/sys/arch/arc/conf/GENERIC Sat Aug 11 14:40:02 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.98.2.3.2.1 2005/04/02 21:30:09 he Exp $
+# $NetBSD: GENERIC,v 1.98.2.3.2.1.2.1 2007/08/11 14:40:04 bouyer Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.98.2.3.2.1 $"
+#ident         "GENERIC-$Revision: 1.98.2.3.2.1.2.1 $"
 
 maxusers       32              # estimated number of users
 
@@ -131,7 +131,7 @@
 #options       MROUTING        # IP multicast routing
 options        NS              # XNS
 #options       NSIP            # XNS tunneling over IP
-options        ISO,TPIP        # OSI networking
+#options       ISO,TPIP        # OSI networking
 #options       EON             # OSI tunneling over IP
 options        CCITT,LLC,HDLC  # X.25
 options        NETATALK        # AppleTalk networking protocols
diff -r 9c7272f42467 -r b1000c314493 sys/arch/atari/conf/GENERIC.in
--- a/sys/arch/atari/conf/GENERIC.in    Sat Aug 11 14:25:43 2007 +0000
+++ b/sys/arch/atari/conf/GENERIC.in    Sat Aug 11 14:40:02 2007 +0000
@@ -1,5 +1,5 @@
 #
-#      $NetBSD: GENERIC.in,v 1.33.2.3 2004/07/15 20:18:24 he Exp $
+#      $NetBSD: GENERIC.in,v 1.33.2.3.4.1 2007/08/11 14:40:05 bouyer Exp $
 #
 # Generic atari
 #
@@ -61,7 +61,7 @@
 #options       MROUTING        # IP multicast routing
 options        NS              # XNS
 #options       NSIP            # XNS tunneling over IP
-options        ISO,TPIP        # OSI
+#options       ISO,TPIP        # OSI
 #options       EON             # OSI tunneling over IP
 options        CCITT,LLC,HDLC  # X.25
 #ifndef NO_PHYS_NETWORK
diff -r 9c7272f42467 -r b1000c314493 sys/arch/cats/conf/GENERIC
--- a/sys/arch/cats/conf/GENERIC        Sat Aug 11 14:25:43 2007 +0000
+++ b/sys/arch/cats/conf/GENERIC        Sat Aug 11 14:40:02 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.61.2.3.2.2 2005/07/21 19:28:04 riz Exp $
+# $NetBSD: GENERIC,v 1.61.2.3.2.2.2.1 2007/08/11 14:40:06 bouyer Exp $
 #
 # GENERIC machine description file
 # 
@@ -88,7 +88,7 @@
 #options       MROUTING        # IP multicast routing
 options        NS              # XNS
 #options       NSIP            # XNS tunneling over IP
-options        ISO,TPIP        # OSI
+#options       ISO,TPIP        # OSI
 #options       EON             # OSI tunneling over IP
 options        CCITT,LLC,HDLC  # X.25
 options        NETATALK        # AppleTalk networking
diff -r 9c7272f42467 -r b1000c314493 sys/arch/hp300/conf/GENERIC
--- a/sys/arch/hp300/conf/GENERIC       Sat Aug 11 14:25:43 2007 +0000
+++ b/sys/arch/hp300/conf/GENERIC       Sat Aug 11 14:40:02 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.97.2.3 2004/07/15 20:16:49 he Exp $
+# $NetBSD: GENERIC,v 1.97.2.3.4.1 2007/08/11 14:40:07 bouyer Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.97.2.3 $"
+#ident                 "GENERIC-$Revision: 1.97.2.3.4.1 $"
 
 maxusers       32              # estimated number of users
 
@@ -131,7 +131,7 @@
 options        MROUTING        # Multicast routing
 options        NS              # XNS
 #options       NSIP            # XNS tunneling over IP
-options        ISO,TPIP        # OSI
+#options       ISO,TPIP        # OSI
 #options       EON             # OSI tunneling over IP
 options        CCITT,LLC,HDLC  # X.25
 options        NETATALK        # AppleTalk networking protocols
diff -r 9c7272f42467 -r b1000c314493 sys/arch/hp700/conf/GENERIC
--- a/sys/arch/hp700/conf/GENERIC       Sat Aug 11 14:25:43 2007 +0000
+++ b/sys/arch/hp700/conf/GENERIC       Sat Aug 11 14:40:02 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.21.2.3 2004/07/15 20:16:56 he Exp $
+# $NetBSD: GENERIC,v 1.21.2.3.4.1 2007/08/11 14:40:07 bouyer Exp $
 #
 # GENERIC machine description file
 # 
@@ -23,7 +23,7 @@
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 options        SYSCTL_INCLUDE_DESCR    # Include sysctl descriptions in kernel
 
-#ident                 "GENERIC-$Revision: 1.21.2.3 $"
+#ident                 "GENERIC-$Revision: 1.21.2.3.4.1 $"
 
 maxusers       32              # estimated number of users
 
@@ -126,7 +126,7 @@
 #options       MROUTING        # IP multicast routing
 options        NS              # XNS
 #options       NSIP            # XNS tunneling over IP
-options        ISO,TPIP        # OSI
+#options       ISO,TPIP        # OSI
 #options       EON             # OSI tunneling over IP
 options        CCITT,LLC,HDLC  # X.25
 options        NETATALK        # AppleTalk networking protocols
diff -r 9c7272f42467 -r b1000c314493 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC        Sat Aug 11 14:25:43 2007 +0000
+++ b/sys/arch/i386/conf/GENERIC        Sat Aug 11 14:40:02 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.595.2.11.2.2 2005/07/21 19:27:58 riz Exp $
+# $NetBSD: GENERIC,v 1.595.2.11.2.2.2.1 2007/08/11 14:40:08 bouyer Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.595.2.11.2.2 $"
+#ident                 "GENERIC-$Revision: 1.595.2.11.2.2.2.1 $"
 
 maxusers       32              # estimated number of users
 
@@ -173,7 +173,7 @@
 #options       MROUTING        # IP multicast routing
 options        NS              # XNS
 #options       NSIP            # XNS tunneling over IP
-options        ISO,TPIP        # OSI
+#options       ISO,TPIP        # OSI
 #options       EON             # OSI tunneling over IP
 options        CCITT,LLC,HDLC  # X.25
 options        NETATALK        # AppleTalk networking protocols
diff -r 9c7272f42467 -r b1000c314493 sys/arch/i386/conf/GENERIC.MPACPI
--- a/sys/arch/i386/conf/GENERIC.MPACPI Sat Aug 11 14:25:43 2007 +0000
+++ b/sys/arch/i386/conf/GENERIC.MPACPI Sat Aug 11 14:40:02 2007 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC.MPACPI,v 1.26.2.2 2005/05/11 15:28:32 riz Exp $
+#      $NetBSD: GENERIC.MPACPI,v 1.26.2.2.2.1 2007/08/11 14:40:09 bouyer Exp $
 #
 #      GENERIC.MPACPI -- Generic, plus ACPI Multiprocessor support
 #
@@ -8,7 +8,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.26.2.2 $"
+#ident                 "GENERIC-$Revision: 1.26.2.2.2.1 $"
 
 maxusers       32              # estimated number of users
 
@@ -162,7 +162,7 @@
 #options       MROUTING        # IP multicast routing
 options        NS              # XNS
 #options       NSIP            # XNS tunneling over IP
-options        ISO,TPIP        # OSI
+#options       ISO,TPIP        # OSI
 #options       EON             # OSI tunneling over IP
 options        CCITT,LLC,HDLC  # X.25
 options        NETATALK        # AppleTalk networking protocols
diff -r 9c7272f42467 -r b1000c314493 sys/arch/i386/conf/GENERIC_LAPTOP
--- a/sys/arch/i386/conf/GENERIC_LAPTOP Sat Aug 11 14:25:43 2007 +0000
+++ b/sys/arch/i386/conf/GENERIC_LAPTOP Sat Aug 11 14:40:02 2007 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC_LAPTOP,v 1.90.2.10.2.2 2005/07/21 19:28:02 riz Exp $
+#      $NetBSD: GENERIC_LAPTOP,v 1.90.2.10.2.2.2.1 2007/08/11 14:40:09 bouyer Exp $
 #      From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp
 #
 #      GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled
@@ -8,7 +8,7 @@
 
 #options       INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "GENERIC-$Revision: 1.90.2.10.2.2 $"
+#ident                 "GENERIC-$Revision: 1.90.2.10.2.2.2.1 $"
 
 maxusers       32              # estimated number of users
 
@@ -142,7 +142,7 @@
 #options       MROUTING        # IP multicast routing



Home | Main Index | Thread Index | Old Index